Changeset 1248:c9a160b815ea in freeDiameter

Timestamp:

Nov 23, 2013, 12:07:42 AM (10 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix issue with anscb in the p_sr expiry mechanism. Thanks Guangming for the report.

Files:

• include/freeDiameter/libfdproto.h (modified) (1 diff)
• libfdcore/p_sr.c (modified) (2 diffs)
• libfdproto/messages.c (modified) (1 diff)

include/freeDiameter/libfdproto.h

@@ -2489 +2489 @@
 int fd_msg_anscb_associate( struct msg * msg, void ( *anscb)(void *, struct msg **), void  * data, void (*expirecb)(void *, DiamId_t, size_t, struct msg **), const struct timespec *timeout );
 int fd_msg_anscb_get( struct msg * msg, void (**anscb)(void *, struct msg **), void (**expirecb)(void *, DiamId_t, size_t, struct msg **), void ** data );
+int fd_msg_anscb_reset(struct msg * msg, int clear_anscb, int clear_expirecb);
 struct timespec *fd_msg_anscb_gettimeout( struct msg * msg ); /* returns NULL or a valid non-0 timespec */
 

libfdcore/p_sr.c

@@ -117 +117 @@
                 struct fd_peer * sentto;
                 void (*expirecb)(void *, DiamId_t, size_t, struct msg **);
-                void (*anscb)(void *, struct msg **);
                 void * data;
                 int no_error;
@@ -177 +176 @@
                 
                 /* Retrieve callback in the message */
-                CHECK_FCT_DO( fd_msg_anscb_get( request, &anscb, &expirecb, &data ), break);
+                CHECK_FCT_DO( fd_msg_anscb_get( request, NULL, &expirecb, &data ), break);
                 ASSERT(expirecb);
         
                 /* Clean up this expirecb from the message */
-                CHECK_FCT_DO( fd_msg_anscb_associate( request, anscb, data, NULL, NULL ), break);
+                CHECK_FCT_DO( fd_msg_anscb_reset( request, 0, 1 ), break);
 
                 /* Call it */

libfdproto/messages.c

@@ -1267 +1267 @@
         
         return 0;
-}       
+}
+
+/* Remove a callback */
+int fd_msg_anscb_reset(struct msg * msg, int clear_anscb, int clear_expirecb) 
+{
+        TRACE_ENTRY("%p %d %d", msg, clear_anscb, clear_expirecb);
+        
+        /* Check the parameters */
+        CHECK_PARAMS( CHECK_MSG(msg) );
+        
+        if (clear_anscb) {
+                msg->msg_cb.anscb = NULL;
+                msg->msg_cb.data = NULL;
+        }
+        if (clear_expirecb) {
+                msg->msg_cb.expirecb = NULL;
+                memset(&msg->msg_cb.timeout, 0, sizeof(struct timespec));
+        }
+        
+        return 0;
+}
+
 
 int fd_msg_anscb_get( struct msg * msg, void (**anscb)(void *, struct msg **), void (**expirecb)(void *, DiamId_t, size_t, struct msg **), void ** data )