Changeset 48 in libcf for trunk/src/cf_socket.c

Timestamp:

03/29/13 16:04:12 (11 years ago)

Author:

cheese

Message:

#1 add socket option (reuseaddr and linger) and fix test code bug

File:

• trunk/src/cf_socket.c (modified) (5 diffs)

trunk/src/cf_socket.c

@@ -72 +72 @@
 
 static int
+CF_Socket_Local_SetLinger (const int sock)
+{
+    struct linger linger;
+
+    linger.l_onoff = 1;
+    linger.l_linger = 0;
+
+    return CF_Socket_SetOption (sock,
+                                SO_LINGER,
+                                &linger,
+                                sizeof (linger));
+}
+
+static int
+CF_Socket_Local_SetReUseAddr (const int sock)
+{
+    int reuseaddr = 1;
+
+    return CF_Socket_SetOption (sock,
+                                SO_REUSEADDR,
+                                &reuseaddr,
+                                sizeof (reuseaddr));
+}
+
+static int
 CF_Socket_Local_CheckTimeout (const int sock,
                               const int timeout)
@@ -281 +306 @@
     struct sockaddr_in  address;
     struct hostent      * hostEnt;
-    struct linger       linger;
 
     int                 retval = 0;
@@ -300 +324 @@
     address.sin_port        = htons (port);
     address.sin_addr.s_addr = inet_addr (ip);
-
-    linger.l_onoff = 1;
-    linger.l_linger = 0;
 
     TRY
@@ -323 +344 @@
 
         /* 4. set options */
-        result = CF_Socket_SetOption (sock, SO_LINGER, &linger, sizeof (linger));
-        if (result < 0)
+        if (CF_Socket_Local_SetLinger (sock)    < 0 ||
+            CF_Socket_Local_SetReUseAddr (sock) < 0 )
         {
             result = CF_ERROR_SOCKET_SET_OPTION;
@@ -425 +446 @@
     TRY
     {
+        if (CF_Socket_Local_SetLinger (sock)    < 0 ||
+            CF_Socket_Local_SetReUseAddr (sock) < 0 )
+        {
+            result = CF_ERROR_SOCKET_SET_OPTION;
+            TRY_BREAK;
+        }
+
         result = bind (sock, (struct sockaddr *) &address, sizeof (struct sockaddr));
         if (result < 0)