[svn-commits] simon.perreault: branch group/v6-new r273189 - /team/group/v6-new/channels/

[SVN commits to the Digium repositories]

Author: simon.perreault
Date: Wed Jun 30 09:21:19 2010
New Revision: 273189

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=273189
Log:
Added warning about unimplemented address remapping for IPv6.

Modified:
    team/group/v6-new/channels/chan_sip.c

Modified: team/group/v6-new/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/v6-new/channels/chan_sip.c?view=diff&rev=273189&r1=273188&r2=273189
==============================================================================
--- team/group/v6-new/channels/chan_sip.c (original)
+++ team/group/v6-new/channels/chan_sip.c Wed Jun 30 09:21:19 2010
@@ -3062,7 +3062,13 @@
 	ast_ouraddrfor(them, us);
 	ast_sockaddr_copy(&theirs, them);
 
-	if (!ast_sockaddr_is_ipv6(&theirs)) {
+	if (ast_sockaddr_is_ipv6(&theirs)) {
+		if (localaddr && !ast_sockaddr_isnull(&externip)) {
+			ast_log(LOG_WARNING, "Address remapping activated in sip.conf "
+				"but we're using IPv6, which doesn't need it. Please "
+				"remove \"localnet\" and/or \"externip\" settings.\n");
+		}
+	} else {
 		ast_sockaddr_to_sin(&theirs, &theirs_sin);
 		ast_sockaddr_to_sin(us, &us_sin);