[asterisk-commits] mmichelson: branch 13 r428425 - in /branches/13: ./ main/acl.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Nov 20 10:36:54 2014
New Revision: 428425

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=428425
Log:
Fix error with mixed address family ACLs.

Prior to this commit, the address family of the first item in an ACL
was used to compare all incoming traffic. This could lead to traffic
of other IP address families bypassing ACLs.

ASTERISK-24469 #close

Reported by Matt Jordan
Patches:
	ASTERISK-24469-11.diff uploaded by Matt Jordan (License #6283)

AST-2014-012
........

Merged revisions 428402 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 428417 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 428422 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    branches/13/   (props changed)
    branches/13/main/acl.c

Propchange: branches/13/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: branches/13/main/acl.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/main/acl.c?view=diff&rev=428425&r1=428424&r2=428425
==============================================================================
--- branches/13/main/acl.c (original)
+++ branches/13/main/acl.c Thu Nov 20 10:36:54 2014
@@ -743,7 +743,7 @@
 		ast_copy_string(iabuf2, ast_inet_ntoa(ha->netaddr), sizeof(iabuf2));
 		ast_debug(1, "##### Testing %s with %s\n", iabuf, iabuf2);
 #endif
-		if (ast_sockaddr_is_ipv4(&ha->addr)) {
+		if (ast_sockaddr_is_ipv4(&current_ha->addr)) {
 			if (ast_sockaddr_is_ipv6(addr)) {
 				if (ast_sockaddr_is_ipv4_mapped(addr)) {
 					/* IPv4 ACLs apply to IPv4-mapped addresses */