Changeset 184:89d39bcf9ef5 in freeDiameter

Timestamp:

Feb 4, 2010, 4:52:10 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Some cleanups

Files:

• freeDiameter/p_psm.c (modified) (1 diff)
• freeDiameter/sctp.c (modified) (2 diffs)
• freeDiameter/tcp.c (modified) (1 diff)
• include/freeDiameter/libfreeDiameter.h (modified) (1 diff)

freeDiameter/p_psm.c

@@ -626 +626 @@
         /* A new connection has not been established with the remote peer */
         if (event == FDEVP_CNX_FAILED) {
-                struct cnxctx * cnx = ev_data;
                 
                 /* Release the resources of the connecting thread */

freeDiameter/sctp.c

@@ -868 +868 @@
         
         /* Set the remaining sockopts */
-        CHECK_FCT_DO( ret = fd_setsockopt_postbind(*sock, 1), goto fail );
+        CHECK_FCT_DO( ret = fd_setsockopt_postbind(*sock, 1), goto fail_deco );
         
         /* Done! */
@@ -874 +874 @@
         return 0;
         
+fail_deco:
+        shutdown(*sock, SHUT_RDWR);
 fail:
         if (*sock > 0) {
-                shutdown(*sock, SHUT_RDWR);
+                close(*sock);
                 *sock = -1;
         }

freeDiameter/tcp.c

@@ -133 +133 @@
         
         /* Try connecting to the remote address */
-        CHECK_SYS( connect(*sock, sa, salen) );
+        CHECK_SYS_DO( connect(*sock, sa, salen), { int ret = errno; close(*sock); *sock = -1; return ret; } );
         
         /* Done! */

include/freeDiameter/libfreeDiameter.h

@@ -524 +524 @@
         if (sockptr) {
                 CHECK_SYS_DO( close(*(int *)sockptr), /* ignore */ );
-                *(int *)sockptr = 0;
+                *(int *)sockptr = -1;
         }
 }