Changeset 2800 for pjproject

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

Location:

pjproject/branches/1.0

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (2 diffs)
• pjsip/src/pjsip-ua/sip_inv.c (modified) (1 diff)
• tests/pjsua/scripts-sipp/uas-early-bye.xml (copied) (copied from pjproject/trunk/tests/pjsua/scripts-sipp/uas-early-bye.xml)
• tests/pjsua/scripts-sipp/uas-forked-200.xml (copied) (copied from pjproject/trunk/tests/pjsua/scripts-sipp/uas-forked-200.xml)

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;
 

pjproject/branches/1.0/pjsip/src/pjsip-ua/sip_inv.c

@@ -3360 +3360 @@
         /* Generic handling for UAC tsx completion */
         handle_uac_tsx_response(inv, e);
+
+    } else if (tsx->role == PJSIP_ROLE_UAS &&
+               tsx->method.id == PJSIP_BYE_METHOD &&
+               tsx->status_code < 200 &&
+               e->body.tsx_state.type == PJSIP_EVENT_RX_MSG)
+    {
+        /* Received BYE before the 2xx/OK response to INVITE.
+         * Assume that the 2xx/OK response is lost and the BYE
+         * arrives earlier.
+         */
+        inv_respond_incoming_bye(inv, tsx, e->body.tsx_state.src.rdata, e);
+
+        /* Set timer just in case we will never get the final response
+         * for INVITE.
+         */
+        pjsip_tsx_set_timeout(inv->invite_tsx, 64*pjsip_cfg()->tsx.t1);
     }
 }