Changeset 4373 for pjproject

Timestamp:

Feb 27, 2013 6:44:44 AM (12 years ago)

Author:

ming

Message:

Fixed #1626: Assertion when remote sends re-INVITE with less media

Included in the fix is sipp testing scenario.

Location:

pjproject/trunk

Files:

• pjsip/src/pjsua-lib/pjsua_media.c (modified) (3 diffs)
• tests/pjsua/scripts-sipp/uas-reinv-with-less-media.py (added)
• tests/pjsua/scripts-sipp/uas-reinv-with-less-media.xml (added)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1458 +1458 @@
  * by call media.
  */
-void pjsua_media_prov_clean_up(pjsua_call_id call_id)
+static void media_prov_clean_up(pjsua_call_id call_id, int idx)
 {
     pjsua_call *call = &pjsua_var.calls[call_id];
     unsigned i;
 
-    for (i = 0; i < call->med_prov_cnt; ++i) {
+    for (i = idx; i < call->med_prov_cnt; ++i) {
         pjsua_call_media *call_med = &call->media_prov[i];
         unsigned j;
@@ -1488 +1488 @@
         }
     }
+}
+
+void pjsua_media_prov_clean_up(pjsua_call_id call_id)
+{
+    media_prov_clean_up(call_id, 0);
 }
 
@@ -1903 +1908 @@
         if (rem_sdp && mi >= rem_sdp->media_count) {
             /* Remote might have removed some media lines. */
+            media_prov_clean_up(call->index, rem_sdp->media_count);
+            call->med_prov_cnt = rem_sdp->media_count;
             break;
         }