Changeset 2800 for pjproject/branches/1.0/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Jun 25, 2009 11:17:17 AM (15 years ago)

Author:

bennylp

Message:

Ticket #799: UAC disconnect call when receiving BYE in early state (thanks Gang Liu for the suggestion)

• backported changes from #798

File:

• pjproject/branches/1.0/pjsip-apps/src/pjsua/pjsua_app.c (modified) (2 diffs)

pjproject/branches/1.0/pjsip-apps/src/pjsua/pjsua_app.c

@@ -3760 +3760 @@
             if (result.nb_result != NO_NB) {
 
-                if (result.nb_result == -1 || result.nb_result == 0) {
+                if (result.nb_result == -1) {
                     puts("Sorry you can't do that!");
                     continue;
+                } else if (result.nb_result == 0) {
+                    uri = NULL;
+                    if (current_call == PJSUA_INVALID_ID) {
+                        puts("No current call");
+                        continue;
+                    }
                 } else {
                     pjsua_buddy_info binfo;
@@ -3773 +3779 @@
             }
             
-            tmp = pj_str(uri);
-
-            send_request(text, &tmp);
+            if (uri) {
+                tmp = pj_str(uri);
+                send_request(text, &tmp);
+            } else {
+                /* If you send call control request using this method
+                 * (such requests includes BYE, CANCEL, etc.), it will
+                 * not go well with the call state, so don't do it
+                 * unless it's for testing.
+                 */
+                pj_str_t method = pj_str(text);
+                pjsua_call_send_request(current_call, &method, NULL);
+            }
             break;