FSCORE-301

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12100 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-02-17 17:04:45 +00:00
parent 83ceb3e862
commit a3ae344f3d

View File

@ -2454,10 +2454,12 @@ soa_init_sdp_connection_with_session(soa_session_t *ss,
if (m->m_rejected)
continue;
if (sdp && sdp->sdp_connection && sdp->sdp_connection->c_address) {
for (mc = m->m_connections; mc; mc = mc->c_next) {
for (li = res; li; li = li->li_next) {
if (!su_casematch(li->li_canonname, sdp->sdp_connection->c_address))
if (!li->li_canonname || !su_casematch(li->li_canonname, sdp->sdp_connection->c_address)) {
continue;
}
#if HAVE_SIN6
if (li->li_family == AF_INET6) {
if (ip6 > ip4)
@ -2467,17 +2469,20 @@ soa_init_sdp_connection_with_session(soa_session_t *ss,
}
#endif
else if (li->li_family == AF_INET) {
if (ip4 > ip6)
if (ip4 > ip6) {
break;
else if (!li4)
} else if (!li4) {
li4 = li; /* Best IP4 address */
}
}
}
}
}
if (li)
if (li) {
break;
}
}
if (li == NULL && ip4)
li = li4;