[svn-commits] mmichelson: branch 1.6.1 r148377 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Oct 10 16:22:19 2008
New Revision: 148377

URL: http://svn.digium.com/view/asterisk?view=rev&rev=148377
Log:
Merged revisions 148376 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r148376 | mmichelson | 2008-10-10 16:21:45 -0500 (Fri, 10 Oct 2008) | 13 lines

The logic used when checking a peer got changed subtly
in the "kill the user" commit and caused calls relying
on the insecure setting to not work properly. I changed
for finding a peer back to how it was prior to that 
commit.

(closes issue #13644)
Reported by: pj
Patches:
      13644_trunkv2.patch uploaded by putnopvut (license 60)
Tested by: pj


........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=148377&r1=148376&r2=148377
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Fri Oct 10 16:22:19 2008
@@ -11759,13 +11759,7 @@
 	/* For subscribes, match on device name only; for other methods,
 	 * match on IP address-port of the incoming request.
 	 */
-	/* First find device on name */
-	peer = find_peer(of, NULL, TRUE, FALSE, FALSE);
-
-	/* If not found, then find device on IP (if it's not a SUBSCRIBE) */
-	if (!peer && sipmethod != SIP_SUBSCRIBE) {
-		peer = find_peer(NULL, &p->recv, TRUE, FALSE, FALSE);
-	}
+	peer = (sipmethod == SIP_SUBSCRIBE) ? find_peer(of, NULL, TRUE, FALSE, FALSE) : find_peer(NULL, &p->recv, TRUE, FALSE, FALSE);
 
 	if (!peer) {
 		if (debug)