Changeset 14 in cheroxy for trunk/include

Timestamp:

10/24/12 11:12:11 (12 years ago)

Author:

cheese

Message:

#1 add timeout to socket connection and fix test label in makefile

File:

• trunk/include/CRXSocket.h (modified) (3 diffs)

trunk/include/CRXSocket.h

@@ -18 +18 @@
 using namespace std;
 
-typedef struct sockaddr     stSockAddr;
-typedef struct sockaddr_in  stSockAddrIn;
-typedef unsigned short      ushort;
-typedef unsigned int        uint;
+#define TCPSOCKET_NO_TIMEOUT                    -1
 
 #define ERROR_TCPSOCKET                         -1000
@@ -36 +33 @@
 #define ERROR_TCPSOCKET_FAILED_TO_RECEIVE       ERROR_TCPSOCKET - 10
 #define ERROR_TCPSOCKET_NOT_READY               ERROR_TCPSOCKET - 11
+#define ERROR_TCPSOCKET_FAILED_TO_SETSOCKOPT    ERROR_TCPSOCKET - 12
 
 class CRXSocket
 {
 private:
-    static bool     mInitialized;
-    stSockAddrIn    mAddress;
-    int             mSocket;
+    static bool         mInitialized;
+    struct sockaddr_in  mAddress;
+    int                 mSocket;
 
 private:
@@ -90 +88 @@
      * for server
      */
-    int CreateServer            (ushort         aPort,
-                                 int            aBacklog = 5,
-                                 stSockAddrIn   * aAddress = NULL);
+    int CreateServer            (const unsigned short   aPort,
+                                 const int              aBacklog = 5,
+                                 struct sockaddr_in     * aAddress = NULL);
 
-    int Accept                  (stSockAddrIn   * aRemoteAddress = NULL,
-                                 int            * aAddressLength = NULL);
+    int Accept                  (struct sockaddr_in * aRemoteAddress = NULL,
+                                 int                * aAddressLength = NULL);
 
     /**
      * for client
      */
-    int Connect                 (std::string    aUrl,
-                                 ushort         aPort);
+    int Connect                 (const std::string      aUrl,
+                                 const unsigned short   aPort,
+                                 const int              aTimeout = TCPSOCKET_NO_TIMEOUT);
 
     /**