Changeset 1212:c38bb8b69c43 in freeDiameter

Timestamp:

Jun 17, 2013, 7:19:53 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix message rtd handling for extensions based on this data

Files:

• extensions/dbg_interactive/messages.i (modified) (1 diff)
• include/freeDiameter/libfdproto.h (modified) (1 diff)
• libfdcore/routing_dispatch.c (modified) (2 diffs)
• libfdproto/messages.c (modified) (3 diffs)

extensions/dbg_interactive/messages.i

@@ -342 +342 @@
         void set_rtd(struct rt_data *DISOWN) {
                 struct rt_data * r = DISOWN;
-                int ret = fd_msg_rt_associate($self, &r);
+                int ret = fd_msg_rt_associate($self, r);
                 if (ret != 0) {
                         DI_ERROR(ret, NULL, NULL);

include/freeDiameter/libfdproto.h

@@ -2502 +2502 @@
  *  EINVAL: a parameter is invalid
  */
-int fd_msg_rt_associate( struct msg * msg, struct rt_data ** rtd );
+int fd_msg_rt_associate( struct msg * msg, struct rt_data * rtd );
 int fd_msg_rt_get      ( struct msg * msg, struct rt_data ** rtd );
 

libfdcore/routing_dispatch.c

@@ -943 +943 @@
                         CHECK_FCT(  fd_msg_browse(avp, MSG_BRW_NEXT, &avp, NULL)  );
                 }
+                
+                /* Save the routing information in the message */
+                CHECK_FCT( fd_msg_rt_associate ( msgptr, rtd ) );
         }
 
@@ -985 +988 @@
         /* Order the candidate peers by score attributed by the callbacks */
         CHECK_FCT( fd_rtd_candidate_reorder(candidates) );
-
-        /* Save the routing information in the message */
-        CHECK_FCT( fd_msg_rt_associate ( msgptr, &rtd ) );
 
         /* Now try sending the message */

libfdproto/messages.c

@@ -1298 +1298 @@
 
 /* Associate routing lists */
-int fd_msg_rt_associate( struct msg * msg, struct rt_data ** rtd )
+int fd_msg_rt_associate( struct msg * msg, struct rt_data * rtd )
 {
         TRACE_ENTRY( "%p %p", msg, rtd );
@@ -1304 +1304 @@
         CHECK_PARAMS(  CHECK_MSG(msg) && rtd  );
         
-        msg->msg_rtdata = *rtd;
-        *rtd = NULL;
+        msg->msg_rtdata = rtd;
         
         return 0;
@@ -1317 +1316 @@
         
         *rtd = msg->msg_rtdata;
-        msg->msg_rtdata = NULL;
         
         return 0;