Changeset 965:9b37f34c1b1f in freeDiameter for libfdcore

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...

Location:

libfdcore

Files:

• config.c (modified) (1 diff)
• fdd.l (modified) (10 diffs)
• fdd.y (modified) (8 diffs)
• sctp.c (modified) (4 diffs)
• sctps.c (modified) (5 diffs)
• tcp.c (modified) (1 diff)

libfdcore/config.c

@@ -248 +248 @@
         if (fddin == NULL) {
                 int ret = errno;
-                TRACE_DEBUG_ERROR("Unable to open configuration file for reading; tried the following locations: %s%s%s; Error: %s\n",
+                TRACE_ERROR("Unable to open configuration file for reading; tried the following locations: %s%s%s; Error: %s\n",
                                   orig ?: "", orig? " and " : "", fd_g_config->cnf_file, strerror(ret));
                 return ret;

libfdcore/fdd.l

@@ -52 +52 @@
         yylloc->first_column = yylloc->last_column + 1;                 \
         yylloc->last_column = yylloc->first_column + yyleng - 1;        \
-        TRACE_DEBUG_ERROR(                                              \
+        TRACE_ERROR(                                            \
                 "(%d:%d-%d:%d) matched rule %d, length=%d, txt='%s'\n", \
                 yylloc->first_line, yylloc->first_column,               \
@@ -84 +84 @@
 int globerrfct(const char *epath, int eerrno)
 {
-        TRACE_DEBUG_ERROR("Failed to scan %s: %s\n", epath, strerror(eerrno));
+        TRACE_ERROR("Failed to scan %s: %s\n", epath, strerror(eerrno));
         return 1;
 }
@@ -119 +119 @@
                         if (buf[yyleng-2] != '"')
                         {
-                                TRACE_DEBUG_ERROR("Unterminated string: %s\n", yytext);
+                                TRACE_ERROR("Unterminated string: %s\n", yytext);
                                 return LEX_ERROR;
                         }
@@ -126 +126 @@
                         if (current_nested_level >= MAX_NESTED_CONF_FILES)
                         {
-                                TRACE_DEBUG_ERROR("Too many recursion levels in configuration files includes\n");
+                                TRACE_ERROR("Too many recursion levels in configuration files includes\n");
                                 return LEX_ERROR;
                         }
@@ -135 +135 @@
                         if (globerror == GLOB_NOSPACE)
                         {
-                                TRACE_DEBUG_ERROR("Not enough memory to parse include directive.\n");
+                                TRACE_ERROR("Not enough memory to parse include directive.\n");
                                 return LEX_ERROR;
                         }
                         if (globerror == GLOB_ABORTED)
                         {
-                                TRACE_DEBUG_ERROR("An error was encountered in include directive.\n");
+                                TRACE_ERROR("An error was encountered in include directive.\n");
                                 return LEX_ERROR;
                         }
@@ -150 +150 @@
                         if (globerror)
                         {
-                                TRACE_DEBUG_ERROR("Unexpected error in glob (%d).\n", globerror);
+                                TRACE_ERROR("Unexpected error in glob (%d).\n", globerror);
                                 return LEX_ERROR;
                         }
@@ -166 +166 @@
                         if ( ! yyin )
                         {
-                                TRACE_DEBUG_ERROR("Error in %s: %s", nested_conffiles[current_nested_level].filelist.gl_pathv[0], strerror(errno));
+                                TRACE_ERROR("Error in %s: %s", nested_conffiles[current_nested_level].filelist.gl_pathv[0], strerror(errno));
                                 return LEX_ERROR;
                         }
@@ -206 +206 @@
                                 if ( ! yyin )
                                 {
-                                        TRACE_DEBUG_ERROR("Error in %s: %s", nested_conffiles[current_nested_level].filelist.gl_pathv[nested_conffiles[current_nested_level].current_file], strerror(errno));
+                                        TRACE_ERROR("Error in %s: %s", nested_conffiles[current_nested_level].filelist.gl_pathv[nested_conffiles[current_nested_level].current_file], strerror(errno));
                                         return LEX_ERROR;
                                 }
@@ -234 +234 @@
                                 if (ret != 1) {
                                         /* No matching: an error occurred */
-                                        TRACE_DEBUG_ERROR("Unable to convert the value '%s' to a valid number: %s\n", yytext, strerror(errno));
+                                        TRACE_ERROR("Unable to convert the value '%s' to a valid number: %s\n", yytext, strerror(errno));
                                         return LEX_ERROR; /* trig an error in yacc parser */
                                         /* Maybe we could REJECT instead of failing here? */
@@ -277 +277 @@
         /* Unrecognized character */
 <*>.                    {
-                                TRACE_DEBUG_ERROR("Unrecognized text on line %d col %d: '%s'.\n", yylloc->first_line, yylloc->first_column, yytext);
+                                TRACE_ERROR("Unrecognized text on line %d col %d: '%s'.\n", yylloc->first_line, yylloc->first_column, yytext);
                                 return LEX_ERROR; 
                         }

libfdcore/fdd.y

@@ -63 +63 @@
 {
         if (ploc->first_line != ploc->last_line) {
-                TRACE_DEBUG_ERROR("%s:%d.%d-%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);
+                TRACE_ERROR("%s:%d.%d-%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);
         } else if (ploc->first_column != ploc->last_column) {
-                TRACE_DEBUG_ERROR("%s:%d.%d-%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_column, s);
+                TRACE_ERROR("%s:%d.%d-%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_column, s);
         } else {
-                TRACE_DEBUG_ERROR("%s:%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, s);
+                TRACE_ERROR("%s:%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, s);
         }
 }
@@ -328 +328 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("WARNING: Unable to open extension file %s for reading: %s\nLD_LIBRARY_PATH will be used.\n", fname, strerror(ret));
+                                        TRACE_ERROR("WARNING: Unable to open extension file %s for reading: %s\nLD_LIBRARY_PATH will be used.\n", fname, strerror(ret));
                                 } else {
                                         fclose(fd);
@@ -501 +501 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("Unable to open certificate file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_ERROR("Unable to open certificate file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -509 +509 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("Unable to open private key file %s for reading: %s\n", $5, strerror(ret));
+                                        TRACE_ERROR("Unable to open private key file %s for reading: %s\n", $5, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -532 +532 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("Unable to open CA file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_ERROR("Unable to open CA file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -572 +572 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("Unable to open CRL file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_ERROR("Unable to open CRL file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -615 +615 @@
                                                         &err_pos),
                                                 { yyerror (&yylloc, conf, "Error setting Priority parameter.");
-                                                  TRACE_DEBUG_ERROR("Error at position : %s\n", err_pos);
+                                                  TRACE_ERROR("Error at position : %s\n", err_pos);
                                                   YYERROR; } );
                         }
@@ -632 +632 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("Unable to open DH file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_ERROR("Unable to open DH file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;

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);

libfdcore/sctps.c

@@ -343 +343 @@
         
         CHECK_POSIX_DO( pthread_rwlock_wrlock(&sto->lock), return -1 );
-        TRACE_DEBUG_BUFFER(GNUTLS_DBG_LEVEL, "Session store [key ", key.data, key.size, "]");
+        TRACE_BUFFER(FD_LOG_DEBUG, GNUTLS_DBG_LEVEL, "Session store [key ", key.data, key.size, "]");
         
         li = find_or_next(sto, key, &match);
@@ -352 +352 @@
                 if ((data.size != sr->data.size) || memcmp(data.data, sr->data.data, data.size)) {
                         TRACE_DEBUG(INFO, "GnuTLS tried to store a session with same key and different data!");
-                        TRACE_DEBUG_BUFFER(INFO, "Session store [key ", key.data, key.size, "]");
-                        TRACE_DEBUG_BUFFER(INFO, "  -- old data [", sr->data.data, sr->data.size, "]");
-                        TRACE_DEBUG_BUFFER(INFO, "  -- new data [", data.data, data.size, "]");
+                        TRACE_BUFFER(FD_LOG_DEBUG, INFO, "Session store [key ", key.data, key.size, "]");
+                        TRACE_BUFFER(FD_LOG_DEBUG, INFO, "  -- old data [", sr->data.data, sr->data.size, "]");
+                        TRACE_BUFFER(FD_LOG_DEBUG, INFO, "  -- new data [", data.data, data.size, "]");
                         
                         ret = -1;
@@ -397 +397 @@
         
         CHECK_POSIX_DO( pthread_rwlock_wrlock(&sto->lock), return -1 );
-        TRACE_DEBUG_BUFFER(GNUTLS_DBG_LEVEL, "Session delete [key ", key.data, key.size, "]");
+        TRACE_BUFFER(FD_LOG_DEBUG, GNUTLS_DBG_LEVEL, "Session delete [key ", key.data, key.size, "]");
         
         li = find_or_next(sto, key, &match);
@@ -430 +430 @@
 
         CHECK_POSIX_DO( pthread_rwlock_rdlock(&sto->lock), return error );
-        TRACE_DEBUG_BUFFER(GNUTLS_DBG_LEVEL, "Session fetch [key ", key.data, key.size, "]");
+        TRACE_BUFFER(FD_LOG_DEBUG, GNUTLS_DBG_LEVEL, "Session fetch [key ", key.data, key.size, "]");
         
         li = find_or_next(sto, key, &match);
@@ -557 +557 @@
                         size_t   ids = sizeof(id);
                         CHECK_GNUTLS_DO( gnutls_session_get_id(conn->cc_tls_para.session, id, &ids), /* continue */ );
-                        TRACE_DEBUG_BUFFER(GNUTLS_DBG_LEVEL, "Master session id: [", id, ids, "]");
+                        TRACE_BUFFER(FD_LOG_DEBUG, GNUTLS_DBG_LEVEL, "Master session id: [", id, ids, "]");
                 }
         }

libfdcore/tcp.c

@@ -137 +137 @@
         pthread_cleanup_push(fd_cleanup_socket, &s);
         
-        TRACE_DEBUG_sSA(FULL, "Attempting TCP connection with peer: ", sa, NI_NUMERICHOST | NI_NUMERICSERV, "..." );
+        TRACE_sSA(FD_LOG_DEBUG, FULL, "Attempting TCP connection with peer: ", sa, NI_NUMERICHOST | NI_NUMERICSERV, "..." );
         
         /* Try connecting to the remote address */