Author: mjordan Date: Wed Apr 8 06:51:24 2015 New Revision: 434288 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=434288 Log: chan_sip: Handle IPv4 mapped IPv6 clients when NAT is enabled
When udpbindaddr is set to the IPv6 bind all address of '::', Asterisk will attempt to handle both IPv4 and IPv6 addresses, although the information will be stored in a struct with an AF_INET6 address type. However, the current NAT handling code won't handle the IPv4 mapped IPv6 addresses correctly. This patch adds an additional check for the mapped address case, allowing the NAT code to handle clients even when the address is IPv6. Review: https://reviewboard.asterisk.org/r/4563/ ASTERISK-18032 #close Reported by: Christoph Timm patches: nat_with_ipv6.diff submitted by Valentin Vidić (License 6697) Modified: branches/11/channels/chan_sip.c Modified: branches/11/channels/chan_sip.c URL: http://svnview.digium.com/svn/asterisk/branches/11/channels/chan_sip.c?view=diff&rev=434288&r1=434287&r2=434288 ============================================================================== --- branches/11/channels/chan_sip.c (original) +++ branches/11/channels/chan_sip.c Wed Apr 8 06:51:24 2015 @@ -3801,7 +3801,7 @@ ast_ouraddrfor(them, us); ast_sockaddr_copy(&theirs, them); - if (ast_sockaddr_is_ipv6(&theirs)) { + if (ast_sockaddr_is_ipv6(&theirs) && !ast_sockaddr_is_ipv4_mapped(&theirs)) { if (localaddr && !ast_sockaddr_isnull(&externaddr) && !ast_sockaddr_is_any(&bindaddr)) { ast_log(LOG_WARNING, "Address remapping activated in sip.conf " "but we're using IPv6, which doesn't need it. Please " -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
