Changes in / [1116:5da2ea1585a1:1115:a325f95de659] in freeDiameter

Files:

• extensions/dbg_interactive/endpoints.i (modified) (1 diff)
• extensions/dbg_monitor/dbg_monitor.c (modified) (1 diff)
• include/freeDiameter/libfdcore.h (modified) (3 diffs)
• include/freeDiameter/libfdproto.h (modified) (2 diffs)
• libfdcore/config.c (modified) (4 diffs)
• libfdcore/core.c (modified) (4 diffs)
• libfdcore/endpoints.c (modified) (3 diffs)
• libfdcore/extensions.c (modified) (3 diffs)
• libfdcore/messages.c (modified) (1 diff)
• libfdcore/p_ce.c (modified) (1 diff)
• libfdcore/p_out.c (modified) (3 diffs)
• libfdcore/p_psm.c (modified) (7 diffs)
• libfdcore/p_sr.c (modified) (2 diffs)
• libfdcore/peers.c (modified) (1 diff)
• libfdcore/queues.c (modified) (1 diff)
• libfdcore/routing_dispatch.c (modified) (22 diffs)
• libfdcore/server.c (modified) (3 diffs)
• libfdproto/dispatch.c (modified) (2 diffs)
• libfdproto/fdproto-internal.h (modified) (1 diff)
• libfdproto/messages.c (modified) (6 diffs)
• tests/testdisp.c (modified) (34 diffs)

extensions/dbg_interactive/endpoints.i

@@ -128 +128 @@
                 char * buf = NULL;
                 size_t len;
-                printf("%s", fd_ep_dump_one(&buf, &len, NULL, 1, $self));
+                printf("%s", fd_ep_dump_one(&buf, &len, NULL, $self));
                 free(buf);
         }

extensions/dbg_monitor/dbg_monitor.c

@@ -126 +126 @@
                 
                 TRACE_DEBUG(INFO, "[dbg_monitor] Dumping servers information");
-                TRACE_DEBUG(INFO, "%s", fd_servers_dump(&buf, &len, NULL, 1));
+                TRACE_DEBUG(INFO, "%s", fd_servers_dump(&buf, &len, NULL));
                 
                 sleep(1);

include/freeDiameter/libfdcore.h

@@ -814 +814 @@
 DECLARE_FD_DUMP_PROTOTYPE(fd_conf_dump);
 DECLARE_FD_DUMP_PROTOTYPE(fd_ext_dump);
-DECLARE_FD_DUMP_PROTOTYPE(fd_servers_dump, int details);
+DECLARE_FD_DUMP_PROTOTYPE(fd_servers_dump);
 #endif /* SWIG */
 DECLARE_FD_DUMP_PROTOTYPE(fd_peer_dump_list, int details);
@@ -853 +853 @@
 int fd_ep_filter_list( struct fd_list * list, struct fd_list * exclude_list );
 int fd_ep_clearflags( struct fd_list * list, uint32_t flags );
-DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump_one, int preamble, struct fd_endpoint * ep );
-DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump, int preamble, int indent, struct fd_list * eps  );
+DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump_one, struct fd_endpoint * ep );
+DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump, int indent, struct fd_list * eps  );
 
 
@@ -936 +936 @@
         
         HOOK_MESSAGE_LOCAL,
-                /* Hook called when a request message has been created locally by an extension and is being sent.
+                /* Hook called when a request message has been created locally and is being sent.
                  - {msg} points to the message.
                  - {peer} is NULL

include/freeDiameter/libfdproto.h

@@ -2922 +2922 @@
  *  action      : Upon return, the action that must be taken on the message
  *  error_code  : Upon return with action == DISP_ACT_ERROR, contains the error (such as "DIAMETER_UNABLE_TO_COMPLY")
- *  drop_reason : if set on return, the message must be freed for this reason.
- *  drop_msg    : if drop_reason is set, this points to the message to be freed while *msg is NULL.
  *
  * DESCRIPTION: 
@@ -2936 +2934 @@
  *  (other errors)
  */
-int fd_msg_dispatch ( struct msg ** msg, struct session * session, enum disp_action *action, char ** error_code, char ** drop_reason, struct msg ** drop_msg );
+int fd_msg_dispatch ( struct msg ** msg, struct session * session, enum disp_action *action, char ** error_code );
 
 

libfdcore/config.c

@@ -85 +85 @@
         FD_DUMP_HANDLE_OFFSET();
         
-        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "freeDiameter configuration:\n", fd_g_config), return NULL);       
+        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{freeDiameter configuration}(@%p): \n", fd_g_config), return NULL);       
         CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "  Default trace level .... : %+d\n", fd_g_debug_lvl), return NULL);
         CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "  Configuration file ..... : %s\n", fd_g_config->cnf_file), return NULL);
@@ -99 +99 @@
                 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "  Local endpoints ........ : Default (use all available)\n"), return NULL);
         } else {
-                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "  Local endpoints ........ : "), return NULL);
-                CHECK_MALLOC_DO( fd_ep_dump( FD_DUMP_STD_PARAMS, 0, 0, &fd_g_config->cnf_endpoints ), return NULL);
+                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "  Local endpoints ........ : \n"), return NULL);
+                CHECK_MALLOC_DO( fd_ep_dump( FD_DUMP_STD_PARAMS, 29, &fd_g_config->cnf_endpoints ), return NULL);
         }
         if (FD_IS_LIST_EMPTY(&fd_g_config->cnf_apps)) {
-                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "  Local applications ..... : (none)"), return NULL);
+                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "  Local applications ..... : (none)\n"), return NULL);
         } else {
                 struct fd_list * li = fd_g_config->cnf_apps.next;
-                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "  Local applications ..... : "), return NULL);
+                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "  Local applications ..... : \n"), return NULL);
                 while (li != &fd_g_config->cnf_apps) {
                         struct fd_app * app = (struct fd_app *)li;
-                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "App: %u,%s%s,Vnd:%u\t", 
+                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "                             App: %u\t%s%s\tVnd: %u\n", 
                                         app->appid,
                                         app->flags.auth ? "Au" : "--",
@@ -118 +118 @@
         }
         
-        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n  Flags : - IP ........... : %s\n", fd_g_config->cnf_flags.no_ip4 ? "DISABLED" : "Enabled"), return NULL);
+        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "  Flags : - IP ........... : %s\n", fd_g_config->cnf_flags.no_ip4 ? "DISABLED" : "Enabled"), return NULL);
         CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "          - IPv6 ......... : %s\n", fd_g_config->cnf_flags.no_ip6 ? "DISABLED" : "Enabled"), return NULL);
         CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "          - Relay app .... : %s\n", fd_g_config->cnf_flags.no_fwd ? "DISABLED" : "Enabled"), return NULL);
