Changeset 5419


Ignore:
Timestamp:
Aug 15, 2016 9:59:09 AM (3 years ago)
Author:
nanang
Message:

Fix #1952: Skip address type matching in pjmedia_stream_info_from_sdp() when both sides use ICE, the ICE transport will do the matching when it generates ICE checklist.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia/stream_info.c

    r5239 r5419  
    477477    } 
    478478 
    479     /* Local and remote address family must match */ 
    480     if (local_af != rem_af) 
    481         return PJ_EAFNOTSUP; 
     479    /* Local and remote address family must match, except when ICE is used 
     480     * by both sides (see also ticket #1952). 
     481     */ 
     482    if (local_af != rem_af) { 
     483        const pj_str_t STR_ICE_CAND = { "candidate", 9 }; 
     484        if (pjmedia_sdp_media_find_attr(rem_m, &STR_ICE_CAND, NULL)==NULL || 
     485            pjmedia_sdp_media_find_attr(local_m, &STR_ICE_CAND, NULL)==NULL) 
     486        { 
     487            return PJ_EAFNOTSUP; 
     488        } 
     489    } 
    482490 
    483491    /* Media direction: */ 
Note: See TracChangeset for help on using the changeset viewer.