[svn-commits] trunk r32185 - in /trunk/channels: chan_iax2.c chan_sip.c

[svn-commits at lists.digium.com]

Author: oej
Date: Mon Jun  5 01:36:18 2006
New Revision: 32185

URL: http://svn.digium.com/view/asterisk?rev=32185&view=rev
Log:
Do not use ':' as a separator between arguments (kept around for 1.4 for backwards compatibility)

Modified:
    trunk/channels/chan_iax2.c
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?rev=32185&r1=32184&r2=32185&view=diff
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Mon Jun  5 01:36:18 2006
@@ -9398,7 +9398,9 @@
 		return 0;
 	}
 
-	if ((colname = strchr(peername, ':')))
+	if ((colname = strchr(peername, ':')))	/*! \todo : will be removed after the 1.4 relese */
+		*colname++ = '\0';
+	else if ((colname = strchr(peername, '|')))
 		*colname++ = '\0';
 	else
 		colname = "ip";
@@ -9446,7 +9448,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"

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=32185&r1=32184&r2=32185&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Jun  5 01:36:18 2006
@@ -9980,7 +9980,9 @@
 	char *colname;
 	char iabuf[INET_ADDRSTRLEN];
 
-	if ((colname = strchr(data, ':')))
+	if ((colname = strchr(data, ':')))	/*! \todo Will be deprecated after 1.4 */
+		*colname++ = '\0';
+	else if ((colname = strchr(data, '|')))
 		*colname++ = '\0';
 	else
 		colname = "ip";
@@ -10039,7 +10041,7 @@
 struct ast_custom_function sippeer_function = {
 	.name = "SIPPEER",
 	.synopsis = "Gets SIP peer information",
-	.syntax = "SIPPEER(<peername>[:item])",
+	.syntax = "SIPPEER(<peername>[|item])",
 	.read = function_sippeer,
 	.desc = "Valid items are:\n"
 	"- ip (default)          The IP address.\n"