diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-23 17:21:51 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-23 17:21:51 +0000 |
| commit | 0bf632e36d558fe3cc5bdacc542386bce1f1ca15 (patch) | |
| tree | ef0c03697a93b71062953a8f3db55d5d8f7c514c | |
| parent | e50c7a3366e78534668b3182da102eaa3ba3d5ab (diff) | |
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)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@132983 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_iax2.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 055aa17d5..43c00f2c4 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -11598,9 +11598,7 @@ static int function_iaxpeer(struct ast_channel *chan, const char *cmd, char *dat 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 @@ static int function_iaxpeer(struct ast_channel *chan, const char *cmd, char *dat 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" |