Changeset 965:9b37f34c1b1f in freeDiameter for libfdcore/sctp.c

Timestamp:

Mar 13, 2013, 1:23:37 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Some modifications to logging code:

• Added a FD_LOG_NOTICE level for the logger function
• Separated the internal debug levels (NONE, INFO, ...) from the "printlevel" for the logger
• Renamed TRACE_DEBUG_ERROR to TRACE_ERROR for symetry
• Renamed TRACE_DEBUG_BUFFER and TRACE_DEBUG_sSA. There take now the printlevel as parameter
• Added new TRACE_NOTICE, fd_log_notice and fd_log_error macros.
• sorry if I forgot some changes...

File:

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

libfdcore/sctp.c

@@ -748 +748 @@
                         fd_log_debug("Calling sctp_bindx with the following address array:\n");
                         for (i = 0; i < count; i++) {
-                                TRACE_DEBUG_sSA(FULL, "    - ", ptr.sa, NI_NUMERICHOST | NI_NUMERICSERV, "" );
+                                TRACE_sSA(FD_LOG_DEBUG, FULL, "    - ", ptr.sa, NI_NUMERICHOST | NI_NUMERICSERV, "" );
                                 ptr.buf += (ptr.sa->sa_family == AF_INET) ? sizeof(sSA4) : sizeof(sSA6) ;
                         }
@@ -776 +776 @@
                 fd_log_debug("SCTP server bound on :\n");
                 for (ptr.sa = sar; sz-- > 0; ptr.buf += (ptr.sa->sa_family == AF_INET) ? sizeof(sSA4) : sizeof(sSA6)) {
-                        TRACE_DEBUG_sSA(FULL, "    - ", ptr.sa, NI_NUMERICHOST | NI_NUMERICSERV, "" );
+                        TRACE_sSA(FD_LOG_DEBUG, FULL, "    - ", ptr.sa, NI_NUMERICHOST | NI_NUMERICSERV, "" );
                 }
                 sctp_freeladdrs(sar);
@@ -842 +842 @@
                 ptr.buf = sar.buf;
                 for (i=0; i< count; i++) {
-                        TRACE_DEBUG_sSA(FULL, "  - ", ptr.sa, NI_NUMERICHOST | NI_NUMERICSERV, "" );
+                        TRACE_sSA(FD_LOG_DEBUG, FULL, "  - ", ptr.sa, NI_NUMERICHOST | NI_NUMERICSERV, "" );
                         ptr.buf += (ptr.sa->sa_family == AF_INET) ? sizeof(sSA4) : sizeof(sSA6);
                 }
@@ -1151 +1151 @@
                         case SCTP_PEER_ADDR_CHANGE:
                                 TRACE_DEBUG(FULL, "Received SCTP_PEER_ADDR_CHANGE notification");
-                                TRACE_DEBUG_sSA(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);