Changeset 4350


Ignore:
Timestamp:
Feb 15, 2013 3:57:31 AM (7 years ago)
Author:
nanang
Message:

Re #1242: Fixed ICE nego completion check as it always returns FALSE when peer doesn't support ICE.

Location:
pjproject/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/include/pjmedia/transport_ice.h

    r3872 r4350  
    6969typedef struct pjmedia_ice_transport_info 
    7070{ 
     71    /** 
     72     * Specifies whether ICE is used, i.e. SDP offer and answer indicates 
     73     * that both parties support ICE and ICE should be used for the session. 
     74     */ 
     75    pj_bool_t active; 
     76 
    7177    /** 
    7278     * ICE sesion state. 
  • pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

    r4203 r4350  
    15441544        pj_bzero(ii, sizeof(*ii)); 
    15451545 
     1546        ii->active = tp_ice->use_ice; 
     1547 
    15461548        if (pj_ice_strans_has_sess(tp_ice->ice_st)) 
    15471549            ii->role = pj_ice_strans_get_role(tp_ice->ice_st); 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

    r4345 r4350  
    30773077                   pjmedia_transport_info_get_spc_info( 
    30783078                                        &tpinfo, PJMEDIA_TRANSPORT_TYPE_ICE); 
    3079         if (!ice_info) 
     3079 
     3080        /* Check if ICE is active */ 
     3081        if (!ice_info || !ice_info->active) 
    30803082            continue; 
    30813083 
    30823084        /* Check if ICE setup not completed yet */ 
    3083         if (ice_info->sess_state < PJ_ICE_STRANS_STATE_RUNNING) { 
     3085        if (ice_info->sess_state < PJ_ICE_STRANS_STATE_RUNNING) { 
    30843086            ice_complete = PJ_FALSE; 
    30853087            break; 
Note: See TracChangeset for help on using the changeset viewer.