[asterisk-commits] oej: trunk r46609 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Oct 31 03:24:55 2006
New Revision: 46609

URL: http://svn.digium.com/view/asterisk?rev=46609&view=rev
Log:
- If peer that register fails ACL, fail him
- Remove the 1.2 props I've set by mistake earlier 

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
            ('branch-1.2-blocked' removed)

Propchange: trunk/
            ('branch-1.2-merged' removed)

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=46609&r1=46608&r2=46609&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Oct 31 03:24:55 2006
@@ -8150,8 +8150,10 @@
 	build_contact(p);
 	peer = find_peer(name, NULL, 1);
 	if (!(peer && ast_apply_ha(peer->ha, sin))) {
+		/* Peer fails ACL check */
 		if (peer)
 			ASTOBJ_UNREF(peer, sip_destroy_peer);
+		peer = NULL;
 	}
 	if (peer) {
 		/* Set Frame packetization */