Changeset 376 for pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.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-ua/sip_inv.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -177 +177 @@
     }
 
-    status = pjsip_dlg_send_request(inv->dlg, tdata, NULL);
+    status = pjsip_dlg_send_request(inv->dlg, tdata, -1, NULL);
     if (status != PJ_SUCCESS) {
         /* Better luck next time */
@@ -1581 +1581 @@
 
     if (tdata->msg->type == PJSIP_REQUEST_MSG) {
-        pjsip_transaction *tsx;
         struct tsx_inv_data *tsx_inv_data;
 
-        status = pjsip_dlg_send_request(inv->dlg, tdata, &tsx);
+        pjsip_dlg_inc_lock(inv->dlg);
+
+        tsx_inv_data = pj_pool_zalloc(inv->pool, sizeof(struct tsx_inv_data));
+        tsx_inv_data->inv = inv;
+
+        pjsip_dlg_dec_lock(inv->dlg);
+
+        status = pjsip_dlg_send_request(inv->dlg, tdata, mod_inv.mod.id, 
+                                        tsx_inv_data);
         if (status != PJ_SUCCESS)
             return status;
-
-        tsx_inv_data = pj_pool_zalloc(tsx->pool, sizeof(struct tsx_inv_data));
-        tsx_inv_data->inv = inv;
-
-        tsx->mod_data[mod_inv.mod.id] = tsx_inv_data;
 
     } else {