aboutsummaryrefslogtreecommitdiffstats
path: root/funcs
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-27 17:35:36 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-27 17:35:36 +0000
commit7f7038715d16e14fa9c8beb2f60c1081e572da3e (patch)
tree76846da9bb202ac8afdff141bf0661741ca095c9 /funcs
parentcac44eb6e1109f5e5398033beeb2bd8f2e56d6e0 (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.0@243483 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
-rw-r--r--funcs/func_channel.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/funcs/func_channel.c b/funcs/func_channel.c
index b30ba5cb5..0c44abe62 100644
--- a/funcs/func_channel.c
+++ b/funcs/func_channel.c
@@ -207,9 +207,6 @@ static struct ast_custom_function channel_function = {
" audio Get audio destination\n"
" 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"
- "\n"
"Additional items may be available from the channel driver providing\n"
"the channel; see its documentation for details.\n"
"\n"