Changeset 1299:035f489b845b in freeDiameter

Timestamp:

Jul 5, 2015, 12:06:37 AM (9 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Added a new hook HOOK_MESSAGE_SENDING

Files:

• contrib/debian/changelog (modified) (1 diff)
• extensions/dbg_msg_dumps/dbg_msg_dumps.c (modified) (4 diffs)
• extensions/test_app/ta_cli.c (modified) (1 diff)
• include/freeDiameter/libfdcore.h (modified) (1 diff)
• libfdcore/hooks.c (modified) (1 diff)
• libfdcore/p_out.c (modified) (1 diff)

contrib/debian/changelog

@@ -4 +4 @@
   * New contrib: Gx extension.
   * rt_redirect.fdx and rt_load_balance.fdx improvement: use a hash table. Thanks Thomas.
+  * New hook HOOK_MESSAGE_SENDING to give a last chance to edit messages before they are sent.
+    This will be mostly used for enforcing interoperability constraints on non-compliant peers.
   * Simplified log output. Old output can be recovered with DEBUG_WITH_META build option.
   * Updated the internal counters for finer control on the load.

extensions/dbg_msg_dumps/dbg_msg_dumps.c

@@ -119 +119 @@
                 LOG_SPLIT(FD_LOG_NOTICE, "     ", buf, NULL);
                 break;
+        case HOOK_MESSAGE_SENDING:
+                LOG_N("SNDING to '%s':", peer_name);
+                LOG_SPLIT(FD_LOG_NOTICE, "     ", buf, NULL);
+                break;
         case HOOK_MESSAGE_SENT:
                 LOG_N("SND to '%s':", peer_name);
@@ -205 +209 @@
                 LOG_N("RCV from '%s': %s", peer_name, buf);
                 break;
+        case HOOK_MESSAGE_SENDING:
+                LOG_N("SNDING to '%s': %s", peer_name, buf);
+                break;
         case HOOK_MESSAGE_SENT:
                 LOG_N("SND to '%s': %s", peer_name, buf);
@@ -284 +291 @@
                 LOG_N("RCV from '%s': %s", peer_name, buf);
                 break;
+        case HOOK_MESSAGE_SENDING:
+                LOG_N("SNDING to '%s': %s", peer_name, buf);
+                break;
         case HOOK_MESSAGE_SENT:
                 LOG_N("SND to '%s': %s", peer_name, buf);
@@ -342 +352 @@
         
         mask_errors = HOOK_MASK( HOOK_MESSAGE_FAILOVER, HOOK_MESSAGE_PARSING_ERROR, HOOK_MESSAGE_ROUTING_ERROR, HOOK_MESSAGE_DROPPED  );
-        mask_sndrcv = HOOK_MASK( HOOK_MESSAGE_RECEIVED, HOOK_MESSAGE_SENT );
+        mask_sndrcv = HOOK_MASK( HOOK_MESSAGE_RECEIVED, HOOK_MESSAGE_SENT ); /* We don t access SENDING hook here */
         mask_routing= HOOK_MASK( HOOK_MESSAGE_LOCAL, HOOK_MESSAGE_ROUTING_FORWARD, HOOK_MESSAGE_ROUTING_LOCAL );
         mask_peers  = HOOK_MASK( HOOK_PEER_CONNECT_FAILED, HOOK_PEER_CONNECT_SUCCESS );

extensions/test_app/ta_cli.c

@@ -71 +71 @@
                 
                 CHECK_FCT_DO( fd_sess_state_retrieve( ta_cli_reg, sess, &mi ), return );
-                TRACE_DEBUG( INFO, "%p %p", mi, data);
                 ASSERT( (void *)mi == data );
         }

include/freeDiameter/libfdcore.h

@@ -965 +965 @@
                  */
         
+        HOOK_MESSAGE_SENDING,
+                /* Hook called when a message is about to be sent to a peer. The message pointer cannot be modified here, but the content of the message
+                  could still be changed (for example add or remove some AVP. This is the last chance.
+                 - {msg} points to the message. Some objects may not have been dictionary resolved. If you
+                   try to call fd_msg_parse_dict, it will slow down the operation of the instance.
+                 - {peer} is the one the message is being sent to.
+                 - {other} is NULL.
+                 - {permsgdata} points to existing structure if any, or a new structure otherwise. 
+                 */
+        
         HOOK_MESSAGE_SENT,
                 /* Hook called when a message has been sent to a peer. The message might be freed as soon as the hook function returns,

libfdcore/hooks.c

@@ -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);

libfdcore/p_out.c

@@ -166 +166 @@
         TRACE_ENTRY("%p %p %p", msg, cnx, peer);
         CHECK_PARAMS( msg && *msg && (cnx || (peer && peer->p_cnxctx)));
+
+        fd_hook_call(HOOK_MESSAGE_SENDING, *msg, peer, NULL, fd_msg_pmdl_get(*msg));
         
         if (update_reqin_cnt && peer) {