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

[SVN commits to the Asterisk project]

Author: oej
Date: Sun Jul  6 03:32:11 2008
New Revision: 128379

URL: http://svn.digium.com/view/asterisk?view=rev&rev=128379
Log:
Fix severe problem with my previous commit of "kill-the-user". Russell saw a problem with this
code, but not the correct problem. Thanks, anyway! ;-)


Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=128379&r1=128378&r2=128379
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Sun Jul  6 03:32:11 2008
@@ -11672,8 +11672,8 @@
 	/* First find device on name */
 	peer = find_peer(of, NULL, TRUE, FALSE);
 
-	/* Then find device on IP (if it's not a SUBSCRIBE) */
-	if (sipmethod != SIP_SUBSCRIBE)
+	/* If not found, then find device on IP (if it's not a SUBSCRIBE) */
+	if (!peer && sipmethod != SIP_SUBSCRIBE)
 		find_peer(NULL, &p->recv, TRUE, FALSE);
 
 	if (!peer) {