Changeset 1014:908ffbb81f60 in freeDiameter for libfdcore/p_sr.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/p_sr.c (modified) (4 diffs)

libfdcore/p_sr.c

@@ -85 +85 @@
 }
 
+struct expire_data {
+        struct msg * request;
+        struct fd_peer * sentto;
+};
+
 /* (detached) thread that calls the anscb on expired messages. 
   We do it in a separate thread to avoid blocking the reception of new messages during this time */
-static void * call_anscb_expire(void * arg) {
-        struct msg * expired_req = arg;
-        
-        void (*anscb)(void *, struct msg **);
+static void * call_expirecb(void * arg) {
+        struct expire_data * ed = arg;
+        
+        void (*expirecb)(void *, DiamId_t, size_t, struct msg **);
         void * data;
         
@@ -103 +108 @@
         
         /* Retrieve callback in the message */
-        CHECK_FCT_DO( fd_msg_anscb_get( expired_req, &anscb, &data ), return NULL);
-        ASSERT(anscb);
+        CHECK_FCT_DO( fd_msg_anscb_get( ed->request, NULL, &expirecb, &data ), return NULL);
+        ASSERT(expirecb);
         
         /* Clean up this data from the message */
-        CHECK_FCT_DO( fd_msg_anscb_associate( expired_req, NULL, NULL, NULL ), return NULL);
+        CHECK_FCT_DO( fd_msg_anscb_associate( ed->request, NULL, NULL, NULL, NULL ), return NULL);
 
         /* Call it */
-        (*anscb)(data, &expired_req);
+        (*expirecb)(data, ed->sentto->p_hdr.info.pi_diamid, ed->sentto->p_hdr.info.pi_diamidlen, &ed->request);
         
         /* If the callback did not dispose of the message, do it now */
-        if (expired_req) {
-                fd_msg_log(FD_MSG_LOG_DROPPED, expired_req, "Expiration period completed without an answer, and the expiry callback did not dispose of the message.");
-                CHECK_FCT_DO( fd_msg_free(expired_req), /* ignore */ );
-        }
+        if (ed->request) {
+                fd_msg_log(FD_MSG_LOG_DROPPED, ed->request, "Expiration period completed without an answer, and the expiry callback did not dispose of the message.");
+                CHECK_FCT_DO( fd_msg_free(ed->request), /* ignore */ );
+        }
+        
+        free(ed);
         
         /* Finish */
@@ -125 +132 @@
 static void * sr_expiry_th(void * arg) {
         struct sr_list * srlist = arg;
-        struct msg * expired_req;
         pthread_attr_t detached;
+        struct expire_data * ed;
         
         TRACE_ENTRY("%p", arg);
@@ -177 +184 @@
                 
                 /* Now, the first request in the list is expired; remove it and call the anscb for it in a new thread */
+                CHECK_MALLOC_DO( ed = malloc(sizeof(struct expire_data)), goto error );
+                ed->sentto = first->chain.head->o;
+                ed->request = first->req;
                 fd_list_unlink(&first->chain);
                 fd_list_unlink(&first->expire);
-                expired_req = first->req;
                 free(first);
                 
-                CHECK_POSIX_DO( pthread_create( &th, &detached, call_anscb_expire, expired_req ), goto error );
+                CHECK_POSIX_DO( pthread_create( &th, &detached, call_expirecb, ed ), goto error );
 
                 /* loop */