Changeset 965:9b37f34c1b1f in freeDiameter for libfdcore/sctps.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/sctps.c (modified) (5 diffs)

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, "]");
                 }
         }