@@ -588 +588 @@
                 
         } else {
-                LOG_D( "Generating fresh Diffie-Hellman parameters of size %d (this takes some time)... ", fd_g_config->cnf_sec_data.dh_bits ?: GNUTLS_DEFAULT_DHBITS);
+                TRACE_DEBUG(INFO, "Generating fresh Diffie-Hellman parameters of size %d (this takes some time)... ", fd_g_config->cnf_sec_data.dh_bits ?: GNUTLS_DEFAULT_DHBITS);
                 CHECK_GNUTLS_DO( gnutls_dh_params_generate2( 
                                         fd_g_config->cnf_sec_data.dh_cache,

libfdcore/core.c

@@ -84 +84 @@
 static int core_state_wait(enum core_state waitstate)
 {
-        int ret = 0;
+        int ret;
         CHECK_POSIX( pthread_mutex_lock( &core_mtx ));
         pthread_cleanup_push( fd_cleanup_mutex, &core_mtx );
-        while (waitstate > core_state) {
+        do {
                 CHECK_POSIX_DO(ret = pthread_cond_wait(&core_cnd, &core_mtx), break);
-        }
+        } while (waitstate > core_state);
         pthread_cleanup_pop( 0 );
         CHECK_POSIX( pthread_mutex_unlock( &core_mtx ));
@@ -189 +189 @@
         }
         
-        LOG_N("libfdproto initialized.");
+        LOG_D("libfdproto initialized.");
         
         /* Name this thread */
@@ -305 +305 @@
         if (cur_state < CORE_RUNNING) {
                 core_shutdown();
-                core_state_set(CORE_TERM);
         } else if (cur_state == CORE_RUNNING) {
                 core_state_set(CORE_SHUTDOWN);
@@ -324 +323 @@
         void * th_ret = NULL;
         
-        CHECK_FCT(core_state_wait(CORE_SHUTDOWN));
-        
         if (cur_state == CORE_TERM)
                 return 0;
         
+        CHECK_FCT(core_state_wait(CORE_SHUTDOWN));
+        
         /* Just wait for core_runner_thread to complete and return gracefully */
         CHECK_POSIX(pthread_join(core_runner, &th_ret));

libfdcore/endpoints.c

@@ -285 +285 @@
 }
 
-DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump_one, int preamble, struct fd_endpoint * ep )
+DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump_one, struct fd_endpoint * ep )
 {
         FD_DUMP_HANDLE_OFFSET();
         
-        if (preamble) {
-                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{ep}(@%p): ", ep), return NULL);
-        }
+        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{ep}(@%p): ", ep), return NULL);
         
         if (!ep) {
@@ -299 +297 @@
         
         CHECK_MALLOC_DO( fd_sa_dump_node_serv( FD_DUMP_STD_PARAMS, &ep->sa, NI_NUMERICHOST | NI_NUMERICSERV ), return NULL);
-        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{%s%s%s%s%s}",
-                                (ep->flags & EP_FL_CONF)        ? "C" : "-",
-                                (ep->flags & EP_FL_DISC)        ? "D" : "-",
-                                (ep->flags & EP_FL_ADV)         ? "A" : "-",
-                                (ep->flags & EP_FL_LL)          ? "L" : "-",
-                                (ep->flags & EP_FL_PRIMARY)     ? "P" : "-"), return NULL);
+        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " {%s%s%s%s%s}",
+                        (ep->flags & EP_FL_CONF)        ? "C" : "-",
+                        (ep->flags & EP_FL_DISC)        ? "D" : "-",
+                        (ep->flags & EP_FL_ADV)         ? "A" : "-",
+                        (ep->flags & EP_FL_LL)          ? "L" : "-",
+                        (ep->flags & EP_FL_PRIMARY)     ? "P" : "-"), return NULL);
         return *buf;
 }
 
-DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump, int preamble, int indent, struct fd_list * eps  )
+DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump, int indent, struct fd_list * eps  )
 {
         struct fd_list * li;
@@ -314 +312 @@
         FD_DUMP_HANDLE_OFFSET();
         
-        if (preamble) {
-                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%*s{eps}(@%p):", indent, "", eps), return NULL);
-        }
+        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%*s{eps}(@%p):", indent, "", eps), return NULL);
         if (eps) {
                 for (li = eps->next; li != eps; li = li->next) {
                         struct fd_endpoint * ep = (struct fd_endpoint *)li;
-                        if (preamble) {
-                                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n%*s", indent+1, ""), return NULL);
-                        } else if (li->prev != eps) {
-                                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\t"), return NULL);
-                        }
-                        CHECK_MALLOC_DO( fd_ep_dump_one( FD_DUMP_STD_PARAMS, preamble, ep ), return NULL);
-                }
-        }
-}
-        
+                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n%*s", indent+1, ""), return NULL);
+                        CHECK_MALLOC_DO( fd_ep_dump_one( FD_DUMP_STD_PARAMS, ep ), return NULL);
+                }
+        }
+}
+        

libfdcore/extensions.c

@@ -151 +151 @@
         {
                 struct fd_ext_info * ext = (struct fd_ext_info *)li;
-                LOG_D( "Loading : %s", ext->filename);
+                TRACE_DEBUG (INFO, "Loading : %s", ext->filename);
                 
                 /* Load the extension */
@@ -162 +162 @@
                 if (ext->handler == NULL) {
                         /* An error occured */
-                        LOG_F("Loading of extension %s failed: %s", ext->filename, dlerror());
+                        TRACE_ERROR("Loading of extension %s failed: %s", ext->filename, dlerror());
                         #ifdef DEBUG
                         ext->handler = dlopen(ext->filename, RTLD_LAZY | RTLD_GLOBAL);
@@ -208 +208 @@
         }
 
-        LOG_N("All extensions loaded.");
+        TRACE_DEBUG (INFO, "All extensions loaded.");
         
         /* We have finished. */

libfdcore/messages.c

@@ -314 +314 @@
 }
 
