Changeset 974:2091bf698fb1 in freeDiameter for libfdcore

Timestamp:

Mar 15, 2013, 2:14:35 AM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR
(as far as sed could find them)
with manual fixing afterwards.

Location:

libfdcore

Files:

• cnxctx.c (modified) (39 diffs)
• config.c (modified) (18 diffs)
• core.c (modified) (2 diffs)
• endpoints.c (modified) (1 diff)
• events.c (modified) (1 diff)
• extensions.c (modified) (6 diffs)
• fdd.l (modified) (7 diffs)
• fdd.y (modified) (7 diffs)
• p_ce.c (modified) (5 diffs)
• p_cnx.c (modified) (3 diffs)
• p_dp.c (modified) (1 diff)
• p_dw.c (modified) (1 diff)
• p_psm.c (modified) (1 diff)
• p_sr.c (modified) (2 diffs)
• peers.c (modified) (3 diffs)
• routing_dispatch.c (modified) (1 diff)
• sctp.c (modified) (27 diffs)
• sctps.c (modified) (1 diff)
• server.c (modified) (6 diffs)

libfdcore/cnxctx.c

@@ -231 +231 @@
                 char buf[1024];
                 sSA_DUMP_NODE( buf, sizeof(buf), &ss, NI_NUMERICHOST );
-                fd_log_debug("%s : accepted new client [%s].\n", fd_cnx_getid(serv), buf);
+                fd_log_debug("%s : accepted new client [%s].", fd_cnx_getid(serv), buf);
         }
         
@@ -314 +314 @@
                 char buf[1024];
                 sSA_DUMP_NODE_SERV( buf, sizeof(buf), sa, NI_NUMERICSERV);
-                fd_log_debug("Connection established to server '%s' (TCP:%d).\n", buf, sock);
+                fd_log_debug("Connection established to server '%s' (TCP:%d).", buf, sock);
         }
         
@@ -406 +406 @@
                 char buf[1024];
                 sSA_DUMP_NODE_SERV( buf, sizeof(buf), &primary, NI_NUMERICSERV);
-                fd_log_debug("Connection established to server '%s' (SCTP:%d, %d/%d streams).\n", buf, sock, cnx->cc_sctp_para.str_in, cnx->cc_sctp_para.str_out);
+                fd_log_debug("Connection established to server '%s' (SCTP:%d, %d/%d streams).", buf, sock, cnx->cc_sctp_para.str_in, cnx->cc_sctp_para.str_out);
         }
         
