aboutsummaryrefslogtreecommitdiffstats
path: root/funcs
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-27 17:39:16 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-27 17:39:16 +0000
commit4c2bb32fdf2910133db0d02854f73afc63288133 (patch)
tree08d0a4234b12f05ae0219f296cad65a859fe0c2b /funcs
parentfe61b5b5d3d8f983dc20b617791892059834f971 (diff)
Merged revisions 243482 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r243482 | russell | 2010-01-27 11:32:07 -0600 (Wed, 27 Jan 2010) | 13 lines Fix the ability to specify an OSP token for an outbound IAX2 call. When this patch was originally submitted, the code allowed for the token to be set via a channel variable. I decided that a cleaner approach would be to integrate it into the CHANNEL() function. Unfortunately, that is not a suitable approach. It's not possible to get the value set on the channel soon enough using that method. So, go back to the simple channel variable method. (closes issue #16711) Reported by: homesick Patches: iax-svn.diff uploaded by homesick (license 91) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@243484 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
-rw-r--r--funcs/func_channel.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/funcs/func_channel.c b/funcs/func_channel.c
index 84a0d48d8..2e377a34c 100644
--- a/funcs/func_channel.c
+++ b/funcs/func_channel.c
@@ -235,7 +235,6 @@ static struct ast_custom_function channel_function = {
" video Get video destination\n"
"\n"
"chan_iax2 provides the following additional options:\n"
- "R/W osptoken Get or set the OSP token information for a call\n"
"R/O peerip Get the peer's ip address\n"
"R/O peername Get the peer's username\n"
"\n"