Changeset 191:de80f6a76c4f in freeDiameter

Timestamp:

Feb 5, 2010, 6:12:47 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Another attempt to workround the crash issue...

Files:

• freeDiameter/tcp.c (modified) (1 diff)
• include/freeDiameter/libfreeDiameter.h (modified) (1 diff)

freeDiameter/tcp.c

@@ -118 +118 @@
 int fd_tcp_client( int *sock, sSA * sa, socklen_t salen )
 {
+        int ret = 0;
+        int s;
+        
         TRACE_ENTRY("%p %p %d", sock, sa, salen);
-        CHECK_PARAMS( sock && sa && salen );
+        CHECK_PARAMS( sock && (*sock <= 0) && sa && salen );
         
         /* Create the socket */
-        CHECK_SYS(  *sock = socket(sa->sa_family, SOCK_STREAM, IPPROTO_TCP)  );
+        CHECK_SYS(  s = socket(sa->sa_family, SOCK_STREAM, IPPROTO_TCP)  );
         
         /* Cleanup if we are cancelled */
-        pthread_cleanup_push(fd_cleanup_socket, sock);
+        pthread_cleanup_push(fd_cleanup_socket, &s);
         
         /* Set the socket options */
-        CHECK_FCT(  fd_tcp_setsockopt(sa->sa_family, *sock)  );
+        CHECK_FCT(  fd_tcp_setsockopt(sa->sa_family, s)  );
         
         TRACE_DEBUG_sSA(FULL, "Attempting TCP connection with peer: ", sa, NI_NUMERICHOST | NI_NUMERICSERV, "..." );
         
         /* Try connecting to the remote address */
-        CHECK_SYS_DO( connect(*sock, sa, salen), { int ret = errno; close(*sock); *sock = -1; return ret; } );
+        CHECK_SYS_DO( connect(s, sa, salen), { ret = errno; close(s); s = -1; } );
         
         /* Done! */
         pthread_cleanup_pop(0);
-        return 0;
+        *sock = s;
+        return ret;
 }
 

include/freeDiameter/libfreeDiameter.h

@@ -522 +522 @@
 static __inline__ void fd_cleanup_socket(void * sockptr)
 {
-        if (sockptr) {
+        if (sockptr && (*(int *)sockptr > 0)) {
                 CHECK_SYS_DO( close(*(int *)sockptr), /* ignore */ );
                 *(int *)sockptr = -1;