Author: mikej Date: Thu Feb 26 12:36:35 2009 New Revision: 12303 Log: Thu Feb 26 09:18:43 CST 2009 Michael Jerris <mike@jerris.com> * soa.c: fix build on non-ipv6 hosts Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Feb 26 12:36:35 2009 @@ -1 +1 @@ -Thu Feb 26 12:31:34 CST 2009 +Thu Feb 26 12:36:01 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c Thu Feb 26 12:36:35 2009 @@ -2452,34 +2452,31 @@ 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 */ - } -#endif - else if (li->li_family == AF_INET) { - if (ip4 > ip6) { - break; - } else if (!li4) { - li4 = li; /* Best IP4 address */ - } - } - } - } + if (li->li_family == AF_INET6) { + if (ip6 > ip4) + break; + else if (!li6) + li6 = li; /* Best IP6 address */ } - - if (li) { - break; +#endif + 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 @@ if (li == NULL) { for (li = res; li; li = li->li_next) { + if (li->li_family == AF_INET) { + if (ip4 >= ip6) + break; + else if (!li4) + li4 = li; /* Best IP4 address */ + } #if HAVE_SIN6 - if (li->li_family == AF_INET6) { + else 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 (ip4 >= ip6) - break; - else if (!li4) - li4 = li; /* Best IP4 address */ } +#endif } if (li == NULL && ip4)