Changeset 1107:96f2051215c8 in freeDiameter for libfdcore

Timestamp:

May 12, 2013, 11:39:07 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Replaced calls to TRACE_sSA and sSA_DUMP_NODE* macros

Location:

libfdcore

Files:

• config.c (modified) (1 diff)
• core.c (modified) (1 diff)
• sctp.c (modified) (10 diffs)

libfdcore/config.c

@@ -347 +347 @@
                         if ( (fd_g_config->cnf_flags.no_ip4 && (ep->sa.sa_family == AF_INET))
                            ||(fd_g_config->cnf_flags.no_ip6 && (ep->sa.sa_family == AF_INET6)) ) {
+                                char sa_buf[sSA_DUMP_STRLEN];;
                                 li = li->prev;
                                 fd_list_unlink(&ep->chain);
-                                if (TRACE_BOOL(INFO)) {
-                                        char buf[1024];
-                                        sSA_DUMP_NODE( buf, sizeof(buf), &ep->sa, NI_NUMERICHOST );
-                                        fd_log_debug("Info: Removing local address conflicting with the flags no_IP / no_IP6 : %s", buf);
-                                }
+                                fd_sa_sdump_numeric(sa_buf, &ep->sa);
+                                LOG_N("Info: Removing local address conflicting with the flags no_IP / no_IP6 : %s", sa_buf);
                                 free(ep);
                         }

libfdcore/core.c

@@ -220 +220 @@
         /* Display configuration */
         b = fd_conf_dump(&buf, &len, NULL);
-        LOG_N("%s\n", b ?: "Error during configuration dump...");
+        LOG_N("%s", b ?: "Error during configuration dump...");
         
         /* Display registered triggers for FDEV_TRIGGER */
         b = fd_event_trig_dump(&buf, &len, &offset);
         if (!b || offset) {
-                LOG_N("%s\n", b ?: "Error during triggers dump...");
+                LOG_N("%s", b ?: "Error during triggers dump...");
         }
         

libfdcore/sctp.c

@@ -739 +739 @@
                 }
                 
-                if (TRACE_BOOL(SCTP_LEVEL)) {
+                #if 0
                         union {
                                 sSA     *sa;
@@ -751 +751 @@
                                 ptr.buf += (ptr.sa->sa_family == AF_INET) ? sizeof(sSA4) : sizeof(sSA6) ;
                         }
-                }
+                #endif
                 
                 /* Bind to this array */
@@ -764 +764 @@
         
         /* Debug: show all local listening addresses */
-        if (TRACE_BOOL(SCTP_LEVEL)) {
+        #if 0
                 sSA *sar;
                 union {
@@ -779 +779 @@
                 }
                 sctp_freeladdrs(sar);
-        }
+        #endif
 
         return 0;
@@ -830 +830 @@
         
         /* Try connecting */
-        if (TRACE_BOOL(FULL)) {
-                TRACE_DEBUG(FULL, "Attempting SCTP connection (%d addresses attempted) :", count);
+        LOG_A("Attempting SCTP connection (%d addresses attempted) ", count);
+                
+#if 0
                 /* Dump the SAs */
                 union {
@@ -845 +846 @@
                         ptr.buf += (ptr.sa->sa_family == AF_INET) ? sizeof(sSA4) : sizeof(sSA6);
                 }
-        }
+#endif
         
 #ifdef SCTP_CONNECTX_4_ARGS
@@ -908 +909 @@
                 return ENOTSUP;
         }
-        if (TRACE_BOOL(SCTP_LEVEL)) {
-                char buf[1024];
-                sSA_DUMP_NODE_SERV(buf, sizeof(buf), &status.sstat_primary.spinfo_address, NI_NUMERICHOST | NI_NUMERICSERV );
+#if 0
+                char sa_buf[sSA_DUMP_STRLEN];
+                fd_sa_sdump_numeric(sa_buf, &status.sstat_primary.spinfo_address);
                 fd_log_debug( "SCTP_STATUS : sstat_state                  : %i" , status.sstat_state);
                 fd_log_debug( "              sstat_rwnd                   : %u" , status.sstat_rwnd);
@@ -918 +919 @@
                 fd_log_debug( "              sstat_outstrms               : %hu", status.sstat_outstrms);
                 fd_log_debug( "              sstat_fragmentation_point    : %u" , status.sstat_fragmentation_point);
-                fd_log_debug( "              sstat_primary.spinfo_address : %s" , buf);
+                fd_log_debug( "              sstat_primary.spinfo_address : %s" , sa_buf);
                 fd_log_debug( "              sstat_primary.spinfo_state   : %d" , status.sstat_primary.spinfo_state);
                 fd_log_debug( "              sstat_primary.spinfo_cwnd    : %u" , status.sstat_primary.spinfo_cwnd);
@@ -924 +925 @@
                 fd_log_debug( "              sstat_primary.spinfo_rto     : %u" , status.sstat_primary.spinfo_rto);
                 fd_log_debug( "              sstat_primary.spinfo_mtu     : %u" , status.sstat_primary.spinfo_mtu);
-        }
+#endif /* 0 */
         
         *in = status.sstat_instrms;
@@ -1150 +1151 @@
                         case SCTP_PEER_ADDR_CHANGE:
                                 TRACE_DEBUG(FULL, "Received SCTP_PEER_ADDR_CHANGE notification");
-                                TRACE_sSA(FD_LOG_DEBUG, SCTP_LEVEL, "    intf_change : ", &(notif->sn_paddr_change.spc_aaddr), NI_NUMERICHOST | NI_NUMERICSERV, "" );
+                                /* TRACE_sSA(FD_LOG_DEBUG, SCTP_LEVEL, "    intf_change : ", &(notif->sn_paddr_change.spc_aaddr), NI_NUMERICHOST | NI_NUMERICSERV, "" ); */
                                 TRACE_DEBUG(SCTP_LEVEL, "          state : %d", notif->sn_paddr_change.spc_state);
                                 TRACE_DEBUG(SCTP_LEVEL, "          error : %d", notif->sn_paddr_change.spc_error);