Changeset 3481 for pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

Timestamp:

Mar 23, 2011 11:46:17 AM (14 years ago)

Author:

bennylp

Message:

Fix #1222: Assertion if BYE is received while callee is still in early state

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -3693 +3693 @@
         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);
+        if (inv->invite_tsx->role == PJSIP_ROLE_UAC) {
+            /* 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);
+        } else if (inv->invite_tsx->status_code < 200) {
+            pjsip_tx_data *tdata;
+            pjsip_msg *msg;
+
+            /* For UAS, send a final response. */
+            tdata = inv->invite_tsx->last_tx;
+            PJ_ASSERT_ON_FAIL(tdata != NULL, return);
+
+            msg = tdata->msg;
+            msg->line.status.code = PJSIP_SC_REQUEST_TERMINATED;
+            msg->line.status.reason =
+                    *pjsip_get_status_text(PJSIP_SC_REQUEST_TERMINATED);
+            msg->body = NULL;
+
+            pjsip_tx_data_invalidate_msg(tdata);
+            pjsip_tx_data_add_ref(tdata);
+
+            pjsip_dlg_send_response(inv->dlg, inv->invite_tsx, tdata);
+        }
     }
 }