Changeset 1216:581bbd48524a in freeDiameter for libfdcore

Timestamp:

Jun 19, 2013, 11:03:24 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Children:

1217:3f7c74ef3787, 1218:152466ff49f8

Phase:

public

Message:

Change prototype of rt_out callbacks to allow disposal of messages

File:

• libfdcore/routing_dispatch.c (modified) (7 diffs)

libfdcore/routing_dispatch.c

@@ -58 +58 @@
         union {
                 int (*rt_fwd_cb)(void * cbdata, struct msg ** msg);
-                int (*rt_out_cb)(void * cbdata, struct msg * msg, struct fd_list * candidates);
+                int (*rt_out_cb)(void * cbdata, struct msg ** msg, struct fd_list * candidates);
         };
 };      
@@ -135 +135 @@
 
 /* Register a new OUT callback */
-int fd_rt_out_register ( int (*rt_out_cb)(void * cbdata, struct msg * msg, struct fd_list * candidates), void * cbdata, int priority, struct fd_rt_out_hdl ** handler )
+int fd_rt_out_register ( int (*rt_out_cb)(void * cbdata, struct msg ** pmsg, struct fd_list * candidates), void * cbdata, int priority, struct fd_rt_out_hdl ** handler )
 {
         struct rt_hdl * new;
@@ -189 +189 @@
 
 /* Prevent sending to peers that do not support the message application */
-static int dont_send_if_no_common_app(void * cbdata, struct msg * msg, struct fd_list * candidates)
-{
+static int dont_send_if_no_common_app(void * cbdata, struct msg ** pmsg, struct fd_list * candidates)
+{
+        struct msg * msg = *pmsg;
         struct fd_list * li;
         struct msg_hdr * hdr;
@@ -221 +222 @@
 
 /* Detect if the Destination-Host and Destination-Realm match the peer */
-static int score_destination_avp(void * cbdata, struct msg * msg, struct fd_list * candidates)
-{
+static int score_destination_avp(void * cbdata, struct msg ** pmsg, struct fd_list * candidates)
+{
+        struct msg * msg = *pmsg;
         struct fd_list * li;
         struct avp * avp;
@@ -959 +961 @@
 
                 /* We call the cb by reverse priority order */
-                for (   li = rt_out_list.prev ; li != &rt_out_list ; li = li->prev ) {
+                for (   li = rt_out_list.prev ; (msgptr != NULL) && (li != &rt_out_list) ; li = li->prev ) {
                         struct rt_hdl * rh = (struct rt_hdl *)li;
 
                         TRACE_DEBUG(ANNOYING, "Calling next OUT callback on %p : %p (prio %d)", msgptr, rh->rt_out_cb, rh->prio);
-                        CHECK_FCT_DO( ret = (*rh->rt_out_cb)(rh->cbdata, msgptr, candidates),
+                        CHECK_FCT_DO( ret = (*rh->rt_out_cb)(rh->cbdata, &msgptr, candidates),
                                 {
                                         char buf[256];
@@ -971 +973 @@
                                         fd_msg_free(msgptr);
                                         msgptr = NULL;
-                                        break;
                                 } );
                 }
@@ -978 +979 @@
                 CHECK_FCT( pthread_rwlock_unlock( &rt_out_lock ) );
 
-                /* If an error occurred, skip to the next message */
+                /* If an error occurred or the callback disposed of the message, go to next message */
                 if (! msgptr) {
-                        if (rtd)
-                                fd_rtd_free(&rtd);
                         return 0;
                 }