rename wxSocketSelectManager to wxSocketFDIOManager, the old name was confusing as...

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

diff --git a/include/wx/private/socket.h b/include/wx/private/socket.h
index 078593477ff94481c98e98f11cc8f8b1845292ae..0bc2f3b8100254447ebc9f6d58d0a86cb5c113f4 100644 (file)
--- a/include/wx/private/socket.h
+++ b/include/wx/private/socket.h
@@ -42,6 +42,7 @@
 #if wxUSE_SOCKETS
 
 #include "wx/socket.h"
 #if wxUSE_SOCKETS
 
 #include "wx/socket.h"

+#include "wx/private/sckaddr.h"

 
 #include <stddef.h>
 
 
 #include <stddef.h>
 


@@ -90,23 +91,8 @@
     #define SOCKET_ERROR (-1)
 #endif
 
     #define SOCKET_ERROR (-1)
 #endif
 

-#if wxUSE_IPV6
-    typedef struct sockaddr_storage wxSockAddr;
-#else
-    typedef struct sockaddr wxSockAddr;
-#endif
-
-enum GAddressType
-{
-    wxSOCKET_NOFAMILY = 0,
-    wxSOCKET_INET,
-    wxSOCKET_INET6,
-    wxSOCKET_UNIX
-};
-

 typedef int wxSocketEventFlags;
 
 typedef int wxSocketEventFlags;
 

