Changeset 1133


Ignore:
Timestamp:
Apr 2, 2007 7:27:54 PM (13 years ago)
Author:
bennylp
Message:

Fixed hold/re-INVITE bug when ICE is used

Location:
pjproject/trunk/pjsip/src/pjsua-lib
Files:
2 edited

Legend:

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

    r1112 r1133  
    12151215    if (call->inv->state != PJSIP_INV_STATE_CONFIRMED) { 
    12161216        PJ_LOG(3,(THIS_FILE, "Can not re-INVITE call that is not confirmed")); 
     1217        pjsip_dlg_dec_lock(dlg); 
     1218        return PJSIP_ESESSIONSTATE; 
     1219    } 
     1220 
     1221    /* Init media channel */ 
     1222    status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAC); 
     1223    if (status != PJ_SUCCESS) { 
     1224        pjsua_perror(THIS_FILE, "Error initializing media channel", status); 
    12171225        pjsip_dlg_dec_lock(dlg); 
    12181226        return PJSIP_ESESSIONSTATE; 
     
    22462254        status = create_inactive_sdp( call, &answer ); 
    22472255    } else { 
     2256 
    22482257        PJ_LOG(4,(THIS_FILE, "Call %d: received updated media offer", 
    22492258                  call->index)); 
     2259 
     2260        /* Init media channel */ 
     2261        status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAC); 
     2262        if (status != PJ_SUCCESS) { 
     2263            pjsua_perror(THIS_FILE, "Error initializing media channel", status); 
     2264            PJSUA_UNLOCK(); 
     2265            return; 
     2266        } 
     2267 
    22502268        status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, &answer); 
    22512269    } 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

    r1112 r1133  
    815815        call->media_dir = PJMEDIA_DIR_NONE; 
    816816 
    817         /* Shutdown transport */ 
     817        /* Shutdown ICE session */ 
     818        if (pjsua_var.media_cfg.enable_ice) { 
     819            pjmedia_ice_stop_ice(call->med_tp); 
     820        } 
     821 
    818822        /* No need because we need keepalive? */ 
    819823 
Note: See TracChangeset for help on using the changeset viewer.