@@ -857 +857 @@
                                                         {
                                                                 if (TRACE_BOOL(INFO)) {
-                                                                        fd_log_debug("TLS re-handshake failed on socket %d (%s) : %s\n", conn->cc_socket, conn->cc_id, gnutls_strerror(ret));
+                                                                        fd_log_debug("TLS re-handshake failed on socket %d (%s) : %s", conn->cc_socket, conn->cc_id, gnutls_strerror(ret));
                                                                 }
                                                                 goto end;
@@ -902 +902 @@
                                                         {
                                                                 if (TRACE_BOOL(INFO)) {
-                                                                        fd_log_debug("TLS re-handshake failed on socket %d (%s) : %s\n", conn->cc_socket, conn->cc_id, gnutls_strerror(ret));
+                                                                        fd_log_debug("TLS re-handshake failed on socket %d (%s) : %s", conn->cc_socket, conn->cc_id, gnutls_strerror(ret));
                                                                 }
                                                                 goto end;
@@ -1038 +1038 @@
                 const char * errorpos;
                 CHECK_GNUTLS_DO( gnutls_priority_set_direct( *session, priority, &errorpos ), 
-                        { TRACE_DEBUG(INFO, "Error in priority string '%s' at position: '%s'\n", priority, errorpos); return EINVAL; } );
+                        { TRACE_DEBUG(INFO, "Error in priority string '%s' at position: '%s'", priority, errorpos); return EINVAL; } );
         } else {
                 CHECK_GNUTLS_DO( gnutls_priority_set( *session, fd_g_config->cnf_sec_data.prio_cache ), return EINVAL );
@@ -1075 +1075 @@
                 gnutls_credentials_type_t cred;
                 
-                fd_log_debug("TLS Session information for connection '%s':\n", conn->cc_id);
+                fd_log_debug("TLS Session information for connection '%s':", conn->cc_id);
 
                 /* print the key exchange's algorithm name */
                 GNUTLS_TRACE( kx = gnutls_kx_get (session) );
                 GNUTLS_TRACE( tmp = gnutls_kx_get_name (kx) );
-                fd_log_debug("\t - Key Exchange: %s\n", tmp);
+                fd_log_debug("\t - Key Exchange: %s", tmp);
 
                 /* Check the authentication type used and switch
@@ -1088 +1088 @@
                 {
                         case GNUTLS_CRD_IA:
-                                fd_log_debug("\t - TLS/IA session\n");
+                                fd_log_debug("\t - TLS/IA session");
                                 break;
 
@@ -1094 +1094 @@
                                 /* This returns NULL in server side. */
                                 if (gnutls_psk_client_get_hint (session) != NULL)
-                                        fd_log_debug("\t - PSK authentication. PSK hint '%s'\n",
+                                        fd_log_debug("\t - PSK authentication. PSK hint '%s'",
                                                 gnutls_psk_client_get_hint (session));
                                 /* This returns NULL in client side. */
                                 if (gnutls_psk_server_get_username (session) != NULL)
-                                        fd_log_debug("\t - PSK authentication. Connected as '%s'\n",
+                                        fd_log_debug("\t - PSK authentication. Connected as '%s'",
                                                 gnutls_psk_server_get_username (session));
                                 break;
 
                         case GNUTLS_CRD_ANON:   /* anonymous authentication */
-                                fd_log_debug("\t - Anonymous DH using prime of %d bits\n",
+                                fd_log_debug("\t - Anonymous DH using prime of %d bits",
                                         gnutls_dh_get_prime_bits (session));
                                 break;
@@ -1110 +1110 @@
                                 /* Check if we have been using ephemeral Diffie-Hellman. */
                                 if (kx == GNUTLS_KX_DHE_RSA || kx == GNUTLS_KX_DHE_DSS) {
-                                        fd_log_debug("\t - Ephemeral DH using prime of %d bits\n",
+                                        fd_log_debug("\t - Ephemeral DH using prime of %d bits",
                                                 gnutls_dh_get_prime_bits (session));
                                 }
@@ -1116 +1116 @@
 #ifdef ENABLE_SRP                               
                         case GNUTLS_CRD_SRP:
-                                fd_log_debug("\t - SRP session with username %s\n",
+                                fd_log_debug("\t - SRP session with username %s",
                                         gnutls_srp_server_get_username (session));
                                 break;
@@ -1122 +1122 @@
 
                         default:
-                                fd_log_debug("\t - Different type of credentials for the session (%d).\n", cred);
+                                fd_log_debug("\t - Different type of credentials for the session (%d).", cred);
                                 break;
 
@@ -1129 +1129 @@
                 /* print the protocol's name (ie TLS 1.0) */
                 tmp = gnutls_protocol_get_name (gnutls_protocol_get_version (session));
-                fd_log_debug("\t - Protocol: %s\n", tmp);
+                fd_log_debug("\t - Protocol: %s", tmp);
 
                 /* print the certificate type of the peer. ie X.509 */
                 tmp = gnutls_certificate_type_get_name (gnutls_certificate_type_get (session));
-                fd_log_debug("\t - Certificate Type: %s\n", tmp);
+                fd_log_debug("\t - Certificate Type: %s", tmp);
 
                 /* print the compression algorithm (if any) */
                 tmp = gnutls_compression_get_name (gnutls_compression_get (session));
-                fd_log_debug("\t - Compression: %s\n", tmp);
+                fd_log_debug("\t - Compression: %s", tmp);
 
                 /* print the name of the cipher used. ie 3DES. */
                 tmp = gnutls_cipher_get_name (gnutls_cipher_get (session));
-                fd_log_debug("\t - Cipher: %s\n", tmp);
+                fd_log_debug("\t - Cipher: %s", tmp);
 
                 /* Print the MAC algorithms name. ie SHA1 */
                 tmp = gnutls_mac_get_name (gnutls_mac_get (session));
-                fd_log_debug("\t - MAC: %s\n", tmp);
+                fd_log_debug("\t - MAC: %s", tmp);
         }
         
@@ -1152 +1152 @@
         if (gtret) {
                 if (TRACE_BOOL(INFO)) {
-                        fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
+                        fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
                         if (gtret & GNUTLS_CERT_INVALID)
-                                fd_log_debug(" - The certificate is not trusted (unknown CA? expired?)\n");
+                                fd_log_debug(" - The certificate is not trusted (unknown CA? expired?)");
                         if (gtret & GNUTLS_CERT_REVOKED)
-                                fd_log_debug(" - The certificate has been revoked.\n");
+                                fd_log_debug(" - The certificate has been revoked.");
                         if (gtret & GNUTLS_CERT_SIGNER_NOT_FOUND)
-                                fd_log_debug(" - The certificate hasn't got a known issuer.\n");
+                                fd_log_debug(" - The certificate hasn't got a known issuer.");
                         if (gtret & GNUTLS_CERT_SIGNER_NOT_CA)
-                                fd_log_debug(" - The certificate signer is not a CA, or uses version 1, or 3 without basic constraints.\n");
+                                fd_log_debug(" - The certificate signer is not a CA, or uses version 1, or 3 without basic constraints.");
                         if (gtret & GNUTLS_CERT_INSECURE_ALGORITHM)
-                                fd_log_debug(" - The certificate signature uses a weak algorithm.\n");
+                                fd_log_debug(" - The certificate signature uses a weak algorithm.");
                 }
                 return EINVAL;
@@ -1184 +1184 @@
                 time_t expiration_time, activation_time;
                 
-                fd_log_debug("TLS Certificate information for connection '%s' (%d certs provided):\n", conn->cc_id, cert_list_size);
+                fd_log_debug("TLS Certificate information for connection '%s' (%d certs provided):", conn->cc_id, cert_list_size);
                 for (i = 0; i < cert_list_size; i++)
                 {
@@ -1191 +1191 @@
                         CHECK_GNUTLS_DO( gnutls_x509_crt_import (cert, &cert_list[i], GNUTLS_X509_FMT_DER), return EINVAL);
                 
-                        fd_log_debug(" Certificate %d info:\n", i);
+                        fd_log_debug(" Certificate %d info:", i);
 
                         GNUTLS_TRACE( expiration_time = gnutls_x509_crt_get_expiration_time (cert) );
@@ -1203 +1203 @@
                         gnutls_x509_crt_get_serial (cert, serial, &size);
                         
-                        fd_log_debug("\t - Certificate serial number: ");
                         {
                                 int j;
+                                char buf[1024];
+                                snprintf(buf, sizeof(buf), "\t - Certificate serial number: ");
                                 for (j = 0; j < size; j++) {
-                                        fd_log_debug("%02.2hhx", serial[j]);
+                                        snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "%02.2hhx", serial[j]);
                                 }
-                        }
-                        fd_log_debug("\n");
+                                fd_log_debug(buf);
+                        }
 
                         /* Extract some of the public key algorithm's parameters */
                         GNUTLS_TRACE( algo = gnutls_x509_crt_get_pk_algorithm (cert, &bits) );
-                        fd_log_debug("\t - Certificate public key: %s\n",
+                        fd_log_debug("\t - Certificate public key: %s",
                               gnutls_pk_algorithm_get_name (algo));
 
                         /* Print the version of the X.509 certificate. */
-                        fd_log_debug("\t - Certificate version: #%d\n",
+                        fd_log_debug("\t - Certificate version: #%d",
                               gnutls_x509_crt_get_version (cert));
 
                         size = sizeof (dn);
                         GNUTLS_TRACE( gnutls_x509_crt_get_dn (cert, dn, &size) );
-                        fd_log_debug("\t - DN: %s\n", dn);
+                        fd_log_debug("\t - DN: %s", dn);
 
                         size = sizeof (dn);
                         GNUTLS_TRACE( gnutls_x509_crt_get_issuer_dn (cert, dn, &size) );
-                        fd_log_debug("\t - Issuer's DN: %s\n", dn);
+                        fd_log_debug("\t - Issuer's DN: %s", dn);
 
                         GNUTLS_TRACE( gnutls_x509_crt_deinit (cert) );
@@ -1244 +1245 @@
                 if ((deadline != (time_t)-1) && (deadline < now)) {
                         if (TRACE_BOOL(INFO)) {
-                                fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
-                                fd_log_debug(" - The certificate %d in the chain is expired\n", i);
+                                fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
+                                fd_log_debug(" - The certificate %d in the chain is expired", i);
                         }
                         ret = EINVAL;
@@ -1253 +1254 @@
                 if ((deadline != (time_t)-1) && (deadline > now)) {
                         if (TRACE_BOOL(INFO)) {
-                                fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
-                                fd_log_debug(" - The certificate %d in the chain is not yet activated\n", i);
+                                fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
+                                fd_log_debug(" - The certificate %d in the chain is not yet activated", i);
                         }
                         ret = EINVAL;
@@ -1262 +1263 @@
                         if (!gnutls_x509_crt_check_hostname (cert, conn->cc_tls_para.cn)) {
                                 if (TRACE_BOOL(INFO)) {
-                                        fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
-                                        fd_log_debug(" - The certificate hostname does not match '%s'\n", conn->cc_tls_para.cn);
+                                        fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
+                                        fd_log_debug(" - The certificate hostname does not match '%s'", conn->cc_tls_para.cn);
                                 }
                                 ret = EINVAL;
@@ -1302 +1303 @@
                 dhe = ecdh = 0;
 
-                fd_log_debug("TLS Session information for connection '%s':\n", conn->cc_id);
+                fd_log_debug("TLS Session information for connection '%s':", conn->cc_id);
                 
                 /* print the key exchange's algorithm name
@@ -1308 +1309 @@
                 GNUTLS_TRACE( kx = gnutls_kx_get (session) );
                 GNUTLS_TRACE( tmp = gnutls_kx_get_name (kx) );
-                fd_log_debug("\t- Key Exchange: %s\n", tmp);
+                fd_log_debug("\t- Key Exchange: %s", tmp);
 
                 /* Check the authentication type used and switch
@@ -1317 +1318 @@
                 {
                         case GNUTLS_CRD_IA:
-                                fd_log_debug("\t - TLS/IA session\n");
+                                fd_log_debug("\t - TLS/IA session");
                                 break;
 
@@ -1323 +1324 @@
                         #if (defined(ENABLE_SRP) || defined(GNUTLS_VERSION_300))
                         case GNUTLS_CRD_SRP:
-                                fd_log_debug("\t - SRP session with username %s\n",
+                                fd_log_debug("\t - SRP session with username %s",
                                         gnutls_srp_server_get_username (session));
                                 break;
@@ -1332 +1333 @@
                                 */
                                 if (gnutls_psk_client_get_hint (session) != NULL)
-                                        fd_log_debug("\t - PSK authentication. PSK hint '%s'\n",
+                                        fd_log_debug("\t - PSK authentication. PSK hint '%s'",
                                                 gnutls_psk_client_get_hint (session));
                                 /* This returns NULL in client side.
                                 */
                                 if (gnutls_psk_server_get_username (session) != NULL)
-                                        fd_log_debug("\t - PSK authentication. Connected as '%s'\n",
+                                        fd_log_debug("\t - PSK authentication. Connected as '%s'",
                                                 gnutls_psk_server_get_username (session));
 
@@ -1347 +1348 @@
 
                         case GNUTLS_CRD_ANON:      /* anonymous authentication */
-                                fd_log_debug("\t - Anonymous DH using prime of %d bits\n",
+                                fd_log_debug("\t - Anonymous DH using prime of %d bits",
                                         gnutls_dh_get_prime_bits (session));
                                 if (kx == GNUTLS_KX_ANON_ECDH)
@@ -1370 +1371 @@
                                         cert_list = gnutls_certificate_get_peers (session, &cert_list_size);
 
-                                        fd_log_debug("\t Peer provided %d certificates.\n", cert_list_size);
+                                        fd_log_debug("\t Peer provided %d certificates.", cert_list_size);
 
                                         if (cert_list_size > 0)
@@ -1382 +1383 @@
                                                 gnutls_x509_crt_import (cert, &cert_list[0], GNUTLS_X509_FMT_DER);
 
-                                                fd_log_debug("\t Certificate info:\n");
+                                                fd_log_debug("\t Certificate info:");
 
                                                 /* This is the preferred way of printing short information about
@@ -1390 +1391 @@
                                                 if (ret == 0)
                                                 {
-                                                  fd_log_debug("\t\t%s\n", cinfo.data);
+                                                  fd_log_debug("\t\t%s", cinfo.data);
                                                   gnutls_free (cinfo.data);
                                                 }
@@ -1396 +1397 @@
                                                 if (conn->cc_tls_para.cn) {
                                                         if (!gnutls_x509_crt_check_hostname (cert, conn->cc_tls_para.cn)) {
-                                                                fd_log_debug("\tTLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
-                                                                fd_log_debug("\t - The certificate hostname does not match '%s'\n", conn->cc_tls_para.cn);
+                                                                fd_log_debug("\tTLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
+                                                                fd_log_debug("\t - The certificate hostname does not match '%s'", conn->cc_tls_para.cn);
                                                                 gnutls_x509_crt_deinit (cert);
                                                                 return GNUTLS_E_CERTIFICATE_ERROR;
@@ -1415 +1416 @@
 
                 if (ecdh != 0)
-                        fd_log_debug("\t - Ephemeral ECDH using curve %s\n",
+                        fd_log_debug("\t - Ephemeral ECDH using curve %s",
                                 gnutls_ecc_curve_get_name (gnutls_ecc_curve_get (session)));
                 else if (dhe != 0)
-                        fd_log_debug("\t - Ephemeral DH using prime of %d bits\n",
+                        fd_log_debug("\t - Ephemeral DH using prime of %d bits",
                                 gnutls_dh_get_prime_bits (session));
 
@@ -1424 +1425 @@
                 */
                 tmp = gnutls_protocol_get_name (gnutls_protocol_get_version (session));
-                fd_log_debug("\t - Protocol: %s\n", tmp);
+                fd_log_debug("\t - Protocol: %s", tmp);
 
                 /* print the certificate type of the peer.
@@ -1430 +1431 @@
                 */
                 tmp = gnutls_certificate_type_get_name (gnutls_certificate_type_get (session));
-                fd_log_debug("\t - Certificate Type: %s\n", tmp);
+                fd_log_debug("\t - Certificate Type: %s", tmp);
 
                 /* print the compression algorithm (if any)
                 */
                 tmp = gnutls_compression_get_name (gnutls_compression_get (session));
-                fd_log_debug("\t - Compression: %s\n", tmp);
+                fd_log_debug("\t - Compression: %s", tmp);
 
                 /* print the name of the cipher used.
@@ -1441 +1442 @@
                 */
                 tmp = gnutls_cipher_get_name (gnutls_cipher_get (session));
-                fd_log_debug("\t - Cipher: %s\n", tmp);
+                fd_log_debug("\t - Cipher: %s", tmp);
 
                 /* Print the MAC algorithms name.
@@ -1447 +1448 @@
                 */
                 tmp = gnutls_mac_get_name (gnutls_mac_get (session));
-                fd_log_debug("\t - MAC: %s\n", tmp);
+                fd_log_debug("\t - MAC: %s", tmp);
         
         }
@@ -1456 +1457 @@
         CHECK_GNUTLS_DO( gnutls_certificate_verify_peers2 (session, &status), return GNUTLS_E_CERTIFICATE_ERROR );
         if (TRACE_BOOL(INFO) && (status & GNUTLS_CERT_INVALID)) {
-                fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
+                fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
                 if (status & GNUTLS_CERT_SIGNER_NOT_FOUND)
-                        fd_log_debug(" - The certificate hasn't got a known issuer.\n");
+                        fd_log_debug(" - The certificate hasn't got a known issuer.");
 
                 if (status & GNUTLS_CERT_REVOKED)
-                        fd_log_debug(" - The certificate has been revoked.\n");
+                        fd_log_debug(" - The certificate has been revoked.");
 
                 if (status & GNUTLS_CERT_EXPIRED)
-                        fd_log_debug(" - The certificate has expired.\n");
+                        fd_log_debug(" - The certificate has expired.");
 
                 if (status & GNUTLS_CERT_NOT_ACTIVATED)
-                        fd_log_debug(" - The certificate is not yet activated.\n");
+                        fd_log_debug(" - The certificate is not yet activated.");
         }       
         if (status & GNUTLS_CERT_INVALID)
@@ -1480 +1481 @@
         if ((!hostname_verified) && (conn->cc_tls_para.cn)) {
                 if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) {
-                        TRACE_DEBUG(INFO, "TLS: Remote credentials are not x509, rejected on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
+                        TRACE_DEBUG(INFO, "TLS: Remote credentials are not x509, rejected on socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
                         return GNUTLS_E_CERTIFICATE_ERROR;
                 }
@@ -1493 +1494 @@
                 if (!gnutls_x509_crt_check_hostname (cert, conn->cc_tls_para.cn)) {
                         if (TRACE_BOOL(INFO)) {
-                                fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
-                                fd_log_debug(" - The certificate hostname does not match '%s'\n", conn->cc_tls_para.cn);
+                                fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :", conn->cc_socket, conn->cc_remid, conn->cc_id);
+                                fd_log_debug(" - The certificate hostname does not match '%s'", conn->cc_tls_para.cn);
                         }
                         gnutls_x509_crt_deinit (cert);
@@ -1573 +1574 @@
                         {
                                 if (TRACE_BOOL(INFO)) {
-                                        fd_log_debug("TLS Handshake failed on socket %d (%s) : %s\n", conn->cc_socket, conn->cc_id, gnutls_strerror(ret));
+                                        fd_log_debug("TLS Handshake failed on socket %d (%s) : %s", conn->cc_socket, conn->cc_id, gnutls_strerror(ret));
                                 }
                                 fd_cnx_markerror(conn);

libfdcore/config.c

@@ -86 +86 @@
                 return;
         
-        fd_log_debug("-- Configuration :\n");
-        fd_log_debug("  Debug trace level ...... : %+d\n", fd_g_debug_lvl);
-        fd_log_debug("  Configuration file ..... : %s\n", fd_g_config->cnf_file);
-        fd_log_debug("  Diameter Identity ...... : %s (l:%Zi)\n", fd_g_config->cnf_diamid, fd_g_config->cnf_diamid_len);
-        fd_log_debug("  Diameter Realm ......... : %s (l:%Zi)\n", fd_g_config->cnf_diamrlm, fd_g_config->cnf_diamrlm_len);
-        fd_log_debug("  Tc Timer ............... : %u\n", fd_g_config->cnf_timer_tc);
-        fd_log_debug("  Tw Timer ............... : %u\n", fd_g_config->cnf_timer_tw);
-        fd_log_debug("  Local port ............. : %hu\n", fd_g_config->cnf_port);
-        fd_log_debug("  Local secure port ...... : %hu\n", fd_g_config->cnf_port_tls);
-        fd_log_debug("  Number of SCTP streams . : %hu\n", fd_g_config->cnf_sctp_str);
-        fd_log_debug("  Number of server threads : %hu\n", fd_g_config->cnf_dispthr);
+        fd_log_debug("-- Configuration :");
+        fd_log_debug("  Debug trace level ...... : %+d", fd_g_debug_lvl);
+        fd_log_debug("  Configuration file ..... : %s", fd_g_config->cnf_file);
+        fd_log_debug("  Diameter Identity ...... : %s (l:%Zi)", fd_g_config->cnf_diamid, fd_g_config->cnf_diamid_len);
+        fd_log_debug("  Diameter Realm ......... : %s (l:%Zi)", fd_g_config->cnf_diamrlm, fd_g_config->cnf_diamrlm_len);
+        fd_log_debug("  Tc Timer ............... : %u", fd_g_config->cnf_timer_tc);
+        fd_log_debug("  Tw Timer ............... : %u", fd_g_config->cnf_timer_tw);
+        fd_log_debug("  Local port ............. : %hu", fd_g_config->cnf_port);
+        fd_log_debug("  Local secure port ...... : %hu", fd_g_config->cnf_port_tls);
+        fd_log_debug("  Number of SCTP streams . : %hu", fd_g_config->cnf_sctp_str);
+        fd_log_debug("  Number of server threads : %hu", fd_g_config->cnf_dispthr);
         if (FD_IS_LIST_EMPTY(&fd_g_config->cnf_endpoints)) {
-                fd_log_debug("  Local endpoints ........ : Default (use all available)\n");
+                fd_log_debug("  Local endpoints ........ : Default (use all available)");
         } else {
-                fd_log_debug("  Local endpoints ........ : \n");
+                fd_log_debug("  Local endpoints ........ : ");
                 fd_ep_dump( 29, &fd_g_config->cnf_endpoints );
         }
         if (FD_IS_LIST_EMPTY(&fd_g_config->cnf_apps)) {
-                fd_log_debug("  Local applications ..... : (none)\n");
+                fd_log_debug("  Local applications ..... : (none)");
         } else {
                 struct fd_list * li = fd_g_config->cnf_apps.next;
@@ -111 +111 @@
                         struct fd_app * app = (struct fd_app *)li;
                         if (li != fd_g_config->cnf_apps.next) fd_log_debug("                             ");
-                        fd_log_debug("App: %u\t%s%s\tVnd: %u\n", 
+                        fd_log_debug("App: %u\t%s%s\tVnd: %u", 
                                         app->appid,
                                         app->flags.auth ? "Au" : "--",
@@ -120 +120 @@
         }
         
-        fd_log_debug("  Flags : - IP ........... : %s\n", fd_g_config->cnf_flags.no_ip4 ? "DISABLED" : "Enabled");
-        fd_log_debug("          - IPv6 ......... : %s\n", fd_g_config->cnf_flags.no_ip6 ? "DISABLED" : "Enabled");
-        fd_log_debug("          - Relay app .... : %s\n", fd_g_config->cnf_flags.no_fwd ? "DISABLED" : "Enabled");
-        fd_log_debug("          - TCP .......... : %s\n", fd_g_config->cnf_flags.no_tcp ? "DISABLED" : "Enabled");
+        fd_log_debug("  Flags : - IP ........... : %s", fd_g_config->cnf_flags.no_ip4 ? "DISABLED" : "Enabled");
+        fd_log_debug("          - IPv6 ......... : %s", fd_g_config->cnf_flags.no_ip6 ? "DISABLED" : "Enabled");
+        fd_log_debug("          - Relay app .... : %s", fd_g_config->cnf_flags.no_fwd ? "DISABLED" : "Enabled");
+        fd_log_debug("          - TCP .......... : %s", fd_g_config->cnf_flags.no_tcp ? "DISABLED" : "Enabled");
         #ifdef DISABLE_SCTP
-        fd_log_debug("          - SCTP ......... : DISABLED (at compilation)\n");
+        fd_log_debug("          - SCTP ......... : DISABLED (at compilation)");
         #else /* DISABLE_SCTP */
-        fd_log_debug("          - SCTP ......... : %s\n", fd_g_config->cnf_flags.no_sctp ? "DISABLED" : "Enabled");
+        fd_log_debug("          - SCTP ......... : %s", fd_g_config->cnf_flags.no_sctp ? "DISABLED" : "Enabled");
         #endif /* DISABLE_SCTP */
-        fd_log_debug("          - Pref. proto .. : %s\n", fd_g_config->cnf_flags.pr_tcp ? "TCP" : "SCTP");
-        fd_log_debug("          - TLS method ... : %s\n", fd_g_config->cnf_flags.tls_alg ? "INBAND" : "Separate port");
-        
-        fd_log_debug("  TLS :   - Certificate .. : %s\n", fd_g_config->cnf_sec_data.cert_file ?: "(NONE)");
-        fd_log_debug("          - Private key .. : %s\n", fd_g_config->cnf_sec_data.key_file ?: "(NONE)");
-        fd_log_debug("          - CA (trust) ... : %s (%d certs)\n", fd_g_config->cnf_sec_data.ca_file ?: "(none)", fd_g_config->cnf_sec_data.ca_file_nr);
-        fd_log_debug("          - CRL .......... : %s\n", fd_g_config->cnf_sec_data.crl_file ?: "(none)");
-        fd_log_debug("          - Priority ..... : %s\n", fd_g_config->cnf_sec_data.prio_string ?: "(default: '" GNUTLS_DEFAULT_PRIORITY "')");
+        fd_log_debug("          - Pref. proto .. : %s", fd_g_config->cnf_flags.pr_tcp ? "TCP" : "SCTP");
+        fd_log_debug("          - TLS method ... : %s", fd_g_config->cnf_flags.tls_alg ? "INBAND" : "Separate port");
+        
+        fd_log_debug("  TLS :   - Certificate .. : %s", fd_g_config->cnf_sec_data.cert_file ?: "(NONE)");
+        fd_log_debug("          - Private key .. : %s", fd_g_config->cnf_sec_data.key_file ?: "(NONE)");
+        fd_log_debug("          - CA (trust) ... : %s (%d certs)", fd_g_config->cnf_sec_data.ca_file ?: "(none)", fd_g_config->cnf_sec_data.ca_file_nr);
+        fd_log_debug("          - CRL .......... : %s", fd_g_config->cnf_sec_data.crl_file ?: "(none)");
+        fd_log_debug("          - Priority ..... : %s", fd_g_config->cnf_sec_data.prio_string ?: "(default: '" GNUTLS_DEFAULT_PRIORITY "')");
         if (fd_g_config->cnf_sec_data.dh_file)
-                fd_log_debug("          - DH file ...... : %s\n", fd_g_config->cnf_sec_data.dh_file);
+                fd_log_debug("          - DH file ...... : %s", fd_g_config->cnf_sec_data.dh_file);
         else
-                fd_log_debug("          - DH bits ...... : %d\n", fd_g_config->cnf_sec_data.dh_bits ?: GNUTLS_DEFAULT_DHBITS);
-        
-        fd_log_debug("  Origin-State-Id ........ : %u\n", fd_g_config->cnf_orstateid);
+                fd_log_debug("          - DH bits ...... : %d", fd_g_config->cnf_sec_data.dh_bits ?: GNUTLS_DEFAULT_DHBITS);
+        
+        fd_log_debug("  Origin-State-Id ........ : %u", fd_g_config->cnf_orstateid);
 }
 
@@ -172 +172 @@
                 if (ferror(pemfile)) {
                         int err = errno;
-                        TRACE_DEBUG(INFO, "An error occurred while reading file: %s\n", strerror(err));
+                        TRACE_DEBUG(INFO, "An error occurred while reading file: %s", strerror(err));
                         return err; 
                 }
@@ -201 +201 @@
   gnutls_x509_crt_get_dn (cert, name, &name_size);
 
-  fd_log_debug("\tSubject: %s\n", name);
-  fd_log_debug("\tIssuer: %s\n", issuer_name);
+  fd_log_debug("\tSubject: %s", name);
+  fd_log_debug("\tIssuer: %s", issuer_name);
 
   if (issuer != NULL)
@@ -209 +209 @@
       gnutls_x509_crt_get_dn (issuer, issuer_name, &issuer_name_size);
 
-      fd_log_debug("\tVerified against: %s\n", issuer_name);
+      fd_log_debug("\tVerified against: %s", issuer_name);
     }
 
@@ -217 +217 @@
       gnutls_x509_crl_get_issuer_dn (crl, issuer_name, &issuer_name_size);
 
-      fd_log_debug("\tVerified against CRL of: %s\n", issuer_name);
+      fd_log_debug("\tVerified against CRL of: %s", issuer_name);
     }
 
-  fd_log_debug("\tVerification output: %x\n\n", verification_output);
+  fd_log_debug("\tVerification output: %x", verification_output);
 
   return 0;
@@ -248 +248 @@
         if (fddin == NULL) {
                 int ret = errno;
-                TRACE_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",
                                   orig ?: "", orig? " and " : "", fd_g_config->cnf_file, strerror(ret));
                 return ret;
@@ -349 +349 @@
                                         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\n", buf);
+                                        fd_log_debug("Info: Removing local address conflicting with the flags no_IP / no_IP6 : %s", buf);
                                 }
                                 free(ep);
@@ -380 +380 @@
                 if (!stream) {
                         int err = errno;
-                        TRACE_DEBUG(INFO, "An error occurred while opening '%s': %s\n", fd_g_config->cnf_sec_data.cert_file, strerror(err));
+                        TRACE_DEBUG(INFO, "An error occurred while opening '%s': %s", fd_g_config->cnf_sec_data.cert_file, strerror(err));
                         return err; 
                 }
@@ -441 +441 @@
                         if (output & GNUTLS_CERT_INVALID)
                         {
-                                fd_log_debug("TLS: Local certificate chain '%s' is invalid :\n", fd_g_config->cnf_sec_data.cert_file);
+                                fd_log_debug("TLS: Local certificate chain '%s' is invalid :", fd_g_config->cnf_sec_data.cert_file);
                                 if (output & GNUTLS_CERT_SIGNER_NOT_FOUND)
-                                        fd_log_debug(" - The certificate hasn't got a known issuer.\n");
+                                        fd_log_debug(" - The certificate hasn't got a known issuer.");
                                 if (output & GNUTLS_CERT_SIGNER_NOT_CA)
-                                        fd_log_debug(" - The certificate signer is not a CA, or uses version 1, or 3 without basic constraints.\n");
+                                        fd_log_debug(" - The certificate signer is not a CA, or uses version 1, or 3 without basic constraints.");
                                 if (output & GNUTLS_CERT_NOT_ACTIVATED)
-                                        fd_log_debug(" - The certificate is not yet activated.\n");
+                                        fd_log_debug(" - The certificate is not yet activated.");
                                 if (output & GNUTLS_CERT_EXPIRED)
-                                        fd_log_debug(" - The certificate is expired.\n");
+                                        fd_log_debug(" - The certificate is expired.");
                                 return EINVAL;
                         }
@@ -456 +456 @@
                         if (!gnutls_x509_crt_check_hostname (certs[0], fd_g_config->cnf_diamid))
                         {
-                                fd_log_debug("TLS: The certificate owner does not match the hostname '%s'\n", fd_g_config->cnf_diamid);
+                                fd_log_debug("TLS: The certificate owner does not match the hostname '%s'", fd_g_config->cnf_diamid);
                                 return EINVAL;
                         }
@@ -484 +484 @@
                                 
                         if (verify) {
-                                fd_log_debug("TLS: Local certificate chain '%s' is invalid :\n", fd_g_config->cnf_sec_data.cert_file);
+                                fd_log_debug("TLS: Local certificate chain '%s' is invalid :", fd_g_config->cnf_sec_data.cert_file);
                                 if (verify & GNUTLS_CERT_INVALID)
-                                        fd_log_debug(" - The certificate is not trusted (unknown CA? expired?)\n");
+                                        fd_log_debug(" - The certificate is not trusted (unknown CA? expired?)");
                                 if (verify & GNUTLS_CERT_REVOKED)
-                                        fd_log_debug(" - The certificate has been revoked.\n");
+                                        fd_log_debug(" - The certificate has been revoked.");
                                 if (verify & GNUTLS_CERT_SIGNER_NOT_FOUND)
-                                        fd_log_debug(" - The certificate hasn't got a known issuer.\n");
+                                        fd_log_debug(" - The certificate hasn't got a known issuer.");
                                 if (verify & GNUTLS_CERT_SIGNER_NOT_CA)
-                                        fd_log_debug(" - The certificate signer is not a CA, or uses version 1, or 3 without basic constraints.\n");
+                                        fd_log_debug(" - The certificate signer is not a CA, or uses version 1, or 3 without basic constraints.");
                                 if (verify & GNUTLS_CERT_INSECURE_ALGORITHM)
-                                        fd_log_debug(" - The certificate signature uses a weak algorithm.\n");
+                                        fd_log_debug(" - The certificate signature uses a weak algorithm.");
                                 return EINVAL;
                         }
@@ -500 +500 @@
                         /* Check the local Identity is valid with the certificate */
                         if (!gnutls_x509_crt_check_hostname (certs[0], fd_g_config->cnf_diamid)) {
-                                fd_log_debug("TLS: Local certificate '%s' is invalid :\n", fd_g_config->cnf_sec_data.cert_file);
-                                fd_log_debug(" - The certificate hostname does not match '%s'\n", fd_g_config->cnf_diamid);
+                                fd_log_debug("TLS: Local certificate '%s' is invalid :", fd_g_config->cnf_sec_data.cert_file);
+                                fd_log_debug(" - The certificate hostname does not match '%s'", fd_g_config->cnf_diamid);
                                 return EINVAL;
                         }
@@ -513 +513 @@
                                 GNUTLS_TRACE( deadline = gnutls_x509_crt_get_expiration_time(certs[i]) );
                                 if ((deadline != (time_t)-1) && (deadline < now)) {
-                                        fd_log_debug("TLS: Local certificate chain '%s' is invalid :\n", fd_g_config->cnf_sec_data.cert_file);
-                                        fd_log_debug(" - The certificate %d in the chain is expired\n", i);
+                                        fd_log_debug("TLS: Local certificate chain '%s' is invalid :", fd_g_config->cnf_sec_data.cert_file);
+                                        fd_log_debug(" - The certificate %d in the chain is expired", i);
                                         return EINVAL;
                                 }
@@ -520 +520 @@
                                 GNUTLS_TRACE( deadline = gnutls_x509_crt_get_activation_time(certs[i]) );
                                 if ((deadline != (time_t)-1) && (deadline > now)) {
-                                        fd_log_debug("TLS: Local certificate chain '%s' is invalid :\n", fd_g_config->cnf_sec_data.cert_file);
-                                        fd_log_debug(" - The certificate %d in the chain is not yet activated\n", i);
+                                        fd_log_debug("TLS: Local certificate chain '%s' is invalid :", fd_g_config->cnf_sec_data.cert_file);
+                                        fd_log_debug(" - The certificate %d in the chain is not yet activated", i);
                                         return EINVAL;
                                 }
@@ -551 +551 @@
                 if (!stream) {
                         int err = errno;
-                        TRACE_DEBUG(INFO, "An error occurred while opening '%s': %s\n", fd_g_config->cnf_sec_data.dh_file, strerror(err));
+                        TRACE_DEBUG(INFO, "An error occurred while opening '%s': %s", fd_g_config->cnf_sec_data.dh_file, strerror(err));
                         return err; 
                 }
@@ -573 +573 @@
                         if (ferror(stream)) {
                                 int err = errno;
-                                TRACE_DEBUG(INFO, "An error occurred while reading '%s': %s\n", fd_g_config->cnf_sec_data.dh_file, strerror(err));
+                                TRACE_DEBUG(INFO, "An error occurred while reading '%s': %s", fd_g_config->cnf_sec_data.dh_file, strerror(err));
                                 return err; 
                         }

libfdcore/core.c

@@ -131 +131 @@
                         
                         default:
-                                TRACE_DEBUG(INFO, "Unexpected event in the main event queue (%d), ignored.\n", code);
+                                TRACE_DEBUG(INFO, "Unexpected event in the main event queue (%d), ignored.", code);
                 }
         }
@@ -154 +154 @@
         CHECK_FCT_DO( fd_event_trig_fini(), );
         
-        fd_log_debug(FD_PROJECT_BINARY " framework is terminated.\n");
+        fd_log_debug(FD_PROJECT_BINARY " framework is terminated.");
         
         fd_libproto_fini();

libfdcore/endpoints.c

@@ -64 +64 @@
                 fd_ep_dump( 4, list );
                 TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_add_merge  Adding:");
-                fd_log_debug("    %s {%s%s%s%s}\n", buf,
+                fd_log_debug("    %s {%s%s%s%s}", buf,
                                 (flags & EP_FL_CONF)    ? "C" : "-",
                                 (flags & EP_FL_DISC)        ? "D" : "-",

libfdcore/events.c

@@ -178 +178 @@
         for (li = trig_list.next; li != &trig_list; li = li->next) {
                 struct trig_item *t = li->o;
-                fd_log_debug("  Trigger %d, module '%s': %p\n", t->trig_value, t->trig_module, t->cb);
+                fd_log_debug("  Trigger %d, module '%s': %p", t->trig_value, t->trig_module, t->cb);
         }
         

libfdcore/extensions.c

@@ -82 +82 @@
         struct fd_list * li;
         
-        fd_log_debug("Dumping extensions list :\n");
+        fd_log_debug("Dumping extensions list :");
         
         for (li = ext_list.next; li != &ext_list; li = li->next)
         {
                 struct fd_ext_info * ext = (struct fd_ext_info *)li;
-                fd_log_debug(" - '%s'[%s] is %sloaded\n", ext->filename, ext->conffile?:"no conf", ext->handler ? "" : "not ");
+                fd_log_debug(" - '%s'[%s] is %sloaded", ext->filename, ext->conffile?:"no conf", ext->handler ? "" : "not ");
         }
 }
@@ -126 +126 @@
                 if (li == &ext->chain) {
                         /* the dependency was not found */
-                        TRACE_DEBUG(NONE, "Error: extension [%s] depends on [%s] which was not loaded first.\nPlease fix your configuration file.",
+                        TRACE_DEBUG(NONE, "Error: extension [%s] depends on [%s] which was not loaded first. Please fix your configuration file.",
                                 ext->ext_name, ext->depends[i]);
                         return ESRCH;
@@ -162 +162 @@
                 if (ext->handler == NULL) {
                         /* An error occured */
-                        TRACE_DEBUG( NONE, "Loading of extension %s failed:\n %s", ext->filename, dlerror());
+                        TRACE_DEBUG( NONE, "Loading of extension %s failed: %s", ext->filename, dlerror());
                         #ifdef DEBUG
                         ext->handler = dlopen(ext->filename, RTLD_LAZY | RTLD_GLOBAL);
                         if (ext->handler) {
                                 if (!check_dependencies(ext)) {
-                                        TRACE_DEBUG( NONE, "In addition, all declared dependencies are satisfied (Internal Error!)\n");
+                                        TRACE_DEBUG( NONE, "In addition, all declared dependencies are satisfied (Internal Error!)");
                                 }
                         }
@@ -182 +182 @@
                 if (fd_ext_init == NULL) {
                         /* An error occured */
-                        TRACE_DEBUG( NONE, "Unable to resolve symbol 'fd_ext_init' for extension %s:\n %s\n", ext->filename, dlerror());
+                        TRACE_DEBUG( NONE, "Unable to resolve symbol 'fd_ext_init' for extension %s: %s", ext->filename, dlerror());
                         return EINVAL;
                 }
@@ -201 +201 @@
                 if (ret != 0) {
                         /* The extension was unable to load cleanly */
-                        TRACE_DEBUG( NONE, "Extension %s returned an error during initialization: %s\n", ext->filename, strerror(ret));
+                        TRACE_DEBUG( NONE, "Extension %s returned an error during initialization: %s", ext->filename, strerror(ret));
                         return ret;
                 }
@@ -239 +239 @@
                         TRACE_DEBUG (FULL, "Unloading %s", ext->ext_name ?: ext->filename);
                         if ( dlclose(ext->handler) != 0 ) {
-                                TRACE_DEBUG (INFO, "Unloading [%s] failed : %s\n", ext->ext_name ?: ext->filename, dlerror());
+                                TRACE_DEBUG (INFO, "Unloading [%s] failed : %s", ext->ext_name ?: ext->filename, dlerror());
                         }
                 }

libfdcore/fdd.l

@@ -84 +84 @@
 int globerrfct(const char *epath, int eerrno)
 {
-        TRACE_ERROR("Failed to scan %s: %s\n", epath, strerror(eerrno));
+        TRACE_ERROR("Failed to scan %s: %s", epath, strerror(eerrno));
         return 1;
 }
@@ -119 +119 @@
                         if (buf[yyleng-2] != '"')
                         {
-                                TRACE_ERROR("Unterminated string: %s\n", yytext);
+                                TRACE_ERROR("Unterminated string: %s", yytext);
                                 return LEX_ERROR;
                         }
@@ -126 +126 @@
                         if (current_nested_level >= MAX_NESTED_CONF_FILES)
                         {
-                                TRACE_ERROR("Too many recursion levels in configuration files includes\n");
+                                TRACE_ERROR("Too many recursion levels in configuration files includes");
                                 return LEX_ERROR;
                         }
@@ -135 +135 @@
                         if (globerror == GLOB_NOSPACE)
                         {
-                                TRACE_ERROR("Not enough memory to parse include directive.\n");
+                                TRACE_ERROR("Not enough memory to parse include directive.");
                                 return LEX_ERROR;
                         }
                         if (globerror == GLOB_ABORTED)
                         {
-                                TRACE_ERROR("An error was encountered in include directive.\n");
+                                TRACE_ERROR("An error was encountered in include directive.");
                                 return LEX_ERROR;
                         }
@@ -150 +150 @@
                         if (globerror)
                         {
-                                TRACE_ERROR("Unexpected error in glob (%d).\n", globerror);
+                                TRACE_ERROR("Unexpected error in glob (%d).", globerror);
                                 return LEX_ERROR;
                         }
@@ -234 +234 @@
                                 if (ret != 1) {
                                         /* No matching: an error occurred */
-                                        TRACE_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", 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_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'.", yylloc->first_line, yylloc->first_column, yytext);
                                 return LEX_ERROR; 
                         }

libfdcore/fdd.y

@@ -63 +63 @@
 {
         if (ploc->first_line != ploc->last_line) {
-                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);
+                TRACE_ERROR("%s:%d.%d-%d.%d : %s", 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_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", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_column, s);
         } else {
-                TRACE_ERROR("%s:%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, s);
+                TRACE_ERROR("%s:%d.%d : %s", conf->cnf_file, ploc->first_line, ploc->first_column, s);
         }
 }
@@ -504 +504 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_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", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -512 +512 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_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", $5, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -535 +535 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_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", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -575 +575 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_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", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -618 +618 @@
                                                         &err_pos),
                                                 { yyerror (&yylloc, conf, "Error setting Priority parameter.");
-                                                  TRACE_ERROR("Error at position : %s\n", err_pos);
+                                                  TRACE_ERROR("Error at position : %s", err_pos);
                                                   YYERROR; } );
                         }
@@ -635 +635 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_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", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;

libfdcore/p_ce.c

@@ -306 +306 @@
                                 if (fd_os_almostcasesrch(hdr->avp_value->os.data, hdr->avp_value->os.len, 
                                                         peer->p_hdr.info.pi_diamid, peer->p_hdr.info.pi_diamidlen, NULL)) {
-                                        TRACE_DEBUG(INFO, "Received a message with Origin-Host set to '%.*s' while expecting '%s'\n", 
+                                        TRACE_DEBUG(INFO, "Received a message with Origin-Host set to '%.*s' while expecting '%s'", 
                                                         hdr->avp_value->os.len, hdr->avp_value->os.data, peer->p_hdr.info.pi_diamid);
                                         error->pei_errcode = "DIAMETER_AVP_NOT_ALLOWED";
@@ -778 +778 @@
                                 {
                                         /* Handshake failed ...  */
-                                        fd_log_debug("TLS Handshake failed with peer '%s', resetting the connection\n", peer->p_hdr.info.pi_diamid);
+                                        fd_log_debug("TLS Handshake failed with peer '%s', resetting the connection", peer->p_hdr.info.pi_diamid);
                                         goto cleanup;
                                 } );
@@ -831 +831 @@
                 size_t len = strlen(peer->p_hdr.info.config.pic_realm);
                 if (fd_os_almostcasesrch(peer->p_hdr.info.config.pic_realm, len, peer->p_hdr.info.runtime.pir_realm, peer->p_hdr.info.runtime.pir_realmlen, NULL)) {
-                        TRACE_DEBUG(INFO, "Rejected CER from peer '%s', realm mismatch with configured value (returning DIAMETER_UNKNOWN_PEER).\n", peer->p_hdr.info.pi_diamid);
+                        TRACE_DEBUG(INFO, "Rejected CER from peer '%s', realm mismatch with configured value (returning DIAMETER_UNKNOWN_PEER).", peer->p_hdr.info.pi_diamid);
                         pei.pei_errcode = "DIAMETER_UNKNOWN_PEER"; /* maybe AVP_NOT_ALLOWED would be better fit? */
                         goto error_abort;
@@ -846 +846 @@
                 int res = fd_peer_validate( peer );
                 if (res < 0) {
-                        TRACE_DEBUG(INFO, "Rejected CER from peer '%s', validation failed (returning DIAMETER_UNKNOWN_PEER).\n", peer->p_hdr.info.pi_diamid);
+                        TRACE_DEBUG(INFO, "Rejected CER from peer '%s', validation failed (returning DIAMETER_UNKNOWN_PEER).", peer->p_hdr.info.pi_diamid);
                         pei.pei_errcode = "DIAMETER_UNKNOWN_PEER";
                         goto error_abort;
@@ -931 +931 @@
                         {
                                 /* Handshake failed ...  */
-                                fd_log_debug("TLS Handshake failed with peer '%s', resetting the connection\n", peer->p_hdr.info.pi_diamid);
+                                fd_log_debug("TLS Handshake failed with peer '%s', resetting the connection", peer->p_hdr.info.pi_diamid);
                                 goto cleanup;
                         } );

libfdcore/p_cnx.c

@@ -90 +90 @@
                 ret = getaddrinfo(peer->p_hdr.info.pi_diamid, NULL, &hints, &ai);
                 if (ret) {
-                        TRACE_DEBUG(INFO, "Unable to resolve address for peer '%s' (%s), aborting\n", peer->p_hdr.info.pi_diamid, gai_strerror(ret));
+                        TRACE_DEBUG(INFO, "Unable to resolve address for peer '%s' (%s), aborting", peer->p_hdr.info.pi_diamid, gai_strerror(ret));
                         if (ret != EAI_AGAIN)
                                 fd_psm_terminate( peer, NULL );
@@ -126 +126 @@
         /* Now check we have at least one address to attempt */
         if (FD_IS_LIST_EMPTY(&peer->p_hdr.info.pi_endpoints)) {
-                TRACE_DEBUG(INFO, "No address %savailable to connect to peer '%s', aborting\n", 
+                TRACE_DEBUG(INFO, "No address %savailable to connect to peer '%s', aborting", 
                                         peer->p_hdr.info.config.pic_flags.pro3 ? "in the configured family " : "", peer->p_hdr.info.pi_diamid);
                 fd_psm_terminate( peer, NULL );
@@ -279 +279 @@
                         {
                                 /* Handshake failed ...  */
-                                TRACE_DEBUG(INFO, "TLS Handshake failed with peer '%s', resetting the connection\n", peer->p_hdr.info.pi_diamid);
+                                TRACE_DEBUG(INFO, "TLS Handshake failed with peer '%s', resetting the connection", peer->p_hdr.info.pi_diamid);
                                 fd_cnx_destroy(cnx);
                                 empty_connection_list(peer);

libfdcore/p_dp.c

@@ -97 +97 @@
                                 if (dictobj) {
                                         CHECK_FCT( fd_dict_getval( dictobj, &er.search ) );
-                                        TRACE_DEBUG(INFO, "Peer '%s' sent a DPR with cause: %s\n", peer->p_hdr.info.pi_diamid, er.search.enum_name);
+                                        TRACE_DEBUG(INFO, "Peer '%s' sent a DPR with cause: %s", peer->p_hdr.info.pi_diamid, er.search.enum_name);
                                 } else {
-                                        TRACE_DEBUG(INFO, "Peer '%s' sent a DPR with unknown cause: %u\n", peer->p_hdr.info.pi_diamid, peer->p_hdr.info.runtime.pir_lastDC);
+                                        TRACE_DEBUG(INFO, "Peer '%s' sent a DPR with unknown cause: %u", peer->p_hdr.info.pi_diamid, peer->p_hdr.info.runtime.pir_lastDC);
                                 }
                         } else {
-                                TRACE_DEBUG(INFO, "Peer '%s' sent a DPR without Disconnect-Cause AVP\n", peer->p_hdr.info.pi_diamid);
+                                TRACE_DEBUG(INFO, "Peer '%s' sent a DPR without Disconnect-Cause AVP", peer->p_hdr.info.pi_diamid);
                         }
                 }

libfdcore/p_dw.c

@@ -62 +62 @@
 
                 if (peer->p_hdr.info.runtime.pir_orstate != hdr->avp_value->u32) {
-                        TRACE_DEBUG(INFO, "Received a new Origin-State-Id from peer '%s'! (%x -> %x); resetting the connection.\n", 
+                        TRACE_DEBUG(INFO, "Received a new Origin-State-Id from peer '%s'! (%x -> %x); resetting the connection.", 
                                 peer->p_hdr.info.pi_diamid, 
                                 peer->p_hdr.info.runtime.pir_orstate,

libfdcore/p_psm.c

@@ -486 +486 @@
                 CHECK_FCT_DO( fd_msg_parse_buffer( (void *)&ev_data, ev_sz, &msg), 
                         {
-                                fd_log_debug("Received invalid data from peer '%s', closing the connection\n", peer->p_hdr.info.pi_diamid);
+                                fd_log_debug("Received invalid data from peer '%s', closing the connection", peer->p_hdr.info.pi_diamid);
                                 free(ev_data);
                                 CHECK_FCT_DO( fd_event_send(peer->p_events, FDEVP_CNX_ERROR, 0, NULL), goto psm_reset );

libfdcore/p_sr.c

@@ -69 +69 @@
                 return;
         
-        fd_log_debug("%sSentReq list @%p:\n", text, srlist);
+        fd_log_debug("%sSentReq list @%p:", text, srlist);
         
         CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &now), );
@@ -77 +77 @@
                 uint32_t * nexthbh = li->o;
                 
-                fd_log_debug(" - Next req (hbh:%x): [since %ld.%06ld sec]\n", *nexthbh, 
+                fd_log_debug(" - Next req (hbh:%x): [since %ld.%06ld sec]", *nexthbh, 
                         (now.tv_nsec >= sr->added_on.tv_nsec) ? (now.tv_sec - sr->added_on.tv_sec) : (now.tv_sec - sr->added_on.tv_sec - 1),
                         (now.tv_nsec >= sr->added_on.tv_nsec) ? (now.tv_nsec - sr->added_on.tv_nsec) / 1000 : (now.tv_nsec - sr->added_on.tv_nsec + 1000000000) / 1000);

libfdcore/peers.c

@@ -405 +405 @@
 void fd_peer_dump(struct fd_peer * peer, int details)
 {
+        char buf[1024];
         if (peer->p_eyec != EYEC_PEER) {
-                fd_log_debug("  Invalid peer @ %p !\n", peer);
+                fd_log_debug("  Invalid peer @ %p !", peer);
                 return;
         }
 
-        fd_log_debug(">  %s\t%s\t[%dsr]", STATE_STR(fd_peer_getstate(peer)), peer->p_hdr.info.pi_diamid, peer->p_sr.cnt);
+        snprintf(buf, sizeof(buf), ">  %s\t%s\t[%dsr]", STATE_STR(fd_peer_getstate(peer)), peer->p_hdr.info.pi_diamid, peer->p_sr.cnt);
         if (details > INFO) {
-                fd_log_debug("\t(rlm:%s)", peer->p_hdr.info.runtime.pir_realm ?: "<unknown>");
+                snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\t(rlm:%s)", peer->p_hdr.info.runtime.pir_realm ?: "<unknown>");
                 if (peer->p_hdr.info.runtime.pir_prodname)
-                        fd_log_debug("\t['%s' %u]", peer->p_hdr.info.runtime.pir_prodname, peer->p_hdr.info.runtime.pir_firmrev);
-        }
-        fd_log_debug("\n");
+                        snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\t['%s' %u]", peer->p_hdr.info.runtime.pir_prodname, peer->p_hdr.info.runtime.pir_firmrev);
+        }
+        fd_log_debug(buf);
         if (details > FULL) {
                 /* Dump all info */
-                fd_log_debug("\tEntry origin : %s\n", peer->p_dbgorig?: "not set");
-                fd_log_debug("\tConfig flags : %s%s%s%s%s - %s%s%s\n", 
+                fd_log_debug("\tEntry origin : %s", peer->p_dbgorig?: "not set");
+                fd_log_debug("\tConfig flags : %s%s%s%s%s - %s%s%s", 
                                 peer->p_hdr.info.config.pic_flags.pro3 == PI_P3_DEFAULT ? "" :
                                         (peer->p_hdr.info.config.pic_flags.pro3 == PI_P3_IP ? "IP." : "IPv6."),
@@ -431 +432 @@
                                 peer->p_hdr.info.config.pic_flags.persist ? "Persist." : ""
                                 );
-                fd_log_debug("\tLifetime : %d sec\n", peer->p_hdr.info.config.pic_lft);
+                fd_log_debug("\tLifetime : %d sec", peer->p_hdr.info.config.pic_lft);
         }
 }
@@ -440 +441 @@
         struct fd_list * li;
         
-        fd_log_debug("Dumping list of peers :\n");
+        fd_log_debug("Dumping list of peers :");
         CHECK_FCT_DO( pthread_rwlock_rdlock(&fd_g_peers_rw), /* continue */ );
         

libfdcore/routing_dispatch.c

@@ -565 +565 @@
                 /* Check if we have local support for the message application */
                 if ( (hdr->msg_appl == 0) || (hdr->msg_appl == AI_RELAY) ) {
-                        TRACE_DEBUG(INFO, "Received a routable message with application id 0 or " _stringize(AI_RELAY) " (relay),\n"
+                        TRACE_DEBUG(INFO, "Received a routable message with application id 0 or " _stringize(AI_RELAY) " (relay),"
                                           " returning DIAMETER_APPLICATION_UNSUPPORTED");
                         CHECK_FCT( return_error( &msgptr, "DIAMETER_APPLICATION_UNSUPPORTED", "Routable message with application id 0 or relay", NULL) );

libfdcore/sctp.c

@@ -88 +88 @@
                                 return ENOTSUP;
                         }
-                        fd_log_debug( "Def SCTP_RTOINFO : srto_initial : %u\n", rtoinfo.srto_initial);
-                        fd_log_debug( "                   srto_min     : %u\n", rtoinfo.srto_min);
-                        fd_log_debug( "                   srto_max     : %u\n", rtoinfo.srto_max);
+                        fd_log_debug( "Def SCTP_RTOINFO : srto_initial : %u", rtoinfo.srto_initial);
+                        fd_log_debug( "                   srto_min     : %u", rtoinfo.srto_min);
+                        fd_log_debug( "                   srto_max     : %u", rtoinfo.srto_max);
                 }
 
@@ -103 +103 @@
                         /* Check new values */
                         CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_RTOINFO, &rtoinfo, &sz)  );
-                        fd_log_debug( "New SCTP_RTOINFO : srto_initial : %u\n", rtoinfo.srto_initial);
-                        fd_log_debug( "                   srto_max     : %u\n", rtoinfo.srto_max);
-                        fd_log_debug( "                   srto_min     : %u\n", rtoinfo.srto_min);
+                        fd_log_debug( "New SCTP_RTOINFO : srto_initial : %u", rtoinfo.srto_initial);
+                        fd_log_debug( "                   srto_max     : %u", rtoinfo.srto_max);
+                        fd_log_debug( "                   srto_min     : %u", rtoinfo.srto_min);
                 }
         }
@@ -127 +127 @@
                                 return ENOTSUP;
                         }
-                        fd_log_debug( "Def SCTP_ASSOCINFO : sasoc_asocmaxrxt               : %hu\n", assoc.sasoc_asocmaxrxt);
-                        fd_log_debug( "                     sasoc_number_peer_destinations : %hu\n", assoc.sasoc_number_peer_destinations);
-                        fd_log_debug( "                     sasoc_peer_rwnd                : %u\n" , assoc.sasoc_peer_rwnd);
-                        fd_log_debug( "                     sasoc_local_rwnd               : %u\n" , assoc.sasoc_local_rwnd);
-                        fd_log_debug( "                     sasoc_cookie_life              : %u\n" , assoc.sasoc_cookie_life);
+                        fd_log_debug( "Def SCTP_ASSOCINFO : sasoc_asocmaxrxt               : %hu", assoc.sasoc_asocmaxrxt);
+                        fd_log_debug( "                     sasoc_number_peer_destinations : %hu", assoc.sasoc_number_peer_destinations);
+                        fd_log_debug( "                     sasoc_peer_rwnd                : %u" , assoc.sasoc_peer_rwnd);
+                        fd_log_debug( "                     sasoc_local_rwnd               : %u" , assoc.sasoc_local_rwnd);
+                        fd_log_debug( "                     sasoc_cookie_life              : %u" , assoc.sasoc_cookie_life);
                 }
 
@@ -143 +143 @@
                         /* Check new values */
                         CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_ASSOCINFO, &assoc, &sz)  );
-                        fd_log_debug( "New SCTP_ASSOCINFO : sasoc_asocmaxrxt               : %hu\n", assoc.sasoc_asocmaxrxt);
-                        fd_log_debug( "                     sasoc_number_peer_destinations : %hu\n", assoc.sasoc_number_peer_destinations);
-                        fd_log_debug( "                     sasoc_peer_rwnd                : %u\n" , assoc.sasoc_peer_rwnd);
-                        fd_log_debug( "                     sasoc_local_rwnd               : %u\n" , assoc.sasoc_local_rwnd);
-                        fd_log_debug( "                     sasoc_cookie_life              : %u\n" , assoc.sasoc_cookie_life);
+                        fd_log_debug( "New SCTP_ASSOCINFO : sasoc_asocmaxrxt               : %hu", assoc.sasoc_asocmaxrxt);
+                        fd_log_debug( "                     sasoc_number_peer_destinations : %hu", assoc.sasoc_number_peer_destinations);
+                        fd_log_debug( "                     sasoc_peer_rwnd                : %u" , assoc.sasoc_peer_rwnd);
+                        fd_log_debug( "                     sasoc_local_rwnd               : %u" , assoc.sasoc_local_rwnd);
+                        fd_log_debug( "                     sasoc_cookie_life              : %u" , assoc.sasoc_cookie_life);
                 }
         }
@@ -171 +171 @@
                                 return ENOTSUP;
                         }
-                        fd_log_debug( "Def SCTP_INITMSG : sinit_num_ostreams   : %hu\n", init.sinit_num_ostreams);
-                        fd_log_debug( "                   sinit_max_instreams  : %hu\n", init.sinit_max_instreams);
-                        fd_log_debug( "                   sinit_max_attempts   : %hu\n", init.sinit_max_attempts);
-                        fd_log_debug( "                   sinit_max_init_timeo : %hu\n", init.sinit_max_init_timeo);
+                        fd_log_debug( "Def SCTP_INITMSG : sinit_num_ostreams   : %hu", init.sinit_num_ostreams);
+                        fd_log_debug( "                   sinit_max_instreams  : %hu", init.sinit_max_instreams);
+                        fd_log_debug( "                   sinit_max_attempts   : %hu", init.sinit_max_attempts);
+                        fd_log_debug( "                   sinit_max_init_timeo : %hu", init.sinit_max_init_timeo);
                 }
 
@@ -187 +187 @@
                         /* Check new values */
                         CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_INITMSG, &init, &sz)  );
-                        fd_log_debug( "New SCTP_INITMSG : sinit_num_ostreams   : %hu\n", init.sinit_num_ostreams);
-                        fd_log_debug( "                   sinit_max_instreams  : %hu\n", init.sinit_max_instreams);
-                        fd_log_debug( "                   sinit_max_attempts   : %hu\n", init.sinit_max_attempts);
-                        fd_log_debug( "                   sinit_max_init_timeo : %hu\n", init.sinit_max_init_timeo);
+                        fd_log_debug( "New SCTP_INITMSG : sinit_num_ostreams   : %hu", init.sinit_num_ostreams);
+                        fd_log_debug( "                   sinit_max_instreams  : %hu", init.sinit_max_instreams);
+                        fd_log_debug( "                   sinit_max_attempts   : %hu", init.sinit_max_attempts);
+                        fd_log_debug( "                   sinit_max_init_timeo : %hu", init.sinit_max_init_timeo);
                 }
         }
@@ -212 +212 @@
                                 return ENOTSUP;
                         }
-                        fd_log_debug( "Def SO_LINGER : l_onoff  : %d\n", linger.l_onoff);
-                        fd_log_debug( "                l_linger : %d\n", linger.l_linger);
+                        fd_log_debug( "Def SO_LINGER : l_onoff  : %d", linger.l_onoff);
+                        fd_log_debug( "                l_linger : %d", linger.l_linger);
                 }
                 
@@ -225 +225 @@
                         /* Check new values */
                         CHECK_SYS(  getsockopt(sk, SOL_SOCKET, SO_LINGER, &linger, &sz)  );
-                        fd_log_debug( "New SO_LINGER : l_onoff  : %d\n", linger.l_onoff);
-                        fd_log_debug( "           l_linger : %d\n", linger.l_linger);
+                        fd_log_debug( "New SO_LINGER : l_onoff  : %d", linger.l_onoff);
+                        fd_log_debug( "           l_linger : %d", linger.l_linger);
                 }
         }
