Changeset 227:80a7e65167c4 in freeDiameter

Timestamp:

Mar 2, 2010, 2:17:15 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Cleanup verbosity and fix unintialized variable

Location:

freeDiameter

Files:

• cnxctx.c (modified) (4 diffs)
• sctp.c (modified) (1 diff)
• sctps.c (modified) (1 diff)
• server.c (modified) (1 diff)
• tcp.c (modified) (1 diff)

freeDiameter/cnxctx.c

@@ -287 +287 @@
 struct cnxctx * fd_cnx_cli_connect_tcp(sSA * sa /* contains the port already */, socklen_t addrlen)
 {
-        int sock;
+        int sock = 0;
         struct cnxctx * cnx = NULL;
         
@@ -294 +294 @@
         
         /* Create the socket and connect, which can take some time and/or fail */
-        CHECK_FCT_DO( fd_tcp_client( &sock, sa, addrlen ), return NULL );
+        {
+                int ret = fd_tcp_client( &sock, sa, addrlen );
+                if (ret != 0) {
+                        int lvl;
+                        switch (ret) {
+                                case ECONNREFUSED:
+
+                                        /* "Normal" errors */
+                                        lvl = FULL;
+                                        break;
+                                default:
+                                        lvl = INFO;
+                        }
+                        /* Some errors are expected, we log at different level */
+                        TRACE_DEBUG( lvl, "fd_tcp_client returned an error: %s", strerror(ret));
+                        return NULL;
+                }
+        }
         
         if (TRACE_BOOL(INFO)) {
@@ -344 +361 @@
         CHECK_FCT_DO( ENOTSUP, return NULL);
 #else /* DISABLE_SCTP */
-        int sock;
+        int sock = 0;
         struct cnxctx * cnx = NULL;
         sSS primary;
@@ -351 +368 @@
         CHECK_PARAMS_DO( list && !FD_IS_LIST_EMPTY(list), return NULL );
         
-        CHECK_FCT_DO( fd_sctp_client( &sock, no_ip6, port, list ), return NULL );
+        {
+                int ret = fd_sctp_client( &sock, no_ip6, port, list );
+                if (ret != 0) {
+                        int lvl;
+                        switch (ret) {
+                                case ECONNREFUSED:
+
+                                        /* "Normal" errors */
+                                        lvl = FULL;
+                                        break;
+                                default:
+                                        lvl = INFO;
+                        }
+                        /* Some errors are expected, we log at different level */
+                        TRACE_DEBUG( lvl, "fd_sctp_client returned an error: %s", strerror(ret));
+                        return NULL;
+                }
+        }
         
         /* Once the socket is created successfuly, prepare the remaining of the cnx */

freeDiameter/sctp.c

@@ -841 +841 @@
         
 #ifdef SCTP_CONNECTX_4_ARGS
-        CHECK_SYS_DO( sctp_connectx(*sock, sar.sa, count, NULL), { ret = errno; goto fail; } );
+        ret = sctp_connectx(*sock, sar.sa, count, NULL);
 #else /* SCTP_CONNECTX_4_ARGS */
-        CHECK_SYS_DO( sctp_connectx(*sock, sar.sa, count), { ret = errno; goto fail; } );
+        ret = sctp_connectx(*sock, sar.sa, count);
 #endif /* SCTP_CONNECTX_4_ARGS */
+        
+        if (ret < 0) {
+                int lvl;
+                switch (ret = errno) {
+                        case ECONNREFUSED:
+                        
+                                /* "Normal" errors */
+                                lvl = FULL;
+                                break;
+                        default:
+                                lvl = INFO;
+                }
+                /* Some errors are expected, we log at different level */
+                TRACE_DEBUG( lvl, "sctp_connectx returned an error: %s", strerror(ret));
+                goto fail;
+        }
         
         free(sar.buf); sar.buf = NULL;

freeDiameter/sctps.c

@@ -238 +238 @@
         pthread_rwlock_t lock;
         struct cnxctx   *parent;
-        /* Add another list to chain in a global list to implement a garbage collector on sessions -- TODO */
+        /* Add another list to chain in a global list to implement a garbage collector on sessions -- TODO if needed */
 };
 

freeDiameter/server.c

@@ -274 +274 @@
                         (void) fd_cnx_getendpoints(s->conn, &fd_g_config->cnf_endpoints, NULL);
                         if (TRACE_BOOL(FULL)){
-                                fd_log_debug("Server bound on the following addresses :\n");
+                                fd_log_debug("  Local server address(es) :\n");
                                 fd_ep_dump( 5, &fd_g_config->cnf_endpoints );
                         }

freeDiameter/tcp.c

@@ -136 +136 @@
         
         /* Try connecting to the remote address */
-        CHECK_SYS_DO( connect(s, sa, salen), { ret = errno; close(s); s = -1; } );
+        ret = connect(s, sa, salen);
+        
+        pthread_cleanup_pop(0);
+        
+        if (ret < 0) {
+                int lvl;
+                switch (ret = errno) {
+                        case ECONNREFUSED:
+                        
+                                /* "Normal" errors */
+                                lvl = FULL;
+                                break;
+                        default:
+                                lvl = INFO;
+                }
+                /* Some errors are expected, we log at different level */
+                TRACE_DEBUG( lvl, "connect returned an error: %s", strerror(ret));
+                CHECK_SYS_DO( close(s), /* continue */ );
+                *sock = -1;
+                return ret;
+        }
         
         /* Done! */
-        pthread_cleanup_pop(0);
         *sock = s;
         return ret;