Changeset 1307:7a2ab0087788 in freeDiameter for libfdcore

Timestamp:

Sep 18, 2016, 9:36:51 PM (8 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Parents:

1305:84a3c9c4b834 (diff), 1306:0d15dad33f0b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Remerged proposed branch

Files:

• libfdcore/hooks.c (modified) (1 diff)
• libfdcore/hooks.c (modified) (3 diffs)

libfdcore/hooks.c

@@ -365 +365 @@
                                 if (msg) {
                                         DiamId_t id = NULL;
-                                        if (!fd_msg_source_get( msg, &id, NULL ))
+                                        if (fd_msg_source_get( msg, &id, NULL ))
                                                 id = (DiamId_t)"<error getting source>";
                                         

libfdcore/hooks.c

@@ -3 +3 @@
 * Author: Sebastien Decugis <sdecugis@freediameter.net>                                                  *
 *                                                                                                        *
-* Copyright (c) 2013, WIDE Project and NICT                                                              *
+* Copyright (c) 2015, WIDE Project and NICT                                                              *
 * All rights reserved.                                                                                   *
 *                                                                                                        *
@@ -345 +345 @@
                         }
                         
+                        case HOOK_MESSAGE_SENDING: {
+                                LOG_A("SENDING message to '%s'", peer ? peer->p_hdr.info.pi_diamid : "<unknown>");
+                                break;
+                        }
+                        
                         case HOOK_MESSAGE_SENT: {
                                 CHECK_MALLOC_DO(fd_msg_dump_summary(&hook_default_buf, &hook_default_len, NULL, msg, NULL, 0, 1), break);
@@ -378 +383 @@
                         }
                         
+                        case HOOK_MESSAGE_PARSING_ERROR2: {
+                                CHECK_MALLOC_DO(fd_msg_dump_treeview(&hook_default_buf, &hook_default_len, NULL, msg, NULL, 0, 1), break);
+
+                                LOG_E("Returning following message after parsing error:");
+                                LOG_SPLIT(FD_LOG_ERROR, "   ", hook_default_buf, NULL);
+                                break;
+                        }
+                        
                         case HOOK_MESSAGE_ROUTING_ERROR: {
                                 CHECK_MALLOC_DO(fd_msg_dump_treeview(&hook_default_buf, &hook_default_len, NULL, msg, NULL, 0, 1), break);