[asterisk-commits] simon.perreault: branch group/v6 r84635 - /team/group/v6/trunk/channels/

[SVN commits to the Asterisk project]

Author: simon.perreault
Date: Thu Oct  4 08:58:33 2007
New Revision: 84635

URL: http://svn.digium.com/view/asterisk?view=rev&rev=84635
Log:
Apply ACLs even with an IPv6 socket.

Modified:
    team/group/v6/trunk/channels/chan_sip.c

Modified: team/group/v6/trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/channels/chan_sip.c?view=diff&rev=84635&r1=84634&r2=84635
==============================================================================
--- team/group/v6/trunk/channels/chan_sip.c (original)
+++ team/group/v6/trunk/channels/chan_sip.c Thu Oct  4 08:58:33 2007
@@ -7078,7 +7078,7 @@
 		return -1;
 	}
 	if(!ast_vinetsock_sa_is_ipv4((struct sockaddr*)&p->ourip)) {
-		ast_log(LOG_WARNING, "t38 is only supported fgor IPv4 at this time\n");
+		ast_log(LOG_WARNING, "t38 is only supported for IPv4 at this time\n");
 		return -1;
 	}
 	
@@ -9511,8 +9511,7 @@
 	ast_string_field_set(p, exten, name);
 	build_contact(p);
 	peer = find_peer(name, NULL, 0, 1);
-	if (!(peer && (!ast_vinetsock_sa_is_ipv4(sa) ||
-		ast_apply_ha(peer->ha, sa, sa_len)))) {
+	if (!(peer && ast_apply_ha(peer->ha, sa, sa_len))) {
 		/* Peer fails ACL check */
 		if (peer) {
 			unref_peer(peer);
@@ -10326,7 +10325,7 @@
 			ast_verbose("No user '%s' in SIP users list\n", of);
 		return AUTH_DONT_KNOW;
 	}
-	if (ast_vinetsock_sa_is_ipv4(sa) && !ast_apply_ha(user->ha, sa, sa_len)) {
+	if (!ast_apply_ha(user->ha, sa, sa_len)) {
 		if (debug)
 			ast_verbose("Found user '%s' for '%s', but fails host access\n",
 				user->name, of);