From 7dd8c34e825090a49dd7a0fc0153e3884d5e2417 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Wed, 8 Apr 2015 11:51:24 +0000 Subject: [PATCH] chan_sip: Handle IPv4 mapped IPv6 clients when NAT is enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@434288 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 6a208cc142..c40a4c3072 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3801,7 +3801,7 @@ static void ast_sip_ouraddrfor(const struct ast_sockaddr *them, struct ast_socka 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 "