diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-05 06:36:18 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-05 06:36:18 +0000 |
| commit | f27ab9b33b6b8b9e2a90cb544084ff55dc524da2 (patch) | |
| tree | 849a63991bfd6bce7934d461330adae7a7747720 /channels | |
| parent | a40442e17360c8b914091ee1f9f116acf8bfa1f7 (diff) | |
Do not use ':' as a separator between arguments (kept around for 1.4 for backwards compatibility)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@32185 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 6 | ||||
| -rw-r--r-- | channels/chan_sip.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 9424c117b..4c00a9ba2 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -9398,7 +9398,9 @@ static int function_iaxpeer(struct ast_channel *chan, char *cmd, char *data, cha 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 @@ static int function_iaxpeer(struct ast_channel *chan, char *cmd, char *data, cha 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" diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 7e6a3300a..f36d3abd4 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -9980,7 +9980,9 @@ static int function_sippeer(struct ast_channel *chan, char *cmd, char *data, cha 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 @@ static int function_sippeer(struct ast_channel *chan, char *cmd, char *data, cha 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" |