diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index f7e18de883..32640f7d68 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Thu Feb 26 12:31:34 CST 2009 +Thu Feb 26 12:36:01 CST 2009 diff --git a/libs/sofia-sip/libsofia-sip-ua/soa/soa.c b/libs/sofia-sip/libsofia-sip-ua/soa/soa.c index 2051bb778a..92f1eab3bc 100644 --- a/libs/sofia-sip/libsofia-sip-ua/soa/soa.c +++ b/libs/sofia-sip/libsofia-sip-ua/soa/soa.c @@ -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)