Changeset 3990

Timestamp:

Mar 28, 2012 9:05:34 AM (11 years ago)

Author:

bennylp

Message:

Misc (re #1446): prevent on_call_state() callback from being called before on_incoming_call() callback is called

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (4 diffs)

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

@@ -1205 +1205 @@
     }
 
-    /* Create and attach pjsua_var data to the dialog: */
+    /* Create and attach pjsua_var data to the dialog */
     call->inv = inv;
-    dlg->mod_data[pjsua_var.mod.id] = call;
-    inv->mod_data[pjsua_var.mod.id] = call;
 
     /* Store variables required for the callback after the async
@@ -1283 +1281 @@
      * callback is called, which is not right).
      */
-    status = pjsip_inv_initial_answer(inv, rdata, 
+    status = pjsip_inv_initial_answer(inv, rdata,
                                       100, NULL, NULL, &response);
     if (status != PJ_SUCCESS) {
@@ -1293 +1291 @@
         } else {
             pjsip_inv_send_msg(inv, response);
-            pjsip_inv_terminate(inv, response->msg->line.status.code, 
+            pjsip_inv_terminate(inv, response->msg->line.status.code,
                                 PJ_FALSE);
         }
@@ -1306 +1304 @@
         }
     }
+
+    /* Only do this after sending 100/Trying (really! see the long comment
+     * above)
+     */
+    dlg->mod_data[pjsua_var.mod.id] = call;
+    inv->mod_data[pjsua_var.mod.id] = call;
 
     ++pjsua_var.call_cnt;