Changeset 691:78b665400097 in freeDiameter for libfdcore/sctp.c

Timestamp:

Jan 20, 2011, 7:44:27 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors

File:

• libfdcore/sctp.c (modified) (3 diffs)

libfdcore/sctp.c

@@ -822 +822 @@
         
         /* Set the socket options */
-        CHECK_FCT_DO( ret = fd_setsockopt_prebind(*sock), goto fail );
+        CHECK_FCT_DO( ret = fd_setsockopt_prebind(*sock), goto out );
         
         /* Create the array of addresses, add first the configured addresses, then the discovered, then the other ones */
-        CHECK_FCT_DO( ret = add_addresses_from_list_mask(&sar.buf, &size, &count, family, htons(port), list, EP_FL_CONF,              EP_FL_CONF        ), goto fail );
-        CHECK_FCT_DO( ret = add_addresses_from_list_mask(&sar.buf, &size, &count, family, htons(port), list, EP_FL_CONF | EP_FL_DISC, EP_FL_DISC        ), goto fail );
-        CHECK_FCT_DO( ret = add_addresses_from_list_mask(&sar.buf, &size, &count, family, htons(port), list, EP_FL_CONF | EP_FL_DISC, 0         ), goto fail );
+        CHECK_FCT_DO( ret = add_addresses_from_list_mask(&sar.buf, &size, &count, family, htons(port), list, EP_FL_CONF,              EP_FL_CONF        ), goto out );
+        CHECK_FCT_DO( ret = add_addresses_from_list_mask(&sar.buf, &size, &count, family, htons(port), list, EP_FL_CONF | EP_FL_DISC, EP_FL_DISC        ), goto out );
+        CHECK_FCT_DO( ret = add_addresses_from_list_mask(&sar.buf, &size, &count, family, htons(port), list, EP_FL_CONF | EP_FL_DISC, 0         ), goto out );
         
         /* Try connecting */
@@ -866 +866 @@
                 /* Some errors are expected, we log at different level */
                 TRACE_DEBUG( lvl, "sctp_connectx returned an error: %s", strerror(ret));
-                goto fail;
+                goto out;
         }
         
@@ -872 +872 @@
         
         /* Set the remaining sockopts */
-        CHECK_FCT_DO( ret = fd_setsockopt_postbind(*sock, 1), goto fail_deco );
-        
-        /* Done! */
+        CHECK_FCT_DO( ret = fd_setsockopt_postbind(*sock, 1), 
+                { 
+                        CHECK_SYS_DO( shutdown(*sock, SHUT_RDWR), /* continue */ );
+                } );
+        
+out:
+        ;
         pthread_cleanup_pop(0);
-        return 0;
-        
-fail_deco:
-        CHECK_SYS_DO( shutdown(*sock, SHUT_RDWR), /* continue */ );
-fail:
-        if (*sock > 0) {
-                CHECK_SYS_DO( close(*sock), /* continue */ );
-                *sock = -1;
-        }
-        free(sar.buf);
+        
+        if (ret) {
+                if (*sock > 0) {
+                        CHECK_SYS_DO( close(*sock), /* continue */ );
+                        *sock = -1;
+                }
+                free(sar.buf);
+        }
         return ret;
 }