-static int fd_msg_send_int( struct msg ** pmsg, void (*anscb)(void *, struct msg **), void * data, void (*expirecb)(void *, DiamId_t, size_t, struct msg **), const struct timespec *timeout )
-{
-        struct msg_hdr *hdr;
-        DiamId_t diamid;
-        size_t diamidlen;
+/* Send a message and optionaly register a callback for an answer */
+int fd_msg_send ( struct msg ** pmsg, void (*anscb)(void *, struct msg **), void * data )
+{
+        TRACE_ENTRY("%p %p %p", pmsg, anscb, data);
+        CHECK_PARAMS( pmsg );
+        
+        /* Save the callback in the message */
+        CHECK_FCT(  fd_msg_anscb_associate( *pmsg, anscb, data, NULL, NULL /* we should maybe use a safeguard here like 1 hour or so? */ )  );
+        
+        /* Post the message in the outgoing queue */
+        CHECK_FCT( fd_fifo_post(fd_g_outgoing, pmsg) );
+        
+        return 0;
+}
+
+/* The variation of the same function with a timeout callback */
+int fd_msg_send_timeout ( struct msg ** pmsg, void (*anscb)(void *, struct msg **), void * data, void (*expirecb)(void *, DiamId_t, size_t, struct msg **), const struct timespec *timeout )
+{
+        TRACE_ENTRY("%p %p %p %p %p", pmsg, anscb, data, expirecb, timeout);
+        CHECK_PARAMS( pmsg && expirecb && timeout );
         
         /* Save the callback in the message, with the timeout */
         CHECK_FCT(  fd_msg_anscb_associate( *pmsg, anscb, data, expirecb, timeout )  );
         
-        /* If this is a new request, call the HOOK_MESSAGE_LOCAL hook */
-        if ( (fd_msg_hdr(*pmsg, &hdr) == 0)
-         &&  (hdr->msg_flags & CMD_FLAG_REQUEST)
-         &&  (fd_msg_source_get(*pmsg, &diamid, &diamidlen) == 0)
-         &&  (diamid == NULL)) {
-                fd_hook_call(HOOK_MESSAGE_LOCAL, *pmsg, NULL, NULL, fd_msg_pmdl_get(*pmsg));
-        }
-                
         /* Post the message in the outgoing queue */
         CHECK_FCT( fd_fifo_post(fd_g_outgoing, pmsg) );
         
         return 0;
-}
-
-/* Send a message and optionaly register a callback for an answer */
-int fd_msg_send ( struct msg ** pmsg, void (*anscb)(void *, struct msg **), void * data )
-{
-        TRACE_ENTRY("%p %p %p", pmsg, anscb, data);
-        CHECK_PARAMS( pmsg );
-        
-        return fd_msg_send_int(pmsg, anscb, data, NULL, NULL);
-}
-
-/* The variation of the same function with a timeout callback */
-int fd_msg_send_timeout ( struct msg ** pmsg, void (*anscb)(void *, struct msg **), void * data, void (*expirecb)(void *, DiamId_t, size_t, struct msg **), const struct timespec *timeout )
-{
-        TRACE_ENTRY("%p %p %p %p %p", pmsg, anscb, data, expirecb, timeout);
-        CHECK_PARAMS( pmsg && expirecb && timeout );
-        
-        return fd_msg_send_int(pmsg, anscb, data, expirecb, timeout);
 }
 

libfdcore/p_ce.c

@@ -650 +650 @@
         *recv_cnx = NULL;
         if (*cer) {
-                fd_hook_call(HOOK_MESSAGE_DROPPED, *cer, NULL, "An error occurred while rejecting this CER.", fd_msg_pmdl_get(*cer));
+                //fd_msg_log(FD_MSG_LOG_DROPPED, *cer, "An error occurred while rejecting a CER.");
                 fd_msg_free(*cer);
                 *cer = NULL;

libfdcore/p_out.c

@@ -98 +98 @@
         CHECK_FCT_DO(fd_fifo_post(fd_g_outgoing, &msg),
                 {
-                        fd_hook_call(HOOK_MESSAGE_DROPPED, msg, NULL, "An error occurred while attempting to requeue this message during cancellation of the sending function", fd_msg_pmdl_get(msg));
+                        //fd_msg_log( FD_MSG_LOG_DROPPED, msg, "An error occurred while attempting to requeue this message during cancellation of the sending function");
                         CHECK_FCT_DO(fd_msg_free(msg), /* What can we do more? */);
                 } );
@@ -131 +131 @@
                         {
                                 if (msg) {
-                                        char buf[256];
-                                        snprintf(buf, sizeof(buf), "Error while sending this message: s", strerror(ret));
-                                        fd_hook_call(HOOK_MESSAGE_DROPPED, msg, NULL, buf, fd_msg_pmdl_get(msg));
+                                        //fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Internal error: Problem while sending (%s)", strerror(ret) );
                                         fd_msg_free(msg);
                                 }
@@ -185 +183 @@
                         {
                                 if (msg) {
-                                        char buf[256];
-                                        snprintf(buf, sizeof(buf), "Error while sending this message: s", strerror(ret));
-                                        fd_hook_call(HOOK_MESSAGE_DROPPED, *msg, NULL, buf, fd_msg_pmdl_get(*msg));
+                                        //fd_msg_log( FD_MSG_LOG_DROPPED, *msg, "Internal error: Problem while sending (%s)", strerror(ret) );
                                         fd_msg_free(*msg);
                                         *msg = NULL;

libfdcore/p_psm.c

@@ -241 +241 @@
                         case FDEVP_CNX_INCOMING: {
                                 struct cnx_incoming * evd = ev->data;
-                                fd_hook_call(HOOK_MESSAGE_DROPPED, evd->cer, NULL, "Message discarded while cleaning peer state machine queue.", fd_msg_pmdl_get(evd->cer));
+                                //fd_msg_log( FD_MSG_LOG_DROPPED, evd->cer, "Message discarded while cleaning peer state machine queue." );
                                 CHECK_FCT_DO( fd_msg_free(evd->cer), /* continue */);
                                 fd_cnx_destroy(evd->cnx);
@@ -577 +577 @@
                                         char buf[128];
                                         snprintf(buf, sizeof(buf), "Received while peer state machine was in state %s.", STATE_STR(cur_state));
-                                        LOG_E("%s",buf); 
                                         fd_hook_call(HOOK_MESSAGE_DROPPED, msg, peer, buf, fd_msg_pmdl_get(msg));
                                         fd_msg_free(msg);
@@ -591 +590 @@
                         if (ret != EBADMSG) {
                                 CHECK_FCT_DO( ret, 
-                                        {
-                                                char buf[256];
-                                                snprintf(buf, sizeof(buf), "%s: An unexpected error occurred while parsing a link-local message", peer->p_hdr.info.pi_diamid); 
-                                                LOG_E("%s",buf); 
-                                                fd_hook_call(HOOK_MESSAGE_DROPPED, msg, peer, buf, fd_msg_pmdl_get(msg));
+                                        { 
+                                                LOG_E("%s: An unexpected error occurred while parsing a link-local message", peer->p_hdr.info.pi_diamid); 
                                                 fd_msg_free(msg); 
                                                 goto psm_end; 
@@ -604 +600 @@
                                         CHECK_FCT_DO( ret = fd_out_send(&error, NULL, peer, FD_CNX_ORDERED),  );
                                         if (error) {
-                                                char buf[256];
                                                 /* Only if an error occurred & the message was not saved / dumped */
-                                                snprintf(buf, sizeof(buf), "%s: error sending a message", peer->p_hdr.info.pi_diamid); 
-                                                LOG_E("%s",buf); 
-                                                fd_hook_call(HOOK_MESSAGE_DROPPED, error, peer, buf, fd_msg_pmdl_get(error));
+                                                LOG_E("%s: error sending a message", peer->p_hdr.info.pi_diamid); 
                                                 CHECK_FCT_DO( fd_msg_free(error), goto psm_end);
                                         }
                                 } else {
-                                        char buf[256];
                                         /* We received an invalid answer, let's disconnect */
-                                        snprintf(buf, sizeof(buf), "%s: Received invalid answer to Base protocol message, disconnecting...", peer->p_hdr.info.pi_diamid);
-                                        LOG_E("%s",buf); 
+                                        LOG_E("%s: Received invalid answer to Base protocol message, disconnecting...", peer->p_hdr.info.pi_diamid);
                                         CHECK_FCT_DO( fd_msg_free(msg), goto psm_end);
                                         CHECK_FCT_DO( fd_event_send(peer->p_events, FDEVP_CNX_ERROR, 0, NULL), goto psm_reset );
@@ -666 +657 @@
                                 /* Cleanup the message if not done */
                                 if (msg) {
-                                        char buf[256];
-                                        snprintf(buf, sizeof(buf), "Received un-handled non-routable command from peer '%s'.", peer->p_hdr.info.pi_diamid);
-                                        LOG_E("%s",buf);
-                                        fd_hook_call(HOOK_MESSAGE_DROPPED, msg, NULL, buf, fd_msg_pmdl_get(msg));
+                                        //fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Received un-handled non-routable command from peer '%s'.", peer->p_hdr.info.pi_diamid );
                                         CHECK_FCT_DO( fd_msg_free(msg), /* continue */);
                                         msg = NULL;
@@ -677 +665 @@
                 /* At this point the message must have been fully handled already */
                 if (msg) {
-                        char buf[256];
-                        snprintf(buf, sizeof(buf), "Internal error ('%s'): unhandled message.", peer->p_hdr.info.pi_diamid);
-                        LOG_E("%s",buf);
-                        fd_hook_call(HOOK_MESSAGE_DROPPED, msg, NULL, buf, fd_msg_pmdl_get(msg));
+                        //fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Internal error ('%s'): unhandled message.", peer->p_hdr.info.pi_diamid );
                         fd_msg_free(msg);
                 }
@@ -747 +732 @@
                         char * buf = NULL;
                         size_t len = 0;
-                        LOG_D("New remote endpoint(s): %s",  fd_ep_dump(&buf, &len, NULL, 0, 0, &peer->p_hdr.info.pi_endpoints) ?: "error");
+                        LOG_D("New remote endpoint(s): %s",  fd_ep_dump(&buf, &len, NULL, 6, &peer->p_hdr.info.pi_endpoints) ?: "error");
                         free(buf);
                 }

libfdcore/p_sr.c

@@ -119 +119 @@
         /* If the callback did not dispose of the message, do it now */
         if (ed->request) {
-                fd_hook_call(HOOK_MESSAGE_DROPPED, ed->request, NULL, "Expiration period completed without an answer, and the expiry callback did not dispose of the message.", fd_msg_pmdl_get(ed->request));
+                //fd_msg_log(FD_MSG_LOG_DROPPED, ed->request, "Expiration period completed without an answer, and the expiry callback did not dispose of the message.");
                 CHECK_FCT_DO( fd_msg_free(ed->request), /* ignore */ );
         }
@@ -323 +323 @@
                                 hdr->msg_flags |= CMD_FLAG_RETRANSMIT;
                         
-                        fd_hook_call(HOOK_MESSAGE_FAILOVER, sr->req, (struct fd_peer *)srlist->srs.o, NULL, fd_msg_pmdl_get(sr->req));
-                        
                         /* Requeue for sending to another peer */
                         CHECK_FCT_DO( ret = fd_fifo_post(fd_g_outgoing, &sr->req),
                                 {
-                                        char buf[256];
-                                        snprintf(buf, sizeof(buf), "Internal error: error while requeuing during failover: %s", strerror(ret));
-                                        fd_hook_call(HOOK_MESSAGE_DROPPED, sr->req, NULL, buf, fd_msg_pmdl_get(sr->req));
+                                        //fd_msg_log( FD_MSG_LOG_DROPPED, sr->req, "Internal error: error while requeuing during failover: %s", strerror(ret) );
                                         CHECK_FCT_DO(fd_msg_free(sr->req), /* What can we do more? */)
                                 });
                 } else {
                         /* Just free the request. */
-                        /* fd_hook_call(HOOK_MESSAGE_DROPPED, sr->req, NULL, "Sent & unanswered local message discarded during failover.", fd_msg_pmdl_get(sr->req)); */
+                        //fd_msg_log( FD_MSG_LOG_DROPPED, sr->req, "Sent & unanswered local message discarded during failover." );
                         CHECK_FCT_DO(fd_msg_free(sr->req), /* Ignore */);
                 }

libfdcore/peers.c

@@ -242 +242 @@
         /* Requeue all messages in the "out" queue */
         while ( fd_fifo_tryget(peer->p_tosend, &m) == 0 ) {
-                fd_hook_call(HOOK_MESSAGE_FAILOVER, m, peer, NULL, fd_msg_pmdl_get(m));
                 CHECK_FCT_DO(fd_fifo_post(fd_g_outgoing, &m), 
                         {
                                 /* fallback: destroy the message */
-                                fd_hook_call(HOOK_MESSAGE_DROPPED, m, NULL, "Internal error: unable to requeue this message during failover process", fd_msg_pmdl_get(m));
+                                //fd_msg_log(FD_MSG_LOG_DROPPED, m, "Internal error: unable to requeue this message during failover process");
                                 CHECK_FCT_DO(fd_msg_free(m), /* What can we do more? */)
                         } );

libfdcore/queues.c

@@ -74 +74 @@
                 
                 /* We got one! */
-                fd_hook_call(HOOK_MESSAGE_DROPPED, msg, NULL, "Message lost because framework is terminating.", fd_msg_pmdl_get(msg));
+                //fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Message lost because framework is terminating." );
                 fd_msg_free(msg);
         }

libfdcore/routing_dispatch.c

@@ -393 +393 @@
 
                         if (!peer) {
-                                char buf[256];
-                                snprintf(buf, sizeof(buf), "Unable to send error '%s' to deleted peer '%s' in reply to this message.", error_code, id);
-                                fd_hook_call(HOOK_MESSAGE_DROPPED, *pmsg, NULL, buf, fd_msg_pmdl_get(*pmsg));
+                                //fd_msg_log(FD_MSG_LOG_DROPPED, *pmsg, "Unable to send error '%s' to deleted peer '%s' in reply to this message.", error_code, id);
                                 fd_msg_free(*pmsg);
                                 *pmsg = NULL;
@@ -498 +496 @@
 
         /* Now, call any callback registered for the message */
-        CHECK_FCT( fd_msg_dispatch ( &msgptr, sess, &action, &ec, &em, &error) );
+        CHECK_FCT( fd_msg_dispatch ( &msgptr, sess, &action, &ec) );
 
         /* Now, act depending on msg and action and ec */
@@ -507 +505 @@
                                 if (!fd_g_config->cnf_flags.no_fwd) {
                                         /* requeue to fd_g_outgoing */
-                                        fd_hook_call(HOOK_MESSAGE_ROUTING_FORWARD, msgptr, NULL, NULL, fd_msg_pmdl_get(msgptr));
                                         CHECK_FCT( fd_fifo_post(fd_g_outgoing, &msgptr) );
                                         break;
@@ -522 +519 @@
                                 
                                 if (!is_req) {
-                                        fd_hook_call(HOOK_MESSAGE_DROPPED, msgptr, NULL, "Internal error: Answer received to locally issued request, but not handled by any handler.", fd_msg_pmdl_get(msgptr));
+                                        //fd_msg_log( FD_MSG_LOG_DROPPED, msgptr,  "Internal error: Answer received to locally issued request, but not handled by any handler.");
                                         fd_msg_free(msgptr);
                                         break;
@@ -535 +532 @@
                                 CHECK_FCT( fd_fifo_post(fd_g_outgoing, &msgptr) );
                 }
-        } else if (em) {
-                fd_hook_call(HOOK_MESSAGE_DROPPED, error, NULL, em, fd_msg_pmdl_get(error));
-                fd_msg_free(error);
         }
         
@@ -561 +555 @@
         /* Handle incorrect bits */
         if (is_req && is_err) {
-                fd_hook_call(HOOK_MESSAGE_PARSING_ERROR, msgptr, NULL, "R & E bits were set", fd_msg_pmdl_get(msgptr));
                 CHECK_FCT( return_error( &msgptr, "DIAMETER_INVALID_HDR_BITS", "R & E bits were set", NULL) );
                 return 0;
@@ -580 +573 @@
                 /* Check if we have local support for the message application */
                 if ( (hdr->msg_appl == 0) || (hdr->msg_appl == AI_RELAY) ) {
-                        fd_hook_call(HOOK_MESSAGE_PARSING_ERROR, msgptr, NULL, "Received a routable message with application id 0 or " _stringize(AI_RELAY) " (relay)", fd_msg_pmdl_get(msgptr));
+                        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) );
                         return 0;
@@ -607 +601 @@
                                                         {
                                                                 if (error_info.pei_errcode) {
-                                                                        fd_hook_call(HOOK_MESSAGE_PARSING_ERROR, msgptr, NULL, error_info.pei_message ?: error_info.pei_errcode, fd_msg_pmdl_get(msgptr));
                                                                         CHECK_FCT( return_error( &msgptr, error_info.pei_errcode, error_info.pei_message, error_info.pei_avp) );
                                                                         return 0;
                                                                 } else {
-                                                                        fd_hook_call(HOOK_MESSAGE_PARSING_ERROR, msgptr, NULL, "Unspecified error while parsing Destination-Host AVP", fd_msg_pmdl_get(msgptr));
                                                                         return ret;
                                                                 }
@@ -629 +621 @@
                                                         {
                                                                 if (error_info.pei_errcode) {
-                                                                        fd_hook_call(HOOK_MESSAGE_PARSING_ERROR, msgptr, NULL, error_info.pei_message ?: error_info.pei_errcode, fd_msg_pmdl_get(msgptr));
                                                                         CHECK_FCT( return_error( &msgptr, error_info.pei_errcode, error_info.pei_message, error_info.pei_avp) );
                                                                         return 0;
                                                                 } else {
-                                                                        fd_hook_call(HOOK_MESSAGE_PARSING_ERROR, msgptr, NULL, "Unspecified error while parsing Destination-Realm AVP", fd_msg_pmdl_get(msgptr));
                                                                         return ret;
                                                                 }
@@ -653 +643 @@
                                                         {
                                                                 if (error_info.pei_errcode) {
-                                                                        fd_hook_call(HOOK_MESSAGE_PARSING_ERROR, msgptr, NULL, error_info.pei_message ?: error_info.pei_errcode, fd_msg_pmdl_get(msgptr));
                                                                         CHECK_FCT( return_error( &msgptr, error_info.pei_errcode, error_info.pei_message, error_info.pei_avp) );
                                                                         return 0;
                                                                 } else {
-                                                                        fd_hook_call(HOOK_MESSAGE_PARSING_ERROR, msgptr, NULL, "Unspecified error while parsing User-Name AVP", fd_msg_pmdl_get(msgptr));
                                                                         return ret;
                                                                 }
@@ -680 +668 @@
                 /* Handle the missing routing AVPs first */
                 if ( is_dest_realm == UNKNOWN ) {
-                        fd_hook_call(HOOK_MESSAGE_PARSING_ERROR, msgptr, NULL, "Non-routable message not supported (invalid bit ? missing Destination-Realm ?)", fd_msg_pmdl_get(msgptr));
                         CHECK_FCT( return_error( &msgptr, "DIAMETER_COMMAND_UNSUPPORTED", "Non-routable message not supported (invalid bit ? missing Destination-Realm ?)", NULL) );
                         return 0;
@@ -689 +676 @@
                         if (is_local_app == YES) {
                                 /* Ok, give the message to the dispatch thread */
-                                fd_hook_call(HOOK_MESSAGE_ROUTING_LOCAL, msgptr, NULL, NULL, fd_msg_pmdl_get(msgptr));
                                 CHECK_FCT( fd_fifo_post(fd_g_local, &msgptr) );
                         } else {
                                 /* We don't support the application, reply an error */
-                                fd_hook_call(HOOK_MESSAGE_PARSING_ERROR, msgptr, NULL, "Application unsupported", fd_msg_pmdl_get(msgptr));
                                 CHECK_FCT( return_error( &msgptr, "DIAMETER_APPLICATION_UNSUPPORTED", NULL, NULL) );
                         }
@@ -702 +687 @@
                 if ((is_dest_host == NO) || (is_dest_realm == NO)) {
                         if (fd_g_config->cnf_flags.no_fwd) {
-                                fd_hook_call(HOOK_MESSAGE_ROUTING_ERROR, msgptr, NULL, "Message for another realm/host", fd_msg_pmdl_get(msgptr));
                                 CHECK_FCT( return_error( &msgptr, "DIAMETER_UNABLE_TO_DELIVER", "I am not a Diameter agent", NULL) );
                                 return 0;
@@ -716 +700 @@
                                         {
                                                 /* If the process failed, we assume it is because of the AVP format */
-                                                fd_hook_call(HOOK_MESSAGE_PARSING_ERROR, msgptr, NULL, "Failed to process decorated NAI", fd_msg_pmdl_get(msgptr));
                                                 CHECK_FCT( return_error( &msgptr, "DIAMETER_INVALID_AVP_VALUE", "Failed to process decorated NAI", un) );
                                                 return 0;
@@ -730 +713 @@
                         if (is_local_app == YES) {
                                 /* Handle localy since we are able to */
-                                fd_hook_call(HOOK_MESSAGE_ROUTING_LOCAL, msgptr, NULL, NULL, fd_msg_pmdl_get(msgptr));
                                 CHECK_FCT(fd_fifo_post(fd_g_local, &msgptr) );
                                 return 0;
@@ -737 +719 @@
                         if (fd_g_config->cnf_flags.no_fwd) {
                                 /* We return an error */
-                                fd_hook_call(HOOK_MESSAGE_ROUTING_ERROR, msgptr, NULL, "Application unsupported", fd_msg_pmdl_get(msgptr));
                                 CHECK_FCT( return_error( &msgptr, "DIAMETER_APPLICATION_UNSUPPORTED", NULL, NULL) );
                                 return 0;
@@ -755 +736 @@
                 if ((!qry_src) && (!is_err)) {
                         /* The message is a normal answer to a request issued localy, we do not call the callbacks chain on it. */
-                        fd_hook_call(HOOK_MESSAGE_ROUTING_LOCAL, msgptr, NULL, NULL, fd_msg_pmdl_get(msgptr));
                         CHECK_FCT(fd_fifo_post(fd_g_local, &msgptr) );
                         return 0;
@@ -784 +764 @@
                         CHECK_FCT_DO( ret = (*rh->rt_fwd_cb)(rh->cbdata, &msgptr),
                                 {
-                                        char buf[256];
-                                        snprintf(buf, sizeof(buf), "A FWD routing callback returned an error: %s", strerror(ret));
-                                        fd_hook_call(HOOK_MESSAGE_ROUTING_ERROR, msgptr, NULL, buf, fd_msg_pmdl_get(msgptr));
-                                        fd_hook_call(HOOK_MESSAGE_DROPPED, msgptr, NULL, buf, fd_msg_pmdl_get(msgptr));
+                                        //fd_msg_log( FD_MSG_LOG_DROPPED, msgptr, "Internal error: a FWD routing callback returned an error (%s)", strerror(ret));
                                         fd_msg_free(msgptr);
                                         msgptr = NULL;
-                                        break;
                                 } );
                 }
@@ -804 +780 @@
         /* Now pass the message to the next step: either forward to another peer, or dispatch to local extensions */
         if (is_req || qry_src) {
-                fd_hook_call(HOOK_MESSAGE_ROUTING_FORWARD, msgptr, NULL, NULL, fd_msg_pmdl_get(msgptr));
                 CHECK_FCT(fd_fifo_post(fd_g_outgoing, &msgptr) );
         } else {
-                fd_hook_call(HOOK_MESSAGE_ROUTING_LOCAL, msgptr, NULL, NULL, fd_msg_pmdl_get(msgptr));
                 CHECK_FCT(fd_fifo_post(fd_g_local, &msgptr) );
         }
@@ -849 +823 @@
                 CHECK_FCT( fd_peer_getbyid( qry_src, qry_src_len, 0, (void *) &peer ) );
                 if (fd_peer_getstate(peer) != STATE_OPEN) {
-                        char buf[128];
-                        snprintf(buf, sizeof(buf), "Unable to forward answer to deleted / closed peer '%s'.", qry_src);
-                        fd_hook_call(HOOK_MESSAGE_ROUTING_ERROR, msgptr, NULL, buf, fd_msg_pmdl_get(msgptr));
-                        fd_hook_call(HOOK_MESSAGE_DROPPED, msgptr, NULL, buf, fd_msg_pmdl_get(msgptr));
+                        //fd_msg_log( FD_MSG_LOG_DROPPED, msgptr, "Unable to forward answer to deleted / closed peer '%s'.", qry_src);
                         fd_msg_free(msgptr);
                         return 0;
@@ -937 +908 @@
                         CHECK_FCT_DO( ret = (*rh->rt_out_cb)(rh->cbdata, msgptr, candidates),
                                 {
-                                        char buf[256];
-                                        snprintf(buf, sizeof(buf), "An OUT routing callback returned an error: %s", strerror(ret));
-                                        fd_hook_call(HOOK_MESSAGE_ROUTING_ERROR, msgptr, NULL, buf, fd_msg_pmdl_get(msgptr));
-                                        fd_hook_call(HOOK_MESSAGE_DROPPED, msgptr, NULL, buf, fd_msg_pmdl_get(msgptr));
+                                        //fd_msg_log( FD_MSG_LOG_DROPPED, msgptr, "Internal error: an OUT routing callback returned an error (%s)", strerror(ret));
                                         fd_msg_free(msgptr);
                                         msgptr = NULL;
@@ -988 +956 @@
         /* If the message has not been sent, return an error */
         if (msgptr) {
-                fd_hook_call(HOOK_MESSAGE_ROUTING_ERROR, msgptr, NULL, "No remaining suitable candidate to route the message to", fd_msg_pmdl_get(msgptr));
+                //fd_msg_log( FD_MSG_LOG_NODELIVER, msgptr, "No suitable candidate to route the message to." );
                 return_error( &msgptr, "DIAMETER_UNABLE_TO_DELIVER", "No suitable candidate to route the message to", NULL);
         }

libfdcore/server.c

@@ -94 +94 @@
 
 /* Dump all servers information */
-DECLARE_FD_DUMP_PROTOTYPE(fd_servers_dump, int details)
+DECLARE_FD_DUMP_PROTOTYPE(fd_servers_dump)
 {
         struct fd_list * li, *cli;
@@ -104 +104 @@
                 enum s_state st = get_status(s);
                 
-                if (details) {
-                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{server}(@%p)'%s': %s, %s, %s", s, fd_cnx_getid(s->conn), 
-                                        IPPROTO_NAME( s->proto ),
-                                        s->secur ? "Secur" : "NotSecur",
-                                        (st == NOT_CREATED) ? "Thread not created" :
-                                        ((st == RUNNING) ? "Thread running" :
-                                        ((st == TERMINATED) ? "Thread terminated" :
-                                                                  "Thread status unknown"))), return NULL);
-                        /* Dump the client list of this server */
-                        CHECK_POSIX_DO( pthread_mutex_lock(&s->clients_mtx), );
-                        for (cli = s->clients.next; cli != &s->clients; cli = cli->next) {
-                                struct client * c = (struct client *)cli;
-                                char bufts[128];
-                                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n  {client}(@%p)'%s': to:%s", c, fd_cnx_getid(c->conn), fd_log_time(&c->ts, bufts, sizeof(bufts))), break);
-                        }
-                        CHECK_POSIX_DO( pthread_mutex_unlock(&s->clients_mtx), );
-
-                        if (li->next != &FD_SERVERS) {
-                                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), return NULL);
-                        }
-                } else {
-                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "'%s'(%s,%s)  ", fd_cnx_getid(s->conn), 
-                                        IPPROTO_NAME( s->proto ), s->secur ? "Secur" : "NotSecur"), return NULL);
+                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{server}(@%p)'%s': %s, %s, %s", s, fd_cnx_getid(s->conn), 
+                                IPPROTO_NAME( s->proto ),
+                                s->secur ? "Secur" : "NotSecur",
+                                (st == NOT_CREATED) ? "Thread not created" :
+                                ((st == RUNNING) ? "Thread running" :
+                                ((st == TERMINATED) ? "Thread terminated" :
+                                                          "Thread status unknown"))), return NULL);
+                /* Dump the client list of this server */
+                CHECK_POSIX_DO( pthread_mutex_lock(&s->clients_mtx), );
+                for (cli = s->clients.next; cli != &s->clients; cli = cli->next) {
+                        struct client * c = (struct client *)cli;
+                        char bufts[128];
+                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n  {client}(@%p)'%s': to:%s", c, fd_cnx_getid(c->conn), fd_log_time(&c->ts, bufts, sizeof(bufts))), break);
+                }
+                CHECK_POSIX_DO( pthread_mutex_unlock(&s->clients_mtx), );
+                
+                if (li->next != &FD_SERVERS) {
+                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), return NULL);
                 }
         }
@@ -451 +446 @@
                 size_t len = 0, offset = 0;
                 CHECK_MALLOC_DO( fd_dump_extend( &buf, &len, &offset , "Local server address(es): "), );
-                CHECK_MALLOC_DO( fd_ep_dump(  &buf, &len, &offset, 0, 0, &fd_g_config->cnf_endpoints ), );
+                CHECK_MALLOC_DO( fd_ep_dump(  &buf, &len, &offset, 5, &fd_g_config->cnf_endpoints ), );
                 LOG_N("%s", buf ?: "Error dumping addresses");
                 free(buf);

libfdproto/dispatch.c

@@ -68 +68 @@
 /* Call CBs from a given list (any_handlers if cb_list is NULL) -- must have locked fd_disp_lock before */
 int fd_disp_call_cb_int( struct fd_list * cb_list, struct msg ** msg, struct avp *avp, struct session *sess, enum disp_action *action, 
-                        struct dict_object * obj_app, struct dict_object * obj_cmd, struct dict_object * obj_avp, struct dict_object * obj_enu,
-                        char ** drop_reason, struct msg ** drop_msg)
+                        struct dict_object * obj_app, struct dict_object * obj_cmd, struct dict_object * obj_avp, struct dict_object * obj_enu)
 {
         struct fd_list * senti, *li;
@@ -98 +97 @@
                 CHECK_FCT_DO( (r = (*hdl->cb)(msg, avp, sess, hdl->opaque, action)),
                         {
-                                *drop_reason = "Internal error: a DISPATCH callback returned an error";
-                                *drop_msg = *msg;
+                                //fd_msg_log( FD_MSG_LOG_DROPPED, *msg, "Internal error: a DISPATCH callback returned an error (%s)", strerror(r));
+                                fd_msg_free(*msg);
                                 *msg = NULL;
                         }

libfdproto/fdproto-internal.h

@@ -55 +55 @@
 DECLARE_FD_DUMP_PROTOTYPE(fd_dict_dump_avp_value, union avp_value *avp_value, struct dict_object * model, int indent, int header);
 int fd_disp_call_cb_int( struct fd_list * cb_list, struct msg ** msg, struct avp *avp, struct session *sess, enum disp_action *action, 
-                        struct dict_object * obj_app, struct dict_object * obj_cmd, struct dict_object * obj_avp, struct dict_object * obj_enu,
-                        char ** drop_reason, struct msg ** drop_msg);
+                        struct dict_object * obj_app, struct dict_object * obj_cmd, struct dict_object * obj_avp, struct dict_object * obj_enu);
 extern pthread_rwlock_t fd_disp_lock;
 

libfdproto/messages.c

@@ -2670 +2670 @@
 
 /* Call all dispatch callbacks for a given message */
-int fd_msg_dispatch ( struct msg ** msg, struct session * session, enum disp_action *action, char ** error_code, char ** drop_reason, struct msg ** drop_msg)
+int fd_msg_dispatch ( struct msg ** msg, struct session * session, enum disp_action *action, char ** error_code)
 {
         struct dictionary  * dict;
@@ -2684 +2684 @@
         if (error_code)
                 *error_code = NULL;
-        if (drop_reason)
-                *drop_reason = NULL;
         *action = DISP_ACT_CONT;
         
@@ -2693 +2691 @@
         
         /* First, call the DISP_HOW_ANY callbacks */
-        CHECK_FCT_DO( ret = fd_disp_call_cb_int( NULL, msg, NULL, session, action, NULL, NULL, NULL, NULL, drop_reason, drop_msg ), goto out );
+        CHECK_FCT_DO( ret = fd_disp_call_cb_int( NULL, msg, NULL, session, action, NULL, NULL, NULL, NULL ), goto out );
 
         TEST_ACTION_STOP();
@@ -2710 +2708 @@
                         *action = DISP_ACT_ERROR;
                 } else {
-                        *drop_reason = "Internal error: Received this answer to a local query with an unsupported application";
-                        *drop_msg = *msg;
+                        //fd_msg_log( FD_MSG_LOG_DROPPED, *msg, "Internal error: Received this answer to a local query with an unsupported application %d", (*msg)->msg_public.msg_appl);
+                        fd_msg_free(*msg);
                         *msg = NULL;
                 }
@@ -2742 +2740 @@
                         
                         /* Call the callbacks */
-                        CHECK_FCT_DO( ret = fd_disp_call_cb_int( cb_list, msg, avp, session, action, app, cmd, avp->avp_model, enumval, drop_reason, drop_msg ), goto out );
+                        CHECK_FCT_DO( ret = fd_disp_call_cb_int( cb_list, msg, avp, session, action, app, cmd, avp->avp_model, enumval ), goto out );
                         TEST_ACTION_STOP();
                 }
@@ -2751 +2749 @@
         /* Now call command and application callbacks */
         CHECK_FCT_DO( ret = fd_dict_disp_cb(DICT_COMMAND, cmd, &cb_list), goto out );
-        CHECK_FCT_DO( ret = fd_disp_call_cb_int( cb_list, msg, NULL, session, action, app, cmd, NULL, NULL, drop_reason, drop_msg ), goto out );
+        CHECK_FCT_DO( ret = fd_disp_call_cb_int( cb_list, msg, NULL, session, action, app, cmd, NULL, NULL ), goto out );
         TEST_ACTION_STOP();
         
         if (app) {
                 CHECK_FCT_DO( ret = fd_dict_disp_cb(DICT_APPLICATION, app, &cb_list), goto out );
-                CHECK_FCT_DO( ret = fd_disp_call_cb_int( cb_list, msg, NULL, session, action, app, cmd, NULL, NULL, drop_reason, drop_msg ), goto out );
+                CHECK_FCT_DO( ret = fd_disp_call_cb_int( cb_list, msg, NULL, session, action, app, cmd, NULL, NULL ), goto out );
                 TEST_ACTION_STOP();
         }

tests/testdisp.c

@@ -106 +106 @@
         struct dict_object * avp1, * avp2; /* avp2 is enumerated; they are both unsigned32 types */
         struct dict_object * enu1, * enu2;
-        struct msg * msg = NULL, *error;
+        struct msg * msg = NULL;
         enum disp_action action;
         struct disp_hdl * hdl[NB_CB];
         struct disp_when when;
-        char * ec, *em;
+        char * ec;
         
         /* First, initialize the daemon modules */
@@ -156 +156 @@
                 msg = new_msg( 0, cmd1, avp1, NULL, 0 );
                 memset(cbcalled, 0, sizeof(cbcalled));
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( DISP_ACT_CONT, action );
@@ -180 +180 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 0, cmd1, avp1, NULL, 0 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 0, cbcalled[1] );
@@ -191 +191 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 1, cmd1, avp1, NULL, 0 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -202 +202 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 2, cmd1, avp1, NULL, 0 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 0, cbcalled[1] );
@@ -236 +236 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 0, cmd1, avp1, NULL, 0 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -246 +246 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 2, cmd1, avp1, NULL, 0 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -256 +256 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 2, cmd2, avp1, NULL, 0 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 0, cbcalled[1] );
@@ -266 +266 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 1, cmd2, NULL, avp2, 0 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 0, cbcalled[1] );
@@ -316 +316 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 0, cmd1, NULL, NULL, 0 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 0, cbcalled[1] );
@@ -328 +328 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 0, cmd1, avp1, NULL, 0 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -340 +340 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 1, cmd2, avp1, NULL, 0 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -352 +352 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 1, cmd1, avp1, NULL, 0 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -364 +364 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 1, cmd1, avp1, avp2, 0 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -377 +377 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 1, cmd1, NULL, avp2, 1 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 0, cbcalled[1] );
@@ -390 +390 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 1, cmd1, NULL, avp2, 2 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 0, cbcalled[1] );
@@ -437 +437 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 0, cmd1, avp1, NULL, 0 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 0, cbcalled[1] );
@@ -447 +447 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 1, cmd2, avp1, avp2, 0 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 0, cbcalled[1] );
@@ -457 +457 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 1, cmd2, avp1, avp2, 1 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -467 +467 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 1, cmd2, avp1, avp2, 2 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 0, cbcalled[1] );
@@ -477 +477 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 1, cmd1, avp1, avp2, 1 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -495 +495 @@
                         CHECK( 0, fd_msg_avp_add ( msg, MSG_BRW_LAST_CHILD, avp ) );
                 }
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -519 +519 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 1, cmd1, avp1, avp2, 1 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -526 +526 @@
                 CHECK( 0, cbcalled[3] );
                 CHECK( 0, msg ? 1 : 0);
-                CHECK( 1, ec ? 1 : 0);
-                CHECK( 0, fd_msg_free( error ) );
                 
                 CHECK( 0, fd_disp_unregister( &hdl[0], NULL ) );
@@ -543 +541 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 1, cmd1, avp1, avp2, 1 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -550 +548 @@
                 CHECK( 0, cbcalled[3] );
                 CHECK( NULL, msg );
-                CHECK( NULL, ec );
                 
                 CHECK( 0, fd_disp_unregister( &hdl[0], NULL ) );
@@ -566 +563 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 1, cmd1, avp1, avp2, 1 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -597 +594 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 2, cmd2, avp1, avp2, 2 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -609 +606 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 2, cmd2, avp1, avp2, 2 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 0, cbcalled[1] );
@@ -622 +619 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 2, cmd2, avp1, avp2, 2 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -635 +632 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 2, cmd2, avp1, avp2, 2 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -648 +645 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 2, cmd2, avp1, avp2, 2 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -661 +658 @@
                 memset(cbcalled, 0, sizeof(cbcalled));
                 msg = new_msg( 2, cmd2, avp1, avp2, 2 );
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( 1, cbcalled[1] );
@@ -714 +711 @@
                 msg = new_msg( 0, cmd1, avp1, NULL, 0 );
                 memset(cbcalled, 0, sizeof(cbcalled));
-                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) );
+                CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );
                 CHECK( 1, cbcalled[0] );
                 CHECK( DISP_ACT_CONT, action );