Changeset 4936 for pjproject

Timestamp:

Oct 1, 2014 6:45:02 AM (10 years ago)

Author:

ming

Message:

Fixed #1795: Assertion if ending 100rel session when invite on early state

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_100rel.c (modified) (3 diffs)

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

@@ -376 +376 @@
 
 
+/* Clear all responses in the transmission list */
+static void clear_all_responses(dlg_data *dd)
+{
+    tx_data_list_t *tl;
+
+    tl = dd->uas_state->tx_data_list.next;
+    while (tl != &dd->uas_state->tx_data_list) {
+        pjsip_tx_data_dec_ref(tl->tdata);
+        tl = tl->next;
+    }
+    pj_list_init(&dd->uas_state->tx_data_list);
+}
+
 /*
  * Notify 100rel module that the invite session has been disconnected.
@@ -389 +402 @@
     /* Make sure we don't have pending transmission */
     if (dd->uas_state) {
-        pj_assert(!dd->uas_state->retransmit_timer.id);
-        pj_assert(pj_list_empty(&dd->uas_state->tx_data_list));
+       /* Cancel the retransmit timer */
+        if (dd->uas_state->retransmit_timer.id) {
+            pjsip_endpt_cancel_timer(dd->inv->dlg->endpt,
+                                     &dd->uas_state->retransmit_timer);
+            dd->uas_state->retransmit_timer.id = PJ_FALSE;
+        }
+        if (!pj_list_empty(&dd->uas_state->tx_data_list)) {
+            /* Clear all pending responses (drop 'em) */
+            clear_all_responses(dd);
+        }
     }
 
@@ -425 +446 @@
         p_method->slen = 0;
     }
-}
-
-/* Clear all responses in the transmission list */
-static void clear_all_responses(dlg_data *dd)
-{
-    tx_data_list_t *tl;
-
-    tl = dd->uas_state->tx_data_list.next;
-    while (tl != &dd->uas_state->tx_data_list) {
-        pjsip_tx_data_dec_ref(tl->tdata);
-        tl = tl->next;
-    }
-    pj_list_init(&dd->uas_state->tx_data_list);
 }