@@ -247 +247 @@
                                 return ENOTSUP;
                         }
-                        fd_log_debug( "Def SCTP_NODELAY value : %s\n", nodelay ? "true" : "false");
+                        fd_log_debug( "Def SCTP_NODELAY value : %s", nodelay ? "true" : "false");
                 }
 
@@ -258 +258 @@
                         /* Check new values */
                         CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_NODELAY, &nodelay, &sz)  );
-                        fd_log_debug( "New SCTP_NODELAY value : %s\n", nodelay ? "true" : "false");
+                        fd_log_debug( "New SCTP_NODELAY value : %s", nodelay ? "true" : "false");
                 }
         }
@@ -287 +287 @@
                                 return ENOTSUP;
                         }
-                        fd_log_debug( "Def SCTP_DISABLE_FRAGMENTS value : %s\n", nofrag ? "true" : "false");
+                        fd_log_debug( "Def SCTP_DISABLE_FRAGMENTS value : %s", nofrag ? "true" : "false");
                 }
 
@@ -298 +298 @@
                         /* Check new values */
                         CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_DISABLE_FRAGMENTS, &nofrag, &sz)  );
-                        fd_log_debug( "New SCTP_DISABLE_FRAGMENTS value : %s\n", nofrag ? "true" : "false");
+                        fd_log_debug( "New SCTP_DISABLE_FRAGMENTS value : %s", nofrag ? "true" : "false");
                 }
         }
