Changeset 226

Timestamp:

Feb 23, 2006 6:03:29 PM (18 years ago)

Author:

bennylp

Message:

Fixed crashed bugs when session dissapers while pjsua is waiting for keyboard in

Location:

pjproject/trunk/pjsip/src/pjsua

Files:

• main.c (modified) (3 diffs)
• pjsua_inv.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsua/main.c

@@ -345 +345 @@
                     continue;
 
+                /*
+                 * Must check again!
+                 * Call may have been disconnected while we're waiting for 
+                 * keyboard input.
+                 */
+                if (inv_session == &pjsua.inv_list) {
+                    puts("Call has been disconnected");
+                    fflush(stdout);
+                    continue;
+                }
+
                 status = pjsip_inv_answer(inv_session->inv, atoi(buf), 
                                           NULL, NULL, &tdata);
@@ -440 +451 @@
 
             } else {
+                struct pjsua_inv_data *cur = inv_session;
+
                 ui_input_url("Transfer to URL", buf, sizeof(buf), &result);
+
+                /* Check if call is still there. */
+
+                if (cur != inv_session) {
+                    puts("Call has been disconnected");
+                    continue;
+                }
+
                 if (result.nb_result != NO_NB) {
                     if (result.nb_result == -1) 
@@ -468 +489 @@
             } else {
                 pj_str_t digits;
+                struct pjsua_inv_data *cur = inv_session;
                 pj_status_t status;
 
                 if (!simple_input("DTMF strings to send (0-9*#A-B)", buf, 
                                   sizeof(buf)))
+                {
                         break;
+                }
+
+                if (cur != inv_session) {
+                    puts("Call has been disconnected");
+                    continue;
+                }
 
                 digits = pj_str(buf);

pjproject/trunk/pjsip/src/pjsua/pjsua_inv.c

@@ -122 +122 @@
 
 
+    /* Add invite session to the list. */
+    
+    pj_list_push_back(&pjsua.inv_list, inv_data);
+
+
     /* Send initial INVITE: */
 
     status = pjsip_inv_send_msg(inv, tdata, NULL);
     if (status != PJ_SUCCESS) {
+        /*
+         * Note:
+         *  inv_data will be removed from the list in the callback
+         */
         pjsua_perror(THIS_FILE, "Unable to send initial INVITE request", 
                      status);
         goto on_error;
     }
-
-    /* Add invite session to the list. */
-    
-    pj_list_push_back(&pjsua.inv_list, inv_data);