Changeset 1168:a4604f98adae in freeDiameter for libfdcore

Timestamp:

Jun 1, 2013, 1:29:33 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Split output of fd_msg_dump_treeview

File:

• libfdcore/hooks.c (modified) (5 diffs)

libfdcore/hooks.c

@@ -360 +360 @@
                                         
                                         LOG_E("Parsing error: '%s' for the following message received from '%s':", (char *)other, (char *)id);
-                                        LOG_E("%s", buf);
+                                        LOG_SPLIT(FD_LOG_ERROR, "   ", buf?:"<error dumping message>", NULL);
                                 } else {
                                         struct fd_cnx_rcvdata *rcv_data = other;
@@ -380 +380 @@
 
                                 LOG_E("Routing error: '%s' for the following message:", (char *)other);
-                                LOG_E("%s", buf);
+                                LOG_SPLIT(FD_LOG_ERROR, "   ", buf?:"<error dumping message>", NULL);
                                 break;
                         }
@@ -399 +399 @@
                                 CHECK_MALLOC_DO(fd_msg_dump_treeview(&buf, &len, NULL, msg, NULL, 0, 1), break);
                                 LOG_E("Message discarded ('%s'):", (char *)other);
-                                LOG_E("%s", buf);
+                                LOG_SPLIT(FD_LOG_ERROR, "   ", buf?:"<error dumping message>", NULL);
                                 break;
                         }
@@ -405 +405 @@
                         case HOOK_PEER_CONNECT_FAILED: {
                                 if (msg) {
-                                        size_t offset = 0;
-                                        CHECK_MALLOC_DO(fd_dump_extend(&buf, &len, &offset, " CER/CEA dump:\n"), break);
-                                        CHECK_MALLOC_DO(fd_msg_dump_treeview(&buf, &len, &offset, msg, NULL, 0, 1), break);
-                                        LOG_N("Connection to '%s' failed: %s%s", peer ? peer->p_hdr.info.pi_diamid : "<unknown>", (char *)other, buf);
+                                        CHECK_MALLOC_DO(fd_msg_dump_treeview(&buf, &len, NULL, msg, NULL, 0, 1), break);
+                                        LOG_N("Connection to '%s' failed: '%s'; CER/CEA dump:", peer ? peer->p_hdr.info.pi_diamid : "<unknown>", (char *)other);
+                                        LOG_SPLIT(FD_LOG_NOTICE, "   ", buf?:"<error dumping message>", NULL);
                                 } else {
                                         LOG_D("Connection to '%s' failed: %s", peer ? peer->p_hdr.info.pi_diamid : "<unknown>", (char *)other);
@@ -421 +420 @@
                                 }
                                 CHECK_MALLOC_DO(fd_msg_dump_treeview(&buf, &len, NULL, msg, NULL, 0, 1), break);
-                                LOG_N("Connected to '%s', remote capabilities: %s", peer ? peer->p_hdr.info.pi_diamid : "<unknown>", buf);
+                                LOG_N("Connected to '%s', remote capabilities: ", peer ? peer->p_hdr.info.pi_diamid : "<unknown>");
+                                LOG_SPLIT(FD_LOG_NOTICE, "   ", buf?:"<error dumping message>", NULL);
                                 break;
                         }