Changeset 1198:8c4dd4b693c6 in freeDiameter for libfdcore

Timestamp:

Jun 13, 2013, 6:30:14 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Some cleanups in the traces

Location:

libfdcore

Files:

• cnxctx.c (modified) (2 diffs)
• p_cnx.c (modified) (3 diffs)
• p_psm.c (modified) (1 diff)
• sctp.c (modified) (1 diff)
• tcp.c (modified) (3 diffs)

libfdcore/cnxctx.c

@@ -293 +293 @@
         fd_sa_sdump_numeric(sa_buf, sa);
         
+        LOG_D("Connecting to TCP %s...", sa_buf);
+        
         /* Create the socket and connect, which can take some time and/or fail */
         {
                 int ret = fd_tcp_client( &sock, sa, addrlen );
                 if (ret != 0) {
-                        LOG_A("TCP connection to %s failed: %s", sa_buf, strerror(ret));
+                        LOG_D("TCP connection to %s failed: %s", sa_buf, strerror(ret));
                         return NULL;
                 }
@@ -348 +350 @@
         fd_sa_sdump_numeric(sa_buf, &((struct fd_endpoint *)(list->next))->sa);
         
+        LOG_D("Connecting to SCTP %s:%hu...", sa_buf, port);
+        
         {
                 int ret = fd_sctp_client( &sock, no_ip6, port, list );
                 if (ret != 0) {
-                        LOG_A("SCTP connection to [%s,...] failed: %s", sa_buf, strerror(ret));
+                        LOG_D("SCTP connection to [%s,...] failed: %s", sa_buf, strerror(ret));
                         return NULL;
                 }

libfdcore/p_cnx.c

@@ -78 +78 @@
         uint16_t        port_no; /* network order */
         int             dotls_immediate;
+        int count = 0;
         
         TRACE_ENTRY("%p", peer);
@@ -184 +185 @@
                                 fd_list_insert_before(&peer->p_connparams, &new->chain);
                         }
+                        count++;
                 }
         }
@@ -206 +208 @@
                         fd_list_insert_after(&peer->p_connparams, &new->chain); /* very first position */
                 }
+                count++;
         }
 #endif /* DISABLE_SCTP */
+        
+        LOG_D("Prepared %d sets of connection parameters to peer %s", count, peer->p_hdr.info.pi_diamid);
         
         return 0;

libfdcore/p_psm.c

@@ -814 +814 @@
                                 
                         case STATE_WAITCNXACK:
-                                LOG_D("%s: Connection attempt failed", peer->p_hdr.info.pi_diamid);
                                 /* Go back to CLOSE */
                                 fd_psm_next_timeout(peer, 1, peer->p_hdr.info.config.pic_tctimer ?: fd_g_config->cnf_timer_tc);

libfdcore/sctp.c

@@ -936 +936 @@
         
         if (ret < 0) {
-                int lvl;
-                switch (ret = errno) {
-                        case ECONNREFUSED:
-                        
-                                /* "Normal" errors */
-                                lvl = FULL;
-                                break;
-                        default:
-                                lvl = INFO;
-                }
+                ret = errno;
                 /* Some errors are expected, we log at different level */
-                TRACE_DEBUG( lvl, "sctp_connectx returned an error: %s", strerror(ret));
+                LOG_A("sctp_connectx returned an error: %s", strerror(ret));
                 goto out;
         }

libfdcore/tcp.c

@@ -124 +124 @@
         int ret = 0;
         int s;
-        char * buf = NULL; size_t len = 0;
         
         TRACE_ENTRY("%p %p %d", sock, sa, salen);
@@ -138 +137 @@
         pthread_cleanup_push(fd_cleanup_socket, &s);
         
-        LOG_D( "Attempting TCP connection to %s...", fd_sa_dump(&buf, &len, NULL, sa, NI_NUMERICHOST | NI_NUMERICSERV)?:"<error>" );
-        free(buf);
-        
         /* Try connecting to the remote address */
         ret = connect(s, sa, salen);
@@ -147 +143 @@
         
         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));
+                ret = errno;
+                LOG_A( "connect returned an error: %s", strerror(ret));
                 CHECK_SYS_DO( close(s), /* continue */ );
                 *sock = -1;