Fix sofia build on non-ipv6 hosts

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12018 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/libsofia-sip-ua/soa/soa.c b/libs/sofia-sip/libsofia-sip-ua/soa/soa.c
index 49be1faa7d60a51c89d1c8f38469bb8d8bf4104a..d75b07993127124df752cfaaa2c32e51cccac655 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/soa/soa.c
+++ b/libs/sofia-sip/libsofia-sip-ua/soa/soa.c
@@ -2526,9 +2526,9 @@ soa_init_sdp_connection_with_session(soa_session_t *ss,
          break;
        else if (!li6)
          li6 = li;             /* Best IP6 address */
-      }
+      } else
 #endif
-      else if (li->li_family == AF_INET) {
+       if (li->li_family == AF_INET) {
        if (ip4 >= ip6)
          break;
        else if (!li4)

diff --git a/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c b/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c
index f61fb916e8c36001e6a066be6be0c2d308f7aca6..d38fcc74d546c1e0c9892c91079ea459bbe84678 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c
+++ b/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c
@@ -1526,7 +1526,6 @@ sres_sip_process_numeric(sres_sip_t *srs)
   char const *target = srs->srs_target;
   su_addrinfo_t ai[1];
   su_sockaddr_t su[1];
-  char buffer[64];
   int i;
 
   memset(ai, 0, (sizeof ai));
@@ -1551,6 +1550,7 @@ sres_sip_process_numeric(sres_sip_t *srs)
     }
   }
   else if (host_is_ip6_reference(target)) {
+    char buffer[64];
     size_t len = strlen(target) - 2;
 
     ai->ai_addr = memset(su, 0, (sizeof su->su_sin6));

diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c b/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c
index f992af9b18275c16d3f968b6da8a32e41e893b25..0efc1a4679658839616ae5b7fb3f725cf567d848 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c
+++ b/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c
@@ -96,7 +96,10 @@ static int localinfo6(su_localinfo_t const *, su_localinfo_t **);
 #endif
 
 static int li_scope4(uint32_t ip4);
+
+#ifdef SU_HAVE_IN6
 static int li_scope6(struct in6_addr const *ip6);
+#endif
 
 #if !SU_LOCALINFO_TEST