Changeset 4373


Ignore:
Timestamp:
Feb 27, 2013 6:44:44 AM (6 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:
2 added
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

    r4363 r4373  
    14581458 * by call media. 
    14591459 */ 
    1460 void pjsua_media_prov_clean_up(pjsua_call_id call_id) 
     1460static void media_prov_clean_up(pjsua_call_id call_id, int idx) 
    14611461{ 
    14621462    pjsua_call *call = &pjsua_var.calls[call_id]; 
    14631463    unsigned i; 
    14641464 
    1465     for (i = 0; i < call->med_prov_cnt; ++i) { 
     1465    for (i = idx; i < call->med_prov_cnt; ++i) { 
    14661466        pjsua_call_media *call_med = &call->media_prov[i]; 
    14671467        unsigned j; 
     
    14881488        } 
    14891489    } 
     1490} 
     1491 
     1492void pjsua_media_prov_clean_up(pjsua_call_id call_id) 
     1493{ 
     1494    media_prov_clean_up(call_id, 0); 
    14901495} 
    14911496 
     
    19031908        if (rem_sdp && mi >= rem_sdp->media_count) { 
    19041909            /* Remote might have removed some media lines. */ 
     1910            media_prov_clean_up(call->index, rem_sdp->media_count); 
     1911            call->med_prov_cnt = rem_sdp->media_count; 
    19051912            break; 
    19061913        } 
Note: See TracChangeset for help on using the changeset viewer.