[svn-commits] tilghman: branch 1.6.0 r132983 - in /branches/1.6.0: ./ channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Jul 23 12:21:51 2008
New Revision: 132983

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

........
r132981 | tilghman | 2008-07-23 12:20:43 -0500 (Wed, 23 Jul 2008) | 6 lines

Yet another conversion of '|' to ','
(closes issue #13137)
 Reported by: eliel
 Patches: 
       chan_iax2trunk-IAXPEER.patch uploaded by eliel (license 64)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_iax2.c

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

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=132983&r1=132982&r2=132983
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Wed Jul 23 12:21:51 2008
@@ -11598,9 +11598,7 @@
 		return 0;
 	}
 
-	if ((colname = strchr(peername, ':')))	/*! \todo : will be removed after the 1.4 relese */
-		*colname++ = '\0';
-	else if ((colname = strchr(peername, '|')))
+	if ((colname = strchr(peername, ',')))
 		*colname++ = '\0';
 	else
 		colname = "ip";
@@ -11650,7 +11648,7 @@
 struct ast_custom_function iaxpeer_function = {
 	.name = "IAXPEER",
 	.synopsis = "Gets IAX peer information",
-	.syntax = "IAXPEER(<peername|CURRENTCHANNEL>[|item])",
+	.syntax = "IAXPEER(<peername|CURRENTCHANNEL>[,item])",
 	.read = function_iaxpeer,
 	.desc = "If peername specified, valid items are:\n"
 	"- ip (default)          The IP address.\n"