Changeset 1014:908ffbb81f60 in freeDiameter for libfdcore/messages.c

Timestamp:

Mar 29, 2013, 6:30:59 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation

File:

• libfdcore/messages.c (modified) (2 diffs)

libfdcore/messages.c

@@ -321 +321 @@
         
         /* Save the callback in the message */
-        CHECK_FCT(  fd_msg_anscb_associate( *pmsg, anscb, data, NULL /* we should maybe use a safeguard here like 1 hour or so? */ )  );
+        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 */
@@ -330 +330 @@
 
 /* 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, const struct timespec *timeout )
-{
-        TRACE_ENTRY("%p %p %p", pmsg, anscb, data, timeout);
-        CHECK_PARAMS( pmsg && anscb && timeout );
+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, timeout )  );
+        CHECK_FCT(  fd_msg_anscb_associate( *pmsg, anscb, data, expirecb, timeout )  );
         
         /* Post the message in the outgoing queue */