X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce4169a4d129fc6cd165b2e9ccc5cf5d48356020..f8c4475a3e579655f6a962822824596a7a9cfb66:/include/wx/socket.h diff --git a/include/wx/socket.h b/include/wx/socket.h index aa5d6ca9b4..762e01c863 100644 --- a/include/wx/socket.h +++ b/include/wx/socket.h @@ -20,75 +20,62 @@ #if wxUSE_SOCKETS -// --------------------------------------------------------------------------- -// Windows(tm) specific -// --------------------------------------------------------------------------- -#if defined(__WINDOWS__) && defined(WXSOCK_INTERNAL) -#include -#include -#endif // defined(__WINDOWS__) && defined(WXSOCK_INTERNAL) - -// --------------------------------------------------------------------------- -// Unix specific -// --------------------------------------------------------------------------- -#if defined(__UNIX__) && defined(WXSOCK_INTERNAL) -#include -#include -#include -#endif // defined(__UNIX__) && defined(WXSOCK_INTERNAL) - // --------------------------------------------------------------------------- // wxSocket headers (generic) // --------------------------------------------------------------------------- #ifdef WXPREC -#include +# include #else -#include +# include +# include #endif -#include "wx/sckaddr.h" +#include +#include "wx/gsocket.h" + +class WXDLLEXPORT wxTimer; class WXDLLEXPORT wxSocketEvent; -class WXDLLEXPORT wxSocketHandler; -class wxSocketInternal; class WXDLLEXPORT wxSocketBase : public wxEvtHandler { DECLARE_CLASS(wxSocketBase) -#ifdef __WXMAC__ - friend void wxMacSocketOnRequestProc(void *refcon , short event) ; -#endif public: - enum wxSockFlags { NONE=0, NOWAIT=1, WAITALL=2, SPEED=4 }; + enum { NONE=0, NOWAIT=1, WAITALL=2, SPEED=4 }; + typedef int wxSockFlags; // Type of request - enum { REQ_READ=0x1, REQ_PEEK=0x2, REQ_WRITE=0x4, REQ_LOST=0x8, - REQ_ACCEPT=0x10, REQ_CONNECT=0x20, REQ_WAIT=0x40}; - enum { EVT_READ=0, EVT_PEEK=1, EVT_WRITE=2, EVT_LOST=3, EVT_ACCEPT=4, - EVT_CONNECT=5 }; - typedef int wxRequestNotify; - typedef int wxRequestEvent; - enum wxSockType { SOCK_CLIENT, SOCK_SERVER, SOCK_INTERNAL, SOCK_UNINIT }; - typedef void (*wxSockCbk)(wxSocketBase& sock,wxRequestEvent evt,char *cdata); + enum wxSockType { SOCK_CLIENT, SOCK_SERVER, SOCK_INTERNAL, SOCK_UNINIT }; + typedef void (*wxSockCbk)(wxSocketBase& sock,GSocketEvent evt,char *cdata); protected: - wxSockFlags m_flags; + GSocket *m_socket; // wxSocket socket + wxSockFlags m_flags; // wxSocket flags wxSockType m_type; // wxSocket type - bool m_connected, m_connecting; // State of the socket - int m_fd; // Socket file descriptors - wxList m_states; // States list - int m_id; // Socket id (for event handler) - wxSocketHandler *m_handler; // the current socket handler - wxRequestNotify m_neededreq; // Specify which requet signals we need - unsigned long m_timeout; + GSocketEventFlags m_neededreq; // Specify which requet signals we need size_t m_lcount; // Last IO request size - int m_error; // Last IO error - wxSocketInternal *m_internal; + unsigned long m_timeout; // IO timeout value + char *m_unread; // Pushback buffer size_t m_unrd_size; // Pushback buffer size - wxSockCbk m_cbk; - char *m_cdata; - bool m_notify_state; - + size_t m_unrd_cur; // Pushback pointer + + wxSockCbk m_cbk; // C callback + char *m_cdata; // C callback data + + bool m_connected; // Connected ? + bool m_notify_state; // Notify state + int m_id; // Socket id (for event handler) + + // Defering variables + enum { + DEFER_READ, DEFER_WRITE, NO_DEFER + } m_defering; // Defering state + char *m_defer_buffer; // Defering target buffer + size_t m_defer_nbytes; // Defering buffer size + wxTimer *m_defer_timer; // Timer for defering mode + + wxList m_states; // Stack of states + public: wxSocketBase(); virtual ~wxSocketBase(); @@ -108,16 +95,17 @@ public: void CreatePushbackBefore(const char *buffer, size_t size); // Status - inline bool Ok() const { return (m_fd < 0 ? 0 : 1); }; - inline bool Error() const { return (m_error != 0); }; + inline bool Ok() const { return (m_socket != NULL); }; + inline bool Error() const + { return (GSocket_GetError(m_socket) != GSOCK_NOERROR); }; inline bool IsConnected() const { return m_connected; }; inline bool IsDisconnected() const { return !IsConnected(); }; - inline bool IsNoWait() const { return m_flags & NOWAIT; }; + inline bool IsNoWait() const { return ((m_flags & NOWAIT) != 0); }; bool IsData() const; inline size_t LastCount() const { return m_lcount; } - inline int LastError() const { return m_error; } + inline GSocketError LastError() const { return GSocket_GetError(m_socket); } inline wxSockType GetType() const { return m_type; } - + void SetFlags(wxSockFlags _flags); wxSockFlags GetFlags() const; inline void SetTimeout(unsigned long sec) { m_timeout = sec; } @@ -129,7 +117,7 @@ public: bool WaitForRead(long seconds = -1, long microseconds = 0); bool WaitForWrite(long seconds = -1, long microseconds = 0); bool WaitForLost(long seconds = -1, long microseconds = 0); - + // Save the current state of Socket void SaveState(); void RestoreState(); @@ -140,13 +128,13 @@ public: // Setup event handler void SetEventHandler(wxEvtHandler& evt_hdlr, int id = -1); - + // Method called when it happens something on the socket - void SetNotify(wxRequestNotify flags); - virtual void OnRequest(wxRequestEvent req_evt); + void SetNotify(GSocketEventFlags flags); + virtual void OnRequest(GSocketEvent req_evt); // Public internal callback - virtual void OldOnNotify(wxRequestEvent WXUNUSED(evt)); + virtual void OldOnNotify(GSocketEvent WXUNUSED(evt)); // Some info on the socket... virtual bool GetPeer(wxSockAddress& addr_man) const; @@ -156,9 +144,9 @@ public: void Notify(bool notify); // So you can know what the socket driver is looking for ... - inline wxRequestNotify NeededReq() const { return m_neededreq; } + inline GSocketEventFlags NeededReq() const { return m_neededreq; } - static wxRequestNotify EventToNotify(wxRequestEvent evt); + static GSocketEventFlags EventToNotify(GSocketEvent evt); protected: friend class wxSocketServer; @@ -174,20 +162,15 @@ public: #ifdef __SALFORDC__ protected: #endif - + bool _Wait(long seconds, long microseconds, int type); - - // Set "my" handler - inline virtual void SetHandler(wxSocketHandler *handler) - { m_handler = handler; } + + int DeferRead(char *buffer, size_t nbytes); + int DeferWrite(const char *buffer, size_t nbytes); + void DoDefer(GSocketEvent evt); // Pushback library size_t GetPushback(char *buffer, size_t size, bool peek); - - // To prevent many read or write on the same socket at the same time - // ==> cause strange things :-) - void WantSpeedBuffer(char *buffer, size_t size, wxRequestEvent req); - void WantBuffer(char *buffer, size_t size, wxRequestEvent req); }; //////////////////////////////////////////////////////////////////////// @@ -219,45 +202,7 @@ public: bool WaitOnConnect(long seconds = -1, long microseconds = 0); - virtual void OnRequest(wxRequestEvent flags); -}; - -//////////////////////////////////////////////////////////////////////// - -class WXDLLEXPORT wxSocketHandler : public wxObject -{ - DECLARE_CLASS(wxSocketHandler) -protected: - wxList *socks; - -public: - enum SockStatus { SOCK_NONE, SOCK_DATA, SOCK_CONNECT, SOCK_DISCONNECT, - SOCK_ERROR }; - static wxSocketHandler *master; - - wxSocketHandler(); - virtual ~wxSocketHandler(); - - void Register(wxSocketBase* sock); - void UnRegister(wxSocketBase* sock); - - unsigned long Count() const; - - // seconds = -1 means indefinite wait - // seconds = 0 means no wait - // seconds > 0 means specified wait - - int Wait(long seconds = -1, long microseconds = 0); - void YieldSock(); - - wxSocketServer *CreateServer - (wxSockAddress& addr, - wxSocketBase::wxSockFlags flags = wxSocketBase::NONE); - wxSocketClient *CreateClient - (wxSocketBase::wxSockFlags flags = wxSocketBase::NONE); - - // Create or reuse a socket handler - static wxSocketHandler& Master() { return *master; } + virtual void OnRequest(GSocketEvent flags); }; class WXDLLEXPORT wxSocketEvent : public wxEvent { @@ -265,13 +210,13 @@ class WXDLLEXPORT wxSocketEvent : public wxEvent { public: wxSocketEvent(int id = 0); - wxSocketBase::wxRequestEvent SocketEvent() const { return m_skevt; } + GSocketEvent SocketEvent() const { return m_skevt; } wxSocketBase *Socket() const { return m_socket; } void CopyObject(wxObject& obj_d) const; public: - wxSocketBase::wxRequestEvent m_skevt; + GSocketEvent m_skevt; wxSocketBase *m_socket; };