@@ -324 +324 @@
                                 return ENOTSUP;
                         }
-                        fd_log_debug( "Def SCTP_PEER_ADDR_PARAMS : spp_hbinterval    : %u\n",  parms.spp_hbinterval);
-                        fd_log_debug( "                            spp_pathmaxrxt    : %hu\n", parms.spp_pathmaxrxt);
-                        fd_log_debug( "                            spp_pathmtu       : %u\n",  parms.spp_pathmtu);
-                        fd_log_debug( "                            spp_flags         : %x\n",  parms.spp_flags);
-                        // fd_log_debug( "                            spp_ipv6_flowlabel: %u\n",  parms.spp_ipv6_flowlabel);
-                        // fd_log_debug( "                            spp_ipv4_tos      : %hhu\n",parms.spp_ipv4_tos);
+                        fd_log_debug( "Def SCTP_PEER_ADDR_PARAMS : spp_hbinterval    : %u",  parms.spp_hbinterval);
+                        fd_log_debug( "                            spp_pathmaxrxt    : %hu", parms.spp_pathmaxrxt);
+                        fd_log_debug( "                            spp_pathmtu       : %u",  parms.spp_pathmtu);
+                        fd_log_debug( "                            spp_flags         : %x",  parms.spp_flags);
+                        // fd_log_debug( "                            spp_ipv6_flowlabel: %u",  parms.spp_ipv6_flowlabel);
+                        // fd_log_debug( "                            spp_ipv4_tos      : %hhu",parms.spp_ipv4_tos);
                 }
 
