// 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"
wxSOCKET_NONE = 0,
wxSOCKET_NOWAIT = 1,
wxSOCKET_WAITALL = 2,
- wxSOCKET_BLOCK = 4
+ wxSOCKET_BLOCK = 4,
+ wxSOCKET_REUSEADDR = 8
};
enum wxSocketType
typedef int wxSocketFlags;
-#if WXWIN_COMPATIBILITY
- typedef wxSocketType wxSockType;
- typedef wxSocketFlags wxSockFlags;
-#endif // WXWIN_COMPATIBILITY
-
// --------------------------------------------------------------------------
// wxSocketBase
{
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 Ok() const { return IsOk(); }
+ inline bool IsOk() 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); }
+ inline wxSocketError LastError() const { return (wxSocketError)m_socket->GetError(); }
void SaveState();
void RestoreState();
// addresses
virtual bool GetLocal(wxSockAddress& addr_man) const;
virtual bool GetPeer(wxSockAddress& addr_man) const;
+ virtual bool SetLocal(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; };
+ void InterruptWait() { m_interrupt = true; };
bool Wait(long seconds = -1, long milliseconds = 0);
bool WaitForRead(long seconds = -1, long milliseconds = 0);
bool WaitForWrite(long seconds = -1, long milliseconds = 0);
void SetFlags(wxSocketFlags flags);
void SetTimeout(long seconds);
+ bool GetOption(int level, int optname, void *optval, int *optlen);
+ bool SetOption(int level, int optname, const void *optval, int optlen);
+ inline 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
// --------------------------
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)
+ DECLARE_NO_COPY_CLASS(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);
wxSocketClient(wxSocketFlags flags = wxSOCKET_NONE);
virtual ~wxSocketClient();
- virtual bool Connect(wxSockAddress& addr, bool wait = TRUE);
+ virtual bool Connect(wxSockAddress& addr, bool wait = true);
+ bool Connect(wxSockAddress& addr, wxSockAddress& local, bool wait = true);
bool WaitOnConnect(long seconds = -1, long milliseconds = 0);
+private:
+ virtual bool DoConnect(wxSockAddress& addr, wxSockAddress* local, bool wait = true);
+
DECLARE_NO_COPY_CLASS(wxSocketClient)
};
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 );
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:
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