-struct GAddress;

 class wxSocketImpl;
 
 /*
 class wxSocketImpl;
 
 /*


@@ -158,10 +144,15 @@ public:
     // that both BSD and Winsock implementations actually use socket->m_server
     // value to determine what exactly should be monitored so it needs to be
     // set before calling these functions)
     // that both BSD and Winsock implementations actually use socket->m_server
     // value to determine what exactly should be monitored so it needs to be
     // set before calling these functions)

+    //
+    // the default event value is used just for the convenience of wxMSW
+    // implementation which doesn't use this parameter anyhow, it doesn't make
+    // sense to pass wxSOCKET_LOST for the Unix implementation which does use
+    // this parameter

     virtual void Install_Callback(wxSocketImpl *socket,
     virtual void Install_Callback(wxSocketImpl *socket,

-                                  wxSocketNotify event = wxSOCKET_MAX_EVENT) = 0;
+                                  wxSocketNotify event = wxSOCKET_LOST) = 0;

     virtual void Uninstall_Callback(wxSocketImpl *socket,
     virtual void Uninstall_Callback(wxSocketImpl *socket,

-                                    wxSocketNotify event = wxSOCKET_MAX_EVENT) = 0;
+                                    wxSocketNotify event = wxSOCKET_LOST) = 0;

 
     virtual ~wxSocketManager() { }
 
 
     virtual ~wxSocketManager() { }
 


@@ -191,7 +182,6 @@ public:
     // set various socket properties: all of those can only be called before
     // creating the socket
     void SetTimeout(unsigned long millisec);
     // set various socket properties: all of those can only be called before
     // creating the socket
     void SetTimeout(unsigned long millisec);

-    void SetNonBlocking(bool non_blocking) { m_non_blocking = non_blocking; }

     void SetReusable() { m_reusable = true; }
     void SetBroadcast() { m_broadcast = true; }
     void DontDoBind() { m_dobind = false; }
     void SetReusable() { m_reusable = true; }
     void SetBroadcast() { m_broadcast = true; }
     void DontDoBind() { m_dobind = false; }


@@ -201,18 +191,23 @@ public:
         m_initialSendBufferSize = send;
     }
 
         m_initialSendBufferSize = send;
     }
 

-    wxSocketError SetLocal(GAddress *address);
-    wxSocketError SetPeer(GAddress *address);
+    wxSocketError SetLocal(const wxSockAddressImpl& address);
+    wxSocketError SetPeer(const wxSockAddressImpl& address);

 
     // accessors
     // ---------
 
 
     // accessors
     // ---------
 

-    GAddress *GetLocal();
-    GAddress *GetPeer();
+    bool IsServer() const { return m_server; }
+
+    const wxSockAddressImpl& GetLocal(); // non const as may update m_local
+    const wxSockAddressImpl& GetPeer() const { return m_peer; }

 
     wxSocketError GetError() const { return m_error; }
     bool IsOk() const { return m_error == wxSOCKET_NOERROR; }
 
 
     wxSocketError GetError() const { return m_error; }
     bool IsOk() const { return m_error == wxSOCKET_NOERROR; }
 

+    // get the error code corresponding to the last operation
+    virtual wxSocketError GetLastError() const = 0;
+

 
     // creating/closing the socket
     // --------------------------
 
     // creating/closing the socket
     // --------------------------


@@ -235,8 +230,8 @@ public:
     // (notice that DontDoBind() is ignored by this function)
     //
     // this function may return wxSOCKET_WOULDBLOCK in addition to the return
     // (notice that DontDoBind() is ignored by this function)
     //
     // this function may return wxSOCKET_WOULDBLOCK in addition to the return

-    // values listed above
-    wxSocketError CreateClient();
+    // values listed above if wait is false
+    wxSocketError CreateClient(bool wait);

 
     // create (and bind unless DontDoBind() had been called) an UDP socket
     // associated with the given local address
 
     // create (and bind unless DontDoBind() had been called) an UDP socket
     // associated with the given local address


@@ -246,25 +241,42 @@ public:
     // it was indeed created
     void Close();
 
     // it was indeed created
     void Close();
 

-    virtual void Shutdown();
+    // shuts down the writing end of the socket and closes it, this is a more
+    // graceful way to close
+    //
+    // does nothing if the socket wasn't created
+    void Shutdown();

 
 
     // IO operations
     // -------------
 
 
 
     // IO operations
     // -------------
 

-    virtual int Read(void *buffer, int size) = 0;
-    virtual int Write(const void *buffer, int size) = 0;
+    // basic IO, work for both TCP and UDP sockets
+    //
+    // return the number of bytes read/written (possibly 0) or -1 on error
+    int Read(void *buffer, int size);
+    int Write(const void *buffer, int size);

 
     // basically a wrapper for select(): returns the condition of the socket,
 
     // basically a wrapper for select(): returns the condition of the socket,

-    // blocking for not longer than timeout ms for something to become
-    // available
+    // blocking for not longer than timeout if it is specified (otherwise just
+    // poll without blocking at all)

     //
     // flags defines what kind of conditions we're interested in, the return
     // value is composed of a (possibly empty) subset of the bits set in flags
     wxSocketEventFlags Select(wxSocketEventFlags flags,
     //
     // flags defines what kind of conditions we're interested in, the return
     // value is composed of a (possibly empty) subset of the bits set in flags
     wxSocketEventFlags Select(wxSocketEventFlags flags,

-                              unsigned long timeout = 0);
+                              const timeval *timeout = NULL);
+
+    // convenient wrapper calling Select() with our default timeout
+    wxSocketEventFlags SelectWithTimeout(wxSocketEventFlags flags)
+    {
+        return Select(flags, &m_timeout);
+    }

 
 

-    virtual wxSocketImpl *WaitConnection(wxSocketBase& wxsocket) = 0;
+    // just a wrapper for accept(): it is called to create a new wxSocketImpl
+    // corresponding to a new server connection represented by the given
+    // wxSocketBase, returns NULL on error (including immediately if there are
+    // no pending connections as our sockets are non-blocking)
+    wxSocketImpl *Accept(wxSocketBase& wxsocket);

 
 
     // notifications
 
 
     // notifications


@@ -282,12 +294,10 @@ public:
     int m_initialRecvBufferSize;
     int m_initialSendBufferSize;
 
     int m_initialRecvBufferSize;
     int m_initialSendBufferSize;
 

-    GAddress *m_local;
-    GAddress *m_peer;
+    wxSockAddressImpl m_local,
+                      m_peer;

     wxSocketError m_error;
 
     wxSocketError m_error;
 

-    bool m_non_blocking;
-    bool m_server;

     bool m_stream;
     bool m_establishing;
     bool m_reusable;
     bool m_stream;
     bool m_establishing;
     bool m_reusable;


@@ -296,25 +306,13 @@ public:
 
     struct timeval m_timeout;
 
 
     struct timeval m_timeout;
 

-    wxSocketEventFlags m_detected;
-

 protected:
     wxSocketImpl(wxSocketBase& wxsocket);
 
 protected:
     wxSocketImpl(wxSocketBase& wxsocket);
 

-    // wait until input/output becomes available or m_timeout expires
-    //
-    // returns true if we do have input/output or false on timeout or error
-    // (also sets m_error accordingly)
-    bool BlockForInputWithTimeout()
-        { return DoBlockWithTimeout(wxSOCKET_INPUT_FLAG); }
-    bool BlockForOutputWithTimeout()
-        { return DoBlockWithTimeout(wxSOCKET_OUTPUT_FLAG); }
+    // true if we're a listening stream socket
+    bool m_server;

 
 private:
 
 private:

-    // handle the given connect() return value (which may be 0 or EWOULDBLOCK
-    // or something else)
-    virtual wxSocketError DoHandleConnect(int ret) = 0;
-

     // called by Close() if we have a valid m_fd
     virtual void DoClose() = 0;
 
     // called by Close() if we have a valid m_fd
     virtual void DoClose() = 0;
 


@@ -325,7 +323,7 @@ private:
     // check that the socket wasn't created yet and that the given address
     // (either m_local or m_peer depending on the socket kind) is valid and
     // set m_error and return false if this is not the case
     // check that the socket wasn't created yet and that the given address
     // (either m_local or m_peer depending on the socket kind) is valid and
     // set m_error and return false if this is not the case

-    bool PreCreateCheck(GAddress *addr);
+    bool PreCreateCheck(const wxSockAddressImpl& addr);

 
     // set the given socket option: this just wraps setsockopt(SOL_SOCKET)
     int SetSocketOption(int optname, int optval)
 
     // set the given socket option: this just wraps setsockopt(SOL_SOCKET)
     int SetSocketOption(int optname, int optval)


@@ -351,11 +349,11 @@ private:
     // update local address after binding/connecting
     wxSocketError UpdateLocalAddress();
 
     // update local address after binding/connecting
     wxSocketError UpdateLocalAddress();
 

-    // wait for IO on the socket or until timeout expires
-    //
-    // the parameter can be one of wxSOCKET_INPUT/OUTPUT_FLAG (but could be
-    // their combination in the future, hence we take wxSocketEventFlags)
-    bool DoBlockWithTimeout(wxSocketEventFlags flags);
+    // functions used to implement Read/Write()
+    int RecvStream(void *buffer, int size);
+    int RecvDgram(void *buffer, int size);
+    int SendStream(const void *buffer, int size);
+    int SendDgram(const void *buffer, int size);

 
 
     // set in ctor and never changed except that it's reset to NULL when the
 
 
     // set in ctor and never changed except that it's reset to NULL when the


@@ -371,79 +369,6 @@ private:
     #include "wx/unix/private/sockunix.h"
 #endif
 
     #include "wx/unix/private/sockunix.h"
 #endif
 

-
-/* GAddress */
-
-// TODO: make GAddress a real class instead of this mix of C and C++
-
-// Represents a socket endpoint, i.e. -- in spite of its name -- not an address
-// but an (address, port) pair
-struct GAddress
-{
-    struct sockaddr *m_addr;
-    size_t m_len;
-
-    GAddressType m_family;
-    int m_realfamily;
-
-    wxSocketError m_error;
-};
-
-GAddress *GAddress_new();
-GAddress *GAddress_copy(GAddress *address);
-void GAddress_destroy(GAddress *address);
-
-void GAddress_SetFamily(GAddress *address, GAddressType type);
-GAddressType GAddress_GetFamily(GAddress *address);
-
-/* The use of any of the next functions will set the address family to
- * the specific one. For example if you use GAddress_INET_SetHostName,
- * address family will be implicitly set to AF_INET.
- */
-
-wxSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname);
-wxSocketError GAddress_INET_SetBroadcastAddress(GAddress *address);
-wxSocketError GAddress_INET_SetAnyAddress(GAddress *address);
-wxSocketError GAddress_INET_SetHostAddress(GAddress *address,
-                                          unsigned long hostaddr);
-wxSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
-                                       const char *protocol);
-wxSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port);
-
-wxSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname,
-                                       size_t sbuf);
-unsigned long GAddress_INET_GetHostAddress(GAddress *address);
-unsigned short GAddress_INET_GetPort(GAddress *address);
-
-wxSocketError _GAddress_translate_from(GAddress *address,
-                                      struct sockaddr *addr, int len);
-wxSocketError _GAddress_translate_to  (GAddress *address,
-                                      struct sockaddr **addr, int *len);
-wxSocketError _GAddress_Init_INET(GAddress *address);
-
-#if wxUSE_IPV6
-
-wxSocketError GAddress_INET6_SetHostName(GAddress *address, const char *hostname);
-wxSocketError GAddress_INET6_SetAnyAddress(GAddress *address);
-wxSocketError GAddress_INET6_SetHostAddress(GAddress *address,
-                                          struct in6_addr hostaddr);
-wxSocketError GAddress_INET6_SetPortName(GAddress *address, const char *port,
-                                       const char *protocol);
-wxSocketError GAddress_INET6_SetPort(GAddress *address, unsigned short port);
-
-wxSocketError GAddress_INET6_GetHostName(GAddress *address, char *hostname,
-                                       size_t sbuf);
-wxSocketError GAddress_INET6_GetHostAddress(GAddress *address,struct in6_addr *hostaddr);
-unsigned short GAddress_INET6_GetPort(GAddress *address);
-
-#endif // wxUSE_IPV6
-
-// these functions are available under all platforms but only implemented under
-// Unix ones, elsewhere they just return wxSOCKET_INVADDR
-wxSocketError _GAddress_Init_UNIX(GAddress *address);
-wxSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path);
-wxSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf);
-

 #endif /* wxUSE_SOCKETS */
 
 #endif /* _WX_PRIVATE_SOCKET_H_ */
 #endif /* wxUSE_SOCKETS */
 
 #endif /* _WX_PRIVATE_SOCKET_H_ */