@@ -348 +348 @@
                         /* Check new values */
                         CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_PEER_ADDR_PARAMS, &parms, &sz)  );
-                        fd_log_debug( "New SCTP_PEER_ADDR_PARAMS : spp_hbinterval    : %u\n",  parms.spp_hbinterval);
-                        fd_log_debug( "                            spp_pathmaxrxt    : %hu\n", parms.spp_pathmaxrxt);
-                        fd_log_debug( "                            spp_pathmtu       : %u\n",  parms.spp_pathmtu);
-                        fd_log_debug( "                            spp_flags         : %x\n",  parms.spp_flags);
-                        // fd_log_debug( "                            spp_ipv6_flowlabel: %u\n",  parms.spp_ipv6_flowlabel);
-                        // fd_log_debug( "                            spp_ipv4_tos      : %hhu\n",parms.spp_ipv4_tos);
+                        fd_log_debug( "New SCTP_PEER_ADDR_PARAMS : spp_hbinterval    : %u",  parms.spp_hbinterval);
+                        fd_log_debug( "                            spp_pathmaxrxt    : %hu", parms.spp_pathmaxrxt);
+                        fd_log_debug( "                            spp_pathmtu       : %u",  parms.spp_pathmtu);
+                        fd_log_debug( "                            spp_flags         : %x",  parms.spp_flags);
+                        // fd_log_debug( "                            spp_ipv6_flowlabel: %u",  parms.spp_ipv6_flowlabel);
+                        // fd_log_debug( "                            spp_ipv4_tos      : %hhu",parms.spp_ipv4_tos);
                 }
         }
