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

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index f7e18de8836fe1af1abdd12cd049b38c4a44bccf..32640f7d688f4f2c343d8f8baf09a6f18dab8f9b 100644 (file)
--- 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 2051bb778a6e30588a8db4636e6882055cc0def5..92f1eab3bc2af11d73967b648688bb56270b7f76 100644 (file)
--- 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 */
-                                 }
-#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 @@ soa_init_sdp_connection_with_session(soa_session_t *ss,
 
   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)