提交 11bfd760 authored 作者: Michael Jerris's avatar Michael Jerris

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
上级 6f9fb28b
Thu Feb 26 12:31:34 CST 2009 Thu Feb 26 12:36:01 CST 2009
...@@ -2467,20 +2467,17 @@ soa_init_sdp_connection_with_session(soa_session_t *ss, ...@@ -2467,20 +2467,17 @@ soa_init_sdp_connection_with_session(soa_session_t *ss,
} }
#endif #endif
else if (li->li_family == AF_INET) { else if (li->li_family == AF_INET) {
if (ip4 > ip6) { if (ip4 > ip6)
break; break;
} else if (!li4) { else if (!li4)
li4 = li; /* Best IP4 address */ li4 = li; /* Best IP4 address */
} }
} }
} }
}
}
if (li) { if (li)
break; break;
} }
}
if (li == NULL && ip4) if (li == NULL && ip4)
li = li4; li = li4;
...@@ -2523,20 +2520,20 @@ soa_init_sdp_connection_with_session(soa_session_t *ss, ...@@ -2523,20 +2520,20 @@ soa_init_sdp_connection_with_session(soa_session_t *ss,
if (li == NULL) { if (li == NULL) {
for (li = res; li; li = li->li_next) { 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) if (ip4 >= ip6)
break; break;
else if (!li4) else if (!li4)
li4 = li; /* Best IP4 address */ 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) if (li == NULL && ip4)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论