kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Thu Feb 26 09:18:43 CST 2009 Michael Jerris <mike@jerris.com> 

* soa.c: fix build on non-ipv6 hosts



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12303 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-02-26 18:36:35 +00:00
parent 6f9fb28bc9
commit 11bfd760fe
2 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Thu Feb 26 12:31:34 CST 2009
Thu Feb 26 12:36:01 CST 2009

55
libs/sofia-sip/libsofia-sip-ua/soa/soa.c
View File

@ -2452,34 +2452,31 @@ soa_init_sdp_connection_with_session(soa_session_t *ss,
sdp_connection_t const *mc;
if (m->m_rejected)
continue;
continue;
for (mc = m->m_connections; mc; mc = mc->c_next) {
for (li = res; li; li = li->li_next) {
if (!su_casematch(li->li_canonname, mc->c_address))
continue;
#if HAVE_SIN6
if (li->li_family == AF_INET6) {
if (ip6 > ip4)
break;
else if (!li6)
li6 = li; /* Best IP6 address */
}
if (li->li_family == AF_INET6) {
if (ip6 > ip4)
break;
else if (!li6)
li6 = li; /* Best IP6 address */
}
#endif
else if (li->li_family == AF_INET) {
if (ip4 > ip6) {
break;
} else if (!li4) {
li4 = li; /* Best IP4 address */
}
}
}
}
}
if (li) {
break;
else if (li->li_family == AF_INET) {
if (ip4 > ip6)
break;
else if (!li4)
li4 = li; /* Best IP4 address */
}
}
}
if (li)
break;
}
if (li == NULL && ip4)
@ -2523,20 +2520,20 @@ soa_init_sdp_connection_with_session(soa_session_t *ss,
if (li == NULL) {
for (li = res; li; li = li->li_next) {
#if HAVE_SIN6
if (li->li_family == AF_INET6) {
if (ip6 >= ip4)
break;
else if (!li6)
li6 = li; /* Best IP6 address */
} else
#endif
if (li->li_family == AF_INET) {
if (li->li_family == AF_INET) {
if (ip4 >= ip6)
break;
else if (!li4)
li4 = li; /* Best IP4 address */
}
#if HAVE_SIN6
else if (li->li_family == AF_INET6) {
if (ip6 >= ip4)
break;
else if (!li6)
li6 = li; /* Best IP6 address */
}
#endif
}
if (li == NULL && ip4)