Changeset 1201:d2608e47db28 in freeDiameter for libfdcore

Timestamp:

Jun 14, 2013, 1:19:32 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix issue that can trigger an assert when failover occurs

File:

• libfdcore/peers.c (modified) (1 diff)

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_noblock(fd_g_outgoing, (void *)&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));
-                                CHECK_FCT_DO(fd_msg_free(m), /* What can we do more? */)
-                        } );
+                /* but only if they are routable */
+                if (fd_msg_is_routable(m)) {
+                        fd_hook_call(HOOK_MESSAGE_FAILOVER, m, peer, NULL, fd_msg_pmdl_get(m));
+                        CHECK_FCT_DO(fd_fifo_post_noblock(fd_g_outgoing, (void *)&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));
+                                        CHECK_FCT_DO(fd_msg_free(m), /* What can we do more? */)
+                                } );
+                } else {
+                        /* Just free it */
+                        /* fd_hook_call(HOOK_MESSAGE_DROPPED, m, NULL, "Non-routable message freed during handover", fd_msg_pmdl_get(m)); */
+                        CHECK_FCT_DO(fd_msg_free(m), /* What can we do more? */)
+                }
         }