*** empty log message ***

[wxWidgets.git] / include / wx / socket.h

diff --git a/include/wx/socket.h b/include/wx/socket.h
index ba17e64804fcc3dceebc8b85d77293f24c691cfa..da40262dc9522a32d38f1254e1d27af6e41b258b 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -48,7 +48,7 @@ enum {
   wxSOCKET_INPUT_FLAG = GSOCK_INPUT_FLAG,
   wxSOCKET_OUTPUT_FLAG = GSOCK_OUTPUT_FLAG,
   wxSOCKET_CONNECTION_FLAG = GSOCK_CONNECTION_FLAG,
   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;
 };
 
 typedef GSocketEventFlags wxSocketEventFlags;


@@ -62,7 +62,7 @@ typedef enum {
   wxSOCKET_NOHOST = GSOCK_NOHOST,
   wxSOCKET_INVPORT = GSOCK_INVPORT,
   wxSOCKET_WOULDBLOCK = GSOCK_WOULDBLOCK,
   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;
 
   wxSOCKET_MEMERR = GSOCK_MEMERR
 } wxSocketError;
 


@@ -89,29 +89,30 @@ protected:
   wxSockFlags m_flags;                 // wxSocket flags
   wxSockType m_type;                   // wxSocket type
   wxSocketEventFlags m_neededreq;      // Specify which requet signals we need
   wxSockFlags m_flags;                 // wxSocket flags
   wxSockType m_type;                   // wxSocket type
   wxSocketEventFlags m_neededreq;      // Specify which requet signals we need

-  size_t m_lcount;                     // Last IO request size
+  wxUint32 m_lcount;                   // Last IO request size

   unsigned long m_timeout;             // IO timeout value
   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
   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
 
   // 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();
 
 public:
   wxSocketBase();


@@ -119,17 +120,17 @@ public:
   virtual bool Close();
 
   // Base IO
   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();
 
   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); };
 
   // 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 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 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 = -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();
 
   // Save the current state of Socket
   void SaveState();


@@ -200,14 +201,14 @@ public:
 protected:
 #endif
 
 protected:
 #endif
 

-  bool _Wait(long seconds, long microseconds, int type);
+  bool _Wait(long seconds, long milliseconds, int type);

 
 

-  int DeferRead(char *buffer, size_t nbytes);
-  int DeferWrite(const char *buffer, size_t nbytes);
+  int DeferRead(char *buffer, wxUint32 nbytes);
+  int DeferWrite(const char *buffer, wxUint32 nbytes);

   void DoDefer(wxSocketNotify evt);
 
   // Pushback library
   void DoDefer(wxSocketNotify evt);
 
   // 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);
 
 
   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);
 
 
   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);
 };
 
   virtual void OnRequest(wxSocketNotify flags);
 };