Changeset 376 for pjproject/trunk

Timestamp:

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

Author:

bennylp

Message:

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

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_dialog.h (modified) (2 diffs)
• src/pjsip-simple/evsub.c (modified) (3 diffs)
• src/pjsip-ua/sip_inv.c (modified) (2 diffs)
• src/pjsip/sip_dialog.c (modified) (5 diffs)
• src/pjsua-lib/pjsua_call.c (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_dialog.h

@@ -409 +409 @@
  * @param dlg               The dialog.
  * @param tdata             The request message to be sent.
- * @param p_tsx             Optional argument to receive the transaction 
- *                          instance used to send the request.
+ * @param mod_data_id       Optional module data index to put an optional data
+ *                          into the transaction. If no module data is to be
+ *                          attached, this value should be -1.
+ * @param mod_data          Optional module data to be attached to the 
+ *                          transaction at mod_data_id index.
  *
  * @return                  PJ_SUCCESS on success.
@@ -416 +419 @@
 PJ_DECL(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);
 
 

pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

@@ -1149 +1149 @@
 
     /* Send the request. */
-    status = pjsip_dlg_send_request(sub->dlg, tdata, NULL);
+    status = pjsip_dlg_send_request(sub->dlg, tdata, -1, NULL);
     if (status != PJ_SUCCESS)
         goto on_return;
@@ -1483 +1483 @@
                                                tsx->last_tx, &tdata);
             if (status == PJ_SUCCESS) 
-                status = pjsip_dlg_send_request(sub->dlg, tdata, NULL);
+                status = pjsip_dlg_send_request(sub->dlg, tdata, -1, NULL);
             
             if (status != PJ_SUCCESS) {
@@ -1870 +1870 @@
                                                 tsx->last_tx, &tdata);
             if (status == PJ_SUCCESS)
-                status = pjsip_dlg_send_request( sub->dlg, tdata, NULL );
+                status = pjsip_dlg_send_request( sub->dlg, tdata, -1, NULL );
 
             if (status != PJ_SUCCESS) {

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 {

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;
 }

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -1331 +1331 @@
 
     /* Send the request. */
-    status = pjsip_dlg_send_request( call->inv->dlg, tdata, NULL);
+    status = pjsip_dlg_send_request( call->inv->dlg, tdata, -1, NULL);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to send MESSAGE request", status);
@@ -1374 +1374 @@
 
     /* Send the request. */
-    status = pjsip_dlg_send_request( call->inv->dlg, tdata, NULL);
+    status = pjsip_dlg_send_request( call->inv->dlg, tdata, -1, NULL);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to send MESSAGE request", status);