@@ -392 +392 @@
                         }
 
-                        fd_log_debug( "SCTP_EVENTS : sctp_data_io_event          : %hhu\n", event.sctp_data_io_event);
-                        fd_log_debug( "              sctp_association_event      : %hhu\n", event.sctp_association_event);
-                        fd_log_debug( "              sctp_address_event          : %hhu\n", event.sctp_address_event);
-                        fd_log_debug( "              sctp_send_failure_event     : %hhu\n", event.sctp_send_failure_event);
-                        fd_log_debug( "              sctp_peer_error_event       : %hhu\n", event.sctp_peer_error_event);
-                        fd_log_debug( "              sctp_shutdown_event         : %hhu\n", event.sctp_shutdown_event);
-                        fd_log_debug( "              sctp_partial_delivery_event : %hhu\n", event.sctp_partial_delivery_event);
-                        fd_log_debug( "              sctp_adaptation_layer_event : %hhu\n", event.sctp_adaptation_layer_event);
-                        // fd_log_debug( "             sctp_authentication_event    : %hhu\n", event.sctp_authentication_event);
+                        fd_log_debug( "SCTP_EVENTS : sctp_data_io_event          : %hhu", event.sctp_data_io_event);
+                        fd_log_debug( "              sctp_association_event      : %hhu", event.sctp_association_event);
+                        fd_log_debug( "              sctp_address_event          : %hhu", event.sctp_address_event);
+                        fd_log_debug( "              sctp_send_failure_event     : %hhu", event.sctp_send_failure_event);
+                        fd_log_debug( "              sctp_peer_error_event       : %hhu", event.sctp_peer_error_event);
+                        fd_log_debug( "              sctp_shutdown_event         : %hhu", event.sctp_shutdown_event);
+                        fd_log_debug( "              sctp_partial_delivery_event : %hhu", event.sctp_partial_delivery_event);
+                        fd_log_debug( "              sctp_adaptation_layer_event : %hhu", event.sctp_adaptation_layer_event);
+                        // fd_log_debug( "             sctp_authentication_event    : %hhu", event.sctp_authentication_event);
                 }
         }
