Changeset 376 for pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

Timestamp:

Apr 4, 2006 11:06:34 AM (18 years ago)

Author:

bennylp

Message:

Changed pjsip_dlg_send_request() API to NOT return transaction as it is not safe against race condition

File:

• pjproject/trunk/pjsip/src/pjsip/sip_dialog.c (modified) (5 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -932 +932 @@
 PJ_DEF(pj_status_t) pjsip_dlg_send_request( pjsip_dialog *dlg,
                                             pjsip_tx_data *tdata,
-                                            pjsip_transaction **p_tsx )
+                                            int mod_data_id,
+                                            void *mod_data)
 {
     pjsip_transaction *tsx;
@@ -979 +980 @@
         tsx->mod_data[dlg->ua->id] = dlg;
 
+        /* Copy optional caller's mod_data, if present */
+        if (mod_data_id >= 0 && mod_data_id < PJSIP_MAX_MODULE)
+            tsx->mod_data[mod_data_id] = mod_data;
+
         /* Increment transaction counter. */
         ++dlg->tsx_count;
@@ -989 +994 @@
         }
 
-        if (p_tsx)
-            *p_tsx = tsx;
-
     } else {
         status = pjsip_endpt_send_request_stateless(dlg->endpt, tdata, 
@@ -998 +1000 @@
             goto on_error;
 
-        if (p_tsx)
-            *p_tsx = NULL;
     }
 
@@ -1014 +1014 @@
     pjsip_tx_data_dec_ref( tdata );
 
-    if (p_tsx)
-        *p_tsx = NULL;
     return status;
 }