Mercurial > hg > freeDiameter
diff libfdcore/sctps.c @ 965:9b37f34c1b1f
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...
| author | Sebastien Decugis <sdecugis@freediameter.net> |
|---|---|
| date | Tue, 12 Mar 2013 17:23:37 +0100 |
| parents | 43fb27a9037f |
| children | 2091bf698fb1 |
line wrap: on
line diff
--- a/libfdcore/sctps.c Sat Mar 09 16:55:20 2013 +0100 +++ b/libfdcore/sctps.c Tue Mar 12 17:23:37 2013 +0100 @@ -342,7 +342,7 @@ CHECK_PARAMS_DO( sto && key.data && data.data, return -1 ); 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); if (match) { @@ -351,9 +351,9 @@ /* Check the data is the same */ 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; } else { @@ -396,7 +396,7 @@ CHECK_PARAMS_DO( sto && key.data, return -1 ); 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); if (match) { @@ -429,7 +429,7 @@ CHECK_PARAMS_DO( sto && key.data, return error ); 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); if (match) { @@ -556,7 +556,7 @@ uint8_t id[256]; 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, "]"); } }