@@ -421 +421 @@
                                 return ENOTSUP;
                         }
-                        fd_log_debug( "Def SCTP_I_WANT_MAPPED_V4_ADDR value : %s\n", v4mapped ? "true" : "false");
+                        fd_log_debug( "Def SCTP_I_WANT_MAPPED_V4_ADDR value : %s", v4mapped ? "true" : "false");
                 }
 
@@ -436 +436 @@
                         /* Check new values */
                         CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_I_WANT_MAPPED_V4_ADDR, &v4mapped, &sz)  );
-                        fd_log_debug( "New SCTP_I_WANT_MAPPED_V4_ADDR value : %s\n", v4mapped ? "true" : "false");
+                        fd_log_debug( "New SCTP_I_WANT_MAPPED_V4_ADDR value : %s", v4mapped ? "true" : "false");
                 }
         } else {
@@ -467 +467 @@
                                 return ENOTSUP;
                         }
-                        fd_log_debug( "Def SCTP_FRAGMENT_INTERLEAVE value : %d\n", interleave);
+                        fd_log_debug( "Def SCTP_FRAGMENT_INTERLEAVE value : %d", interleave);
                 }
 
@@ -482 +482 @@
                         /* Check new values */
                         CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_FRAGMENT_INTERLEAVE, &interleave, &sz)  );
-                        fd_log_debug( "New SCTP_FRAGMENT_INTERLEAVE value : %d\n", interleave);
+                        fd_log_debug( "New SCTP_FRAGMENT_INTERLEAVE value : %d", interleave);
                 }
         }
@@ -513 +513 @@
                                 return ENOTSUP;
                         }
-                        fd_log_debug( "Def SCTP_EXPLICIT_EOR value : %s\n", bool ? "true" : "false");
+                        fd_log_debug( "Def SCTP_EXPLICIT_EOR value : %s", bool ? "true" : "false");
                 }
 
@@ -524 +524 @@
                         /* Check new values */
                         CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_EXPLICIT_EOR, &bool, &sz)  );
