X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa8fb7a0164e989e09d2b78867633399a740f1d3..2d996ed1c44a591c610e51d58d0bf9f802fac165:/include/wx/socket.h diff --git a/include/wx/socket.h b/include/wx/socket.h index ec578d12d9..22f5d74bfd 100644 --- a/include/wx/socket.h +++ b/include/wx/socket.h @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// // Name: socket.h // Purpose: Socket handling classes -// Author: Guilhem Lavaux +// Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia // Modified by: // Created: April 1997 // RCS-ID: $Id$ @@ -48,7 +48,7 @@ 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_LOST_FLAG = GSOCK_LOST_FLAG }; typedef GSocketEventFlags wxSocketEventFlags; @@ -62,7 +62,7 @@ typedef enum { wxSOCKET_NOHOST = GSOCK_NOHOST, wxSOCKET_INVPORT = GSOCK_INVPORT, wxSOCKET_WOULDBLOCK = GSOCK_WOULDBLOCK, - wxSOCKET_TIMEOUT = GSOCK_TIMEOUT, + wxSOCKET_TIMEDOUT = GSOCK_TIMEDOUT, wxSOCKET_MEMERR = GSOCK_MEMERR } wxSocketError; @@ -82,36 +82,37 @@ public: // Type of request enum wxSockType { SOCK_CLIENT, SOCK_SERVER, SOCK_INTERNAL, SOCK_UNINIT }; - typedef void (*wxSockCbk)(wxSocketBase& sock,wxSocketNotify evt,char *cdata); + typedef void (*wxSockCbk)(wxSocketBase& sock, wxSocketNotify evt, char *cdata); protected: GSocket *m_socket; // wxSocket socket wxSockFlags m_flags; // wxSocket flags wxSockType m_type; // wxSocket type - GSocketEventFlags m_neededreq; // Specify which requet signals we need - size_t m_lcount; // Last IO request size + wxSocketEventFlags m_neededreq; // Which events we are interested in + wxUint32 m_lcount; // Last IO request size unsigned long m_timeout; // IO timeout value + + char *m_unread; // Pushback buffer + wxUint32 m_unrd_size; // Pushback buffer size + wxUint32 m_unrd_cur; // Pushback pointer - char *m_unread; // Pushback buffer - size_t m_unrd_size; // Pushback buffer size - size_t m_unrd_cur; // Pushback pointer + wxSockCbk m_cbk; // C callback + char *m_cdata; // C callback data - wxSockCbk m_cbk; // C callback - char *m_cdata; // C callback data - - bool m_connected; // Connected ? + bool m_connected; // Connected ? + bool m_establishing; // Pending connections? bool m_notify_state; // Notify state - int m_id; // Socket id (for event handler) + 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 + wxUint32 m_defer_nbytes; // Defering buffer size + wxTimer *m_defer_timer; // Timer for defering mode - wxList m_states; // Stack of states + wxList m_states; // Stack of states public: wxSocketBase(); @@ -119,17 +120,17 @@ public: virtual bool Close(); // Base IO - wxSocketBase& Peek(char* buffer, size_t nbytes); - wxSocketBase& Read(char* buffer, size_t nbytes); - wxSocketBase& Write(const char *buffer, size_t nbytes); - wxSocketBase& Unread(const char *buffer, size_t nbytes); - wxSocketBase& ReadMsg(char *buffer, size_t nbytes); - wxSocketBase& WriteMsg(const char *buffer, size_t nbytes); + wxSocketBase& Peek(char* buffer, wxUint32 nbytes); + wxSocketBase& Read(char* buffer, wxUint32 nbytes); + wxSocketBase& Write(const char *buffer, wxUint32 nbytes); + wxSocketBase& Unread(const char *buffer, wxUint32 nbytes); + wxSocketBase& ReadMsg(char *buffer, wxUint32 nbytes); + wxSocketBase& WriteMsg(const char *buffer, wxUint32 nbytes); void Discard(); - // Try not to use this two methods (they sould be protected) - void CreatePushbackAfter(const char *buffer, size_t size); - void CreatePushbackBefore(const char *buffer, size_t size); + // Try not to use these two methods (they sould be protected) + void CreatePushbackAfter(const char *buffer, wxUint32 size); + void CreatePushbackBefore(const char *buffer, wxUint32 size); // Status inline bool Ok() const { return (m_socket != NULL); }; @@ -139,21 +140,21 @@ public: inline bool IsDisconnected() const { return !IsConnected(); }; inline bool IsNoWait() const { return ((m_flags & NOWAIT) != 0); }; bool IsData() const; - inline size_t LastCount() const { return m_lcount; } + inline wxUint32 LastCount() const { return m_lcount; } inline wxSocketError LastError() const { return (wxSocketError)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; } + void SetTimeout(unsigned long sec); // seconds = -1 means infinite wait - // seconds = 0 means no wait - // seconds > 0 means specified wait - bool Wait(long seconds = -1, long microseconds = 0); - bool WaitForRead(long seconds = -1, long microseconds = 0); - bool WaitForWrite(long seconds = -1, long microseconds = 0); - bool WaitForLost(long seconds = -1, long microseconds = 0); + // seconds, milliseconds = 0 means no wait + // seconds, milliseconds > 0 means specified wait + bool Wait(long seconds = -1, long milliseconds = 0); + bool WaitForRead(long seconds = -1, long milliseconds = 0); + bool WaitForWrite(long seconds = -1, long milliseconds = 0); + bool WaitForLost(long seconds = -1, long milliseconds = 0); // Save the current state of Socket void SaveState(); @@ -166,7 +167,7 @@ public: // Setup event handler void SetEventHandler(wxEvtHandler& evt_hdlr, int id = -1); - // Method called when it happens something on the socket + // Method called when something happens in the socket void SetNotify(wxSocketEventFlags flags); virtual void OnRequest(wxSocketNotify req_evt); @@ -200,14 +201,14 @@ public: protected: #endif - bool _Wait(long seconds, long microseconds, int type); + bool _Wait(long seconds, long milliseconds, wxSocketEventFlags flags); - int DeferRead(char *buffer, size_t nbytes); - int DeferWrite(const char *buffer, size_t nbytes); - void DoDefer(GSocketEvent evt); + int DeferRead(char *buffer, wxUint32 nbytes); + int DeferWrite(const char *buffer, wxUint32 nbytes); + void DoDefer(); // Pushback library - size_t GetPushback(char *buffer, size_t size, bool peek); + wxUint32 GetPushback(char *buffer, wxUint32 size, bool peek); }; //////////////////////////////////////////////////////////////////////// @@ -221,8 +222,10 @@ public: wxSocketServer(wxSockAddress& addr_man, wxSockFlags flags = wxSocketBase::NONE); - wxSocketBase* Accept(); - bool AcceptWith(wxSocketBase& sock); + wxSocketBase* Accept(bool wait = TRUE); + bool AcceptWith(wxSocketBase& sock, bool wait = TRUE); + + bool WaitOnAccept(long seconds = -1, long milliseconds = 0); }; //////////////////////////////////////////////////////////////////////// @@ -237,7 +240,7 @@ public: virtual bool Connect(wxSockAddress& addr_man, bool wait = TRUE); - bool WaitOnConnect(long seconds = -1, long microseconds = 0); + bool WaitOnConnect(long seconds = -1, long milliseconds = 0); virtual void OnRequest(wxSocketNotify flags); }; @@ -247,13 +250,13 @@ class WXDLLEXPORT wxSocketEvent : public wxEvent { public: wxSocketEvent(int id = 0); - wxSocketNotify SocketEvent() const { return (wxSocketNotify)m_skevt; } + wxSocketNotify SocketEvent() const { return m_skevt; } wxSocketBase *Socket() const { return m_socket; } void CopyObject(wxObject& obj_d) const; public: - GSocketEvent m_skevt; + wxSocketNotify m_skevt; wxSocketBase *m_socket; };