Changeset 646:cfc8da9264f4 in freeDiameter

Timestamp:

Jan 4, 2011, 4:20:50 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Prepared first part of the changes for #10

Files:

• freeDiameter/messages.c (modified) (2 diffs)
• include/freeDiameter/freeDiameter.h (modified) (3 diffs)
• include/freeDiameter/libfreeDiameter.h (modified) (2 diffs)
• libfreeDiameter/messages.c (modified) (3 diffs)

freeDiameter/messages.c

@@ -269 +269 @@
         /* Save the callback in the message */
         if (anscb) {
-                CHECK_FCT(  fd_msg_anscb_associate( *pmsg, anscb, data )  );
+                CHECK_FCT(  fd_msg_anscb_associate( *pmsg, anscb, data, NULL /* we should maybe use a safeguard here like 1 hour or so? */ )  );
         }
         
@@ -277 +277 @@
         return 0;
 }
+
+/* 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 );
+        
+        /* Save the callback in the message, with the timeout */
+        CHECK_FCT(  fd_msg_anscb_associate( *pmsg, anscb, data, timeout )  );
+        
+        /* Post the message in the outgoing queue */
+        CHECK_FCT( fd_fifo_post(fd_g_outgoing, pmsg) );
+        
+        return 0;
+}
+
 
 /* Parse a message against our dictionary, and in case of error log and eventually build the error reply -- returns the parsing status */

include/freeDiameter/freeDiameter.h

@@ -371 +371 @@
 
 /*
- * FUNCTION:    fd_msg_send
+ * FUNCTION:    fd_msg_send, fd_msg_send_timeout  
  *
  * PARAMETERS:
  *  pmsg        : Location of the message to be sent on the network (set to NULL on function return to avoid double deletion).
- *  anscb       : A callback to be called when answer is received, if msg is a request (optional)
+ *  anscb       : A callback to be called when answer is received, if msg is a request (optional for fd_msg_send)
  *  anscb_data  : opaque data to be passed back to the anscb when it is called.
+ *  timeout     : (only for fd_msg_send_timeout) sets the absolute time until when to wait for an answer. Past this time,
+ *                the anscb is called with the request as parameter and the answer will be discarded when received.
  *
  * DESCRIPTION: 
@@ -399 +401 @@
  * If no callback is registered to handle an answer, the message is discarded and an error is logged.
  *
+ *  fd_msg_send_timeout is similar to fd_msg_send, except that it takes an additional argument "timeout" and can be called
+ * only with requests as parameters, and an anscb callback.
+ * If the matching answer or error is received before the timeout date passes, everything occurs as with fd_msg_send. Otherwise,
+ * the request is removed from the queue (meaning the matching answer will be discarded upon reception) and passed to the answcb 
+ * function. This function can easily distinguish between timeout case and answer case by checking if the message received is 
+ * a request. Upon return, if the *msg parameter is not NULL, it is freed (not passed to other callbacks).
+ *
  * RETURN VALUE:
  *  0           : The message has been queued for sending (sending may fail asynchronously).
@@ -405 +414 @@
  */
 int fd_msg_send ( struct msg ** pmsg, void (*anscb)(void *, struct msg **), void * data );
+int fd_msg_send_timeout ( struct msg ** pmsg, void (*anscb)(void *, struct msg **), void * data, const struct timespec *timeout );
 
 /*

include/freeDiameter/libfreeDiameter.h

@@ -2135 +2135 @@
  *  anscb       : the callback to associate with the message
  *  data        : the data to pass to the callback
+ *  timeout     : (optional, use NULL if no timeout) a timeout associated with calling the cb.
  *
  * DESCRIPTION:
@@ -2144 +2145 @@
  *  EINVAL: a parameter is invalid
  */
-int fd_msg_anscb_associate( struct msg * msg, void ( *anscb)(void *, struct msg **), void  * data );
+int fd_msg_anscb_associate( struct msg * msg, void ( *anscb)(void *, struct msg **), void  * data, const struct timespec *timeout );
 int fd_msg_anscb_get      ( struct msg * msg, void (**anscb)(void *, struct msg **), void ** data );
 

libfreeDiameter/messages.c

@@ -124 +124 @@
                         void (*fct)(void *, struct msg **);
                         void * data;
+                        struct timespec timeout;
                 }                msg_cb;                /* Callback to be called when an answer is received, if not NULL */
         char *                   msg_src_id;            /* Diameter Id of the peer this message was received from. This string is malloc'd and must be freed */
@@ -904 +905 @@
 
 /* Associate / get answer callbacks */
-int fd_msg_anscb_associate( struct msg * msg, void ( *anscb)(void *, struct msg **), void  * data )
+int fd_msg_anscb_associate( struct msg * msg, void ( *anscb)(void *, struct msg **), void  * data, const struct timespec *timeout )
 {
         TRACE_ENTRY("%p %p %p", msg, anscb, data);
@@ -916 +917 @@
         msg->msg_cb.fct = anscb;
         msg->msg_cb.data = data;
+        if (timeout) {
+                memcpy(&msg->msg_cb.timeout, timeout, sizeof(struct timespec));
+        } else {
+                memset(&msg->msg_cb.timeout, 0, sizeof(struct timespec)); /* clear the area */
+        }
         
         return 0;