-                        fd_log_debug( "New SCTP_EXPLICIT_EOR value : %s\n", bool ? "true" : "false");
+                        fd_log_debug( "New SCTP_EXPLICIT_EOR value : %s", bool ? "true" : "false");
                 }
         }
@@ -571 +571 @@
                                 return ENOTSUP;
                         }
-                        fd_log_debug( "Def SCTP_AUTO_ASCONF value : %s\n", asconf ? "true" : "false");
+                        fd_log_debug( "Def SCTP_AUTO_ASCONF value : %s", asconf ? "true" : "false");
                 }
 
@@ -583 +583 @@
                         /* Check new values */
                         CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_AUTO_ASCONF, &asconf, &sz)  );
-                        fd_log_debug( "New SCTP_AUTO_ASCONF value : %s\n", asconf ? "true" : "false");
+                        fd_log_debug( "New SCTP_AUTO_ASCONF value : %s", asconf ? "true" : "false");
                 }
         }
@@ -746 +746 @@
                         int i;
                         ptr.sa = sar;
-                        fd_log_debug("Calling sctp_bindx with the following address array:\n");
+                        fd_log_debug("Calling sctp_bindx with the following address array:");
                         for (i = 0; i < count; i++) {
                                 TRACE_sSA(FD_LOG_DEBUG, FULL, "    - ", ptr.sa, NI_NUMERICHOST | NI_NUMERICSERV, "" );
@@ -774 +774 @@
                 CHECK_SYS(  sz = sctp_getladdrs(*sock, 0, &sar)  );
                 
-                fd_log_debug("SCTP server bound on :\n");
+                fd_log_debug("SCTP server bound on :");
                 for (ptr.sa = sar; sz-- > 0; ptr.buf += (ptr.sa->sa_family == AF_INET) ? sizeof(sSA4) : sizeof(sSA6)) {
                         TRACE_sSA(FD_LOG_DEBUG, FULL, "    - ", ptr.sa, NI_NUMERICHOST | NI_NUMERICSERV, "" );
@@ -911 +911 @@
                 char buf[1024];
                 sSA_DUMP_NODE_SERV(buf, sizeof(buf), &status.sstat_primary.spinfo_address, NI_NUMERICHOST | NI_NUMERICSERV );
-                fd_log_debug( "SCTP_STATUS : sstat_state                  : %i\n" , status.sstat_state);
-                fd_log_debug( "              sstat_rwnd                   : %u\n" , status.sstat_rwnd);
-                fd_log_debug( "              sstat_unackdata              : %hu\n", status.sstat_unackdata);
-                fd_log_debug( "              sstat_penddata               : %hu\n", status.sstat_penddata);
-                fd_log_debug( "              sstat_instrms                : %hu\n", status.sstat_instrms);
-                fd_log_debug( "              sstat_outstrms               : %hu\n", status.sstat_outstrms);
-                fd_log_debug( "              sstat_fragmentation_point    : %u\n" , status.sstat_fragmentation_point);
-                fd_log_debug( "              sstat_primary.spinfo_address : %s\n" , buf);
-                fd_log_debug( "              sstat_primary.spinfo_state   : %d\n" , status.sstat_primary.spinfo_state);
-                fd_log_debug( "              sstat_primary.spinfo_cwnd    : %u\n" , status.sstat_primary.spinfo_cwnd);
-                fd_log_debug( "              sstat_primary.spinfo_srtt    : %u\n" , status.sstat_primary.spinfo_srtt);
-                fd_log_debug( "              sstat_primary.spinfo_rto     : %u\n" , status.sstat_primary.spinfo_rto);
-                fd_log_debug( "              sstat_primary.spinfo_mtu     : %u\n" , status.sstat_primary.spinfo_mtu);
+                fd_log_debug( "SCTP_STATUS : sstat_state                  : %i" , status.sstat_state);
+                fd_log_debug( "              sstat_rwnd                   : %u" , status.sstat_rwnd);
+                fd_log_debug( "              sstat_unackdata              : %hu", status.sstat_unackdata);
+                fd_log_debug( "              sstat_penddata               : %hu", status.sstat_penddata);
+                fd_log_debug( "              sstat_instrms                : %hu", status.sstat_instrms);
+                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_state   : %d" , status.sstat_primary.spinfo_state);
+                fd_log_debug( "              sstat_primary.spinfo_cwnd    : %u" , status.sstat_primary.spinfo_cwnd);
+                fd_log_debug( "              sstat_primary.spinfo_srtt    : %u" , status.sstat_primary.spinfo_srtt);
+                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);
         }
         
@@ -1219 +1219 @@
                         sndrcv = (struct sctp_sndrcvinfo *) CMSG_DATA(hdr);
                         if (TRACE_BOOL(SCTP_LEVEL)) {
-                                fd_log_debug( "Anciliary block IPPROTO_SCTP / SCTP_SNDRCV\n");
-                                fd_log_debug( "    sinfo_stream    : %hu\n", sndrcv->sinfo_stream);
-                                fd_log_debug( "    sinfo_ssn       : %hu\n", sndrcv->sinfo_ssn);
-                                fd_log_debug( "    sinfo_flags     : %hu\n", sndrcv->sinfo_flags);
-                                /* fd_log_debug( "    sinfo_pr_policy : %hu\n", sndrcv->sinfo_pr_policy); */
-                                fd_log_debug( "    sinfo_ppid      : %u\n" , sndrcv->sinfo_ppid);
-                                fd_log_debug( "    sinfo_context   : %u\n" , sndrcv->sinfo_context);
-                                /* fd_log_debug( "    sinfo_pr_value  : %u\n" , sndrcv->sinfo_pr_value); */
-                                fd_log_debug( "    sinfo_tsn       : %u\n" , sndrcv->sinfo_tsn);
-                                fd_log_debug( "    sinfo_cumtsn    : %u\n" , sndrcv->sinfo_cumtsn);
+                                fd_log_debug( "Anciliary block IPPROTO_SCTP / SCTP_SNDRCV");
+                                fd_log_debug( "    sinfo_stream    : %hu", sndrcv->sinfo_stream);
+                                fd_log_debug( "    sinfo_ssn       : %hu", sndrcv->sinfo_ssn);
+                                fd_log_debug( "    sinfo_flags     : %hu", sndrcv->sinfo_flags);
+                                /* fd_log_debug( "    sinfo_pr_policy : %hu", sndrcv->sinfo_pr_policy); */
+                                fd_log_debug( "    sinfo_ppid      : %u" , sndrcv->sinfo_ppid);
+                                fd_log_debug( "    sinfo_context   : %u" , sndrcv->sinfo_context);
+                                /* fd_log_debug( "    sinfo_pr_value  : %u" , sndrcv->sinfo_pr_value); */
+                                fd_log_debug( "    sinfo_tsn       : %u" , sndrcv->sinfo_tsn);
+                                fd_log_debug( "    sinfo_cumtsn    : %u" , sndrcv->sinfo_cumtsn);
                         }
 

libfdcore/sctps.c

@@ -486 +486 @@
         if (TRACE_BOOL(FULL)) {
                 if (resumed) {
-                        fd_log_debug("Session was resumed successfully on stream %hu (conn: '%s')\n", ctx->strid, fd_cnx_getid(ctx->parent));
+                        fd_log_debug("Session was resumed successfully on stream %hu (conn: '%s')", ctx->strid, fd_cnx_getid(ctx->parent));
                 } else {
-                        fd_log_debug("Session was NOT resumed on stream %hu  (full handshake) (conn: '%s')\n", ctx->strid, fd_cnx_getid(ctx->parent));
+                        fd_log_debug("Session was NOT resumed on stream %hu  (full handshake) (conn: '%s')", ctx->strid, fd_cnx_getid(ctx->parent));
                 }
         }

libfdcore/server.c

@@ -98 +98 @@
         struct fd_list * li, *cli;
         
-        fd_log_debug("Dumping servers list :\n");
+        fd_log_debug("Dumping servers list :");
         for (li = FD_SERVERS.next; li != &FD_SERVERS; li = li->next) {
                 struct server * s = (struct server *)li;
                 enum s_state st = get_status(s);
-                fd_log_debug("  Serv %p '%s': %s, %s, %s\n", 
+                fd_log_debug("  Serv %p '%s': %s, %s, %s", 
                                 s, fd_cnx_getid(s->conn), 
                                 IPPROTO_NAME( s->proto ),
@@ -115 +115 @@
                         struct client * c = (struct client *)cli;
                         char bufts[128];
-                        fd_log_debug("     Connected: '%s' (timeout: %s)\n",
+                        fd_log_debug("     Connected: '%s' (timeout: %s)",
                                         fd_cnx_getid(c->conn),
                                         fd_log_time(&c->ts, bufts, sizeof(bufts)));
@@ -148 +148 @@
                 if (ret != 0) {
                         if (TRACE_BOOL(INFO)) {
-                                fd_log_debug("TLS handshake failed for client '%s', connection aborted.\n", fd_cnx_getid(c->conn));
+                                fd_log_debug("TLS handshake failed for client '%s', connection aborted.", fd_cnx_getid(c->conn));
                         }
                         goto cleanup;
@@ -177 +177 @@
         CHECK_FCT_DO( fd_msg_hdr ( msg, &hdr ), goto fatal_error );
         CHECK_PARAMS_DO( (hdr->msg_appl == 0) && (hdr->msg_flags & CMD_FLAG_REQUEST) && (hdr->msg_code == CC_CAPABILITIES_EXCHANGE),
-                { fd_log_debug("Connection '%s', expecting CER, received something else, closing...\n", fd_cnx_getid(c->conn)); goto cleanup; } );
+                { fd_log_debug("Connection '%s', expecting CER, received something else, closing...", fd_cnx_getid(c->conn)); goto cleanup; } );
         
         /* Finally, pass the information to the peers module which will handle it next */
@@ -387 +387 @@
                 CHECK_FCT(fd_cnx_get_local_eps(&fd_g_config->cnf_endpoints));
                 if (FD_IS_LIST_EMPTY(&fd_g_config->cnf_endpoints)) {
-                        TRACE_DEBUG(INFO, "Unable to find the address(es) of the local system.\n" 
+                        TRACE_DEBUG(INFO, "Unable to find the address(es) of the local system." 
                                         "Please use \"ListenOn\" parameter in the configuration.\n"
                                         "This information is required to generate the CER/CEA messages.\n");
@@ -394 +394 @@
         }
         if (TRACE_BOOL(FULL)){
-                fd_log_debug("  Local server address(es) :\n");
+                fd_log_debug("  Local server address(es) :");
                 fd_ep_dump( 5, &fd_g_config->cnf_endpoints );
         }