// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifndef _WX_NETWORK_SOCKET_H
-#define _WX_NETWORK_SOCKET_H
-
-#if defined(__GNUG__) && !defined(__APPLE__)
- #pragma interface "socket.h"
-#endif
+#ifndef _WX_SOCKET_H_
+#define _WX_SOCKET_H_
#include "wx/defs.h"
// wxSocket headers
// ---------------------------------------------------------------------------
-#ifdef WXPREC
- #include "wx/wxprec.h"
-#else
- #include "wx/event.h"
- #include "wx/string.h"
-#endif
-
+#include "wx/event.h"
#include "wx/sckaddr.h"
-#include "wx/gsocket.h"
#include "wx/list.h"
+class wxSocketImpl;
+
// ------------------------------------------------------------------------
// Types and constants
// ------------------------------------------------------------------------
+// Types of different socket notifications or events.
+//
+// NB: the values here should be consecutive and start with 0 as they are
+// used to construct the wxSOCKET_XXX_FLAG bit mask values below
enum wxSocketNotify
{
- wxSOCKET_INPUT = GSOCK_INPUT,
- wxSOCKET_OUTPUT = GSOCK_OUTPUT,
- wxSOCKET_CONNECTION = GSOCK_CONNECTION,
- wxSOCKET_LOST = GSOCK_LOST
+ wxSOCKET_INPUT,
+ wxSOCKET_OUTPUT,
+ wxSOCKET_CONNECTION,
+ wxSOCKET_LOST,
+ wxSOCKET_MAX_EVENT
};
enum
{
- wxSOCKET_INPUT_FLAG = GSOCK_INPUT_FLAG,
- wxSOCKET_OUTPUT_FLAG = GSOCK_OUTPUT_FLAG,
- wxSOCKET_CONNECTION_FLAG = GSOCK_CONNECTION_FLAG,
- wxSOCKET_LOST_FLAG = GSOCK_LOST_FLAG
+ wxSOCKET_INPUT_FLAG = 1 << wxSOCKET_INPUT,
+ wxSOCKET_OUTPUT_FLAG = 1 << wxSOCKET_OUTPUT,
+ wxSOCKET_CONNECTION_FLAG = 1 << wxSOCKET_CONNECTION,
+ wxSOCKET_LOST_FLAG = 1 << wxSOCKET_LOST
};
-typedef GSocketEventFlags wxSocketEventFlags;
+// this is a combination of the bit masks defined above
+typedef int wxSocketEventFlags;
enum wxSocketError
{
- // from GSocket
- wxSOCKET_NOERROR = GSOCK_NOERROR,
- wxSOCKET_INVOP = GSOCK_INVOP,
- wxSOCKET_IOERR = GSOCK_IOERR,
- wxSOCKET_INVADDR = GSOCK_INVADDR,
- wxSOCKET_INVSOCK = GSOCK_INVSOCK,
- wxSOCKET_NOHOST = GSOCK_NOHOST,
- wxSOCKET_INVPORT = GSOCK_INVPORT,
- wxSOCKET_WOULDBLOCK = GSOCK_WOULDBLOCK,
- wxSOCKET_TIMEDOUT = GSOCK_TIMEDOUT,
- wxSOCKET_MEMERR = GSOCK_MEMERR,
-
- // wxSocket-specific (not yet implemented)
- wxSOCKET_DUMMY
+ wxSOCKET_NOERROR = 0,
+ wxSOCKET_INVOP,
+ wxSOCKET_IOERR,
+ wxSOCKET_INVADDR,
+ wxSOCKET_INVSOCK,
+ wxSOCKET_NOHOST,
+ wxSOCKET_INVPORT,
+ wxSOCKET_WOULDBLOCK,
+ wxSOCKET_TIMEDOUT,
+ wxSOCKET_MEMERR,
+ wxSOCKET_OPTERR
};
+// socket options/flags bit masks
enum
{
- wxSOCKET_NONE = 0,
- wxSOCKET_NOWAIT = 1,
- wxSOCKET_WAITALL = 2,
- wxSOCKET_BLOCK = 4
+ wxSOCKET_NONE = 0,
+ wxSOCKET_NOWAIT = 1,
+ wxSOCKET_WAITALL = 2,
+ wxSOCKET_BLOCK = 4,
+ wxSOCKET_REUSEADDR = 8,
+ wxSOCKET_BROADCAST = 16,
+ wxSOCKET_NOBIND = 32
};
+typedef int wxSocketFlags;
+
+// socket kind values (badly defined, don't use)
enum wxSocketType
{
- wxSOCKET_UNINIT,
- wxSOCKET_CLIENT,
- wxSOCKET_SERVER,
- wxSOCKET_BASE,
- wxSOCKET_DATAGRAM
+ wxSOCKET_UNINIT,
+ wxSOCKET_CLIENT,
+ wxSOCKET_SERVER,
+ wxSOCKET_BASE,
+ wxSOCKET_DATAGRAM
};
-typedef int wxSocketFlags;
-
-
-#if WXWIN_COMPATIBILITY
- typedef wxSocketType wxSockType;
- typedef wxSocketFlags wxSockFlags;
-#endif // WXWIN_COMPATIBILITY
// --------------------------------------------------------------------------
// wxSocketBase
// --------------------------------------------------------------------------
-class WXDLLEXPORT wxSocketBase : public wxObject
+class WXDLLIMPEXP_NET wxSocketBase : public wxObject
{
DECLARE_CLASS(wxSocketBase)
-public:
-
-#if WXWIN_COMPATIBILITY
- enum
- {
- NONE = wxSOCKET_NONE,
- NOWAIT = wxSOCKET_NOWAIT,
- WAITALL = wxSOCKET_WAITALL,
- SPEED = wxSOCKET_BLOCK
- };
-
- enum
- {
- SOCK_UNINIT = wxSOCKET_UNINIT,
- SOCK_CLIENT = wxSOCKET_CLIENT,
- SOCK_SERVER = wxSOCKET_SERVER,
- SOCK_INTERNAL = wxSOCKET_BASE,
- SOCK_DATAGRAM = wxSOCKET_DATAGRAM
- };
-
- typedef void (*wxSockCbk)(wxSocketBase& sock, wxSocketNotify evt, char *cdata);
-#endif // WXWIN_COMPATIBILITY
-
public:
// Public interface
bool Destroy();
// state
- inline bool Ok() const { return (m_socket != NULL); };
- inline bool Error() const { return m_error; };
- inline bool IsConnected() const { return m_connected; };
- inline bool IsData() { return WaitForRead(0, 0); };
- inline bool IsDisconnected() const { return !IsConnected(); };
- inline wxUint32 LastCount() const { return m_lcount; }
- inline wxSocketError LastError() const { return (wxSocketError)GSocket_GetError(m_socket); }
+ bool Ok() const { return IsOk(); }
+ bool IsOk() const { return m_impl != NULL; }
+ bool Error() const { return m_error; }
+ bool IsClosed() const { return m_closed; }
+ bool IsConnected() const { return m_connected; }
+ bool IsData() { return WaitForRead(0, 0); }
+ bool IsDisconnected() const { return !IsConnected(); }
+ wxUint32 LastCount() const { return m_lcount; }
+ wxSocketError LastError() const;
void SaveState();
void RestoreState();
// addresses
virtual bool GetLocal(wxSockAddress& addr_man) const;
virtual bool GetPeer(wxSockAddress& addr_man) const;
+ virtual bool SetLocal(const wxIPV4address& local);
// base IO
virtual bool Close();
wxSocketBase& Write(const void *buffer, wxUint32 nbytes);
wxSocketBase& WriteMsg(const void *buffer, wxUint32 nbytes);
- void InterruptWait() { m_interrupt = TRUE; };
+ // all Wait() functions wait until their condition is satisfied or the
+ // timeout expires; if seconds == -1 (default) then m_timeout value is used
+ //
+ // it is also possible to call InterruptWait() to cancel any current Wait()
+
+ // wait for anything at all to happen with this socket
bool Wait(long seconds = -1, long milliseconds = 0);
+
+ // wait until we can read from or write to the socket without blocking
+ // (notice that this does not mean that the operation will succeed but only
+ // that it will return immediately)
bool WaitForRead(long seconds = -1, long milliseconds = 0);
bool WaitForWrite(long seconds = -1, long milliseconds = 0);
+
+ // wait until the connection is terminated
bool WaitForLost(long seconds = -1, long milliseconds = 0);
- inline wxSocketFlags GetFlags() const { return m_flags; }
+ void InterruptWait() { m_interrupt = true; }
+
+
+ wxSocketFlags GetFlags() const { return m_flags; }
void SetFlags(wxSocketFlags flags);
void SetTimeout(long seconds);
+ long GetTimeout() const { return m_timeout; }
+
+ bool GetOption(int level, int optname, void *optval, int *optlen);
+ bool SetOption(int level, int optname, const void *optval, int optlen);
+ wxUint32 GetLastIOSize() const { return m_lcount; }
// event handling
void *GetClientData() const { return m_clientData; }
void SetClientData(void *data) { m_clientData = data; }
- void SetEventHandler(wxEvtHandler& handler, int id = -1);
+ void SetEventHandler(wxEvtHandler& handler, int id = wxID_ANY);
void SetNotify(wxSocketEventFlags flags);
void Notify(bool notify);
static bool Initialize();
static void Shutdown();
- // callbacks are deprecated, use events instead
-#if WXWIN_COMPATIBILITY
- wxSockCbk Callback(wxSockCbk cbk_);
- char *CallbackData(char *data);
-#endif // WXWIN_COMPATIBILITY
-
// Implementation from now on
// --------------------------
- // do not use, should be private (called from GSocket)
+ // do not use, should be private (called from wxSocketImpl only)
void OnRequest(wxSocketNotify notify);
// do not use, not documented nor supported
- inline bool IsNoWait() const { return ((m_flags & wxSOCKET_NOWAIT) != 0); }
- inline wxSocketType GetType() const { return m_type; }
+ bool IsNoWait() const { return ((m_flags & wxSOCKET_NOWAIT) != 0); }
+ wxSocketType GetType() const { return m_type; }
private:
friend class wxSocketClient;
friend class wxDatagramSocket;
// low level IO
- wxUint32 _Read(void* buffer, wxUint32 nbytes);
- wxUint32 _Write(const void *buffer, wxUint32 nbytes);
- bool _Wait(long seconds, long milliseconds, wxSocketEventFlags flags);
+ wxUint32 DoRead(void* buffer, wxUint32 nbytes);
+ wxUint32 DoWrite(const void *buffer, wxUint32 nbytes);
+
+ // wait until the given flags are set for this socket or the given timeout
+ // (or m_timeout) expires
+ //
+ // notice that wxSOCKET_LOST_FLAG is always taken into account but the return
+ // value depends on whether it is included in flags or not: if it is, and the
+ // connection is indeed lost, true is returned, but if it isn't then the
+ // function returns false in this case
+ //
+ // false is always returned if we returned because of the timeout expiration
+ bool DoWait(long seconds, long milliseconds, wxSocketEventFlags flags);
// pushback buffer
void Pushback(const void *buffer, wxUint32 size);
private:
// socket
- GSocket *m_socket; // GSocket
+ wxSocketImpl *m_impl; // port-specific implementation
wxSocketType m_type; // wxSocket type
// state
bool m_reading; // busy reading?
bool m_writing; // busy writing?
bool m_error; // did last IO call fail?
- wxSocketError m_lasterror; // last error (not cleared on success)
+ bool m_closed; // was the other end closed?
+ // (notice that m_error is also set then)
wxUint32 m_lcount; // last IO transaction size
- unsigned long m_timeout; // IO timeout value
+ unsigned long m_timeout; // IO timeout value in seconds
wxList m_states; // stack of states
bool m_interrupt; // interrupt ongoing wait operations?
bool m_beingDeleted; // marked for delayed deletion?
+ wxIPV4address m_localAddress; // bind to local address?
// pushback buffer
void *m_unread; // pushback buffer
// the initialization count, GSocket is initialized if > 0
static size_t m_countInit;
- // callbacks are deprecated, use events instead
-#if WXWIN_COMPATIBILITY
- wxSockCbk m_cbk; // callback
- char *m_cdata; // callback data
-#endif // WXWIN_COMPATIBILITY
+ DECLARE_NO_COPY_CLASS(wxSocketBase)
};
// wxSocketServer
// --------------------------------------------------------------------------
-class WXDLLEXPORT wxSocketServer : public wxSocketBase
+class WXDLLIMPEXP_NET wxSocketServer : public wxSocketBase
{
DECLARE_CLASS(wxSocketServer)
public:
- wxSocketServer(wxSockAddress& addr, wxSocketFlags flags = wxSOCKET_NONE);
+ wxSocketServer(const wxSockAddress& addr, wxSocketFlags flags = wxSOCKET_NONE);
- wxSocketBase* Accept(bool wait = TRUE);
- bool AcceptWith(wxSocketBase& socket, bool wait = TRUE);
+ wxSocketBase* Accept(bool wait = true);
+ bool AcceptWith(wxSocketBase& socket, bool wait = true);
bool WaitForAccept(long seconds = -1, long milliseconds = 0);
+
+ DECLARE_NO_COPY_CLASS(wxSocketServer)
};
// wxSocketClient
// --------------------------------------------------------------------------
-class WXDLLEXPORT wxSocketClient : public wxSocketBase
+class WXDLLIMPEXP_NET wxSocketClient : public wxSocketBase
{
DECLARE_CLASS(wxSocketClient)
wxSocketClient(wxSocketFlags flags = wxSOCKET_NONE);
virtual ~wxSocketClient();
- virtual bool Connect(wxSockAddress& addr, bool wait = TRUE);
+ virtual bool Connect(const wxSockAddress& addr, bool wait = true);
+ bool Connect(const wxSockAddress& addr, const wxSockAddress& local,
+ bool wait = true);
bool WaitOnConnect(long seconds = -1, long milliseconds = 0);
+
+ // Sets initial socket buffer sizes using the SO_SNDBUF and SO_RCVBUF options
+ // before calling connect (either one can be -1 to leave it unchanged)
+ void SetInitialSocketBuffers(int recv, int send)
+ {
+ m_initialRecvBufferSize = recv;
+ m_initialSendBufferSize = send;
+ }
+
+private:
+ virtual bool DoConnect(const wxSockAddress& addr,
+ const wxSockAddress* local,
+ bool wait = true);
+
+ // buffer sizes, -1 if unset and defaults should be used
+ int m_initialRecvBufferSize;
+ int m_initialSendBufferSize;
+
+ DECLARE_NO_COPY_CLASS(wxSocketClient)
};
// WARNING: still in alpha stage
-class WXDLLEXPORT wxDatagramSocket : public wxSocketBase
+class WXDLLIMPEXP_NET wxDatagramSocket : public wxSocketBase
{
DECLARE_CLASS(wxDatagramSocket)
public:
- wxDatagramSocket(wxSockAddress& addr, wxSocketFlags flags = wxSOCKET_NONE);
+ wxDatagramSocket(const wxSockAddress& addr, wxSocketFlags flags = wxSOCKET_NONE);
wxDatagramSocket& RecvFrom( wxSockAddress& addr,
void* buf,
wxUint32 nBytes );
- wxDatagramSocket& SendTo( wxSockAddress& addr,
+ wxDatagramSocket& SendTo( const wxSockAddress& addr,
const void* buf,
wxUint32 nBytes );
/* TODO:
bool Connect(wxSockAddress& addr);
*/
+ DECLARE_NO_COPY_CLASS(wxDatagramSocket)
};
// wxSocketEvent
// --------------------------------------------------------------------------
-class WXDLLEXPORT wxSocketEvent : public wxEvent
+class WXDLLIMPEXP_NET wxSocketEvent : public wxEvent
{
public:
wxSocketEvent(int id = 0)
wxSocketBase *GetSocket() const { return (wxSocketBase *) GetEventObject(); }
void *GetClientData() const { return m_clientData; }
- // backwards compatibility
-#if WXWIN_COMPATIBILITY_2
- wxSocketNotify SocketEvent() const { return m_event; }
- wxSocketBase *Socket() const { return (wxSocketBase *) GetEventObject(); }
-#endif // WXWIN_COMPATIBILITY_2
-
virtual wxEvent *Clone() const { return new wxSocketEvent(*this); }
public:
wxSocketNotify m_event;
void *m_clientData;
- DECLARE_DYNAMIC_CLASS(wxSocketEvent)
+ DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSocketEvent)
};
typedef void (wxEvtHandler::*wxSocketEventFunction)(wxSocketEvent&);
+#define wxSocketEventHandler(func) \
+ (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSocketEventFunction, &func)
+
#define EVT_SOCKET(id, func) \
- DECLARE_EVENT_TABLE_ENTRY( wxEVT_SOCKET, id, -1, \
- (wxObjectEventFunction) \
- (wxEventFunction) \
- (wxSocketEventFunction) & func, \
- (wxObject *) NULL ),
+ wx__DECLARE_EVT1(wxEVT_SOCKET, id, wxSocketEventHandler(func))
+#endif // wxUSE_SOCKETS
-#endif
- // wxUSE_SOCKETS
+#endif // _WX_SOCKET_H_
-#endif
- // _WX_NETWORK_SOCKET_H
projects / wxWidgets.git / blobdiff