aboutsummaryrefslogtreecommitdiffstats
path: root/funcs
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-27 17:41:57 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-27 17:41:57 +0000
commit697a761b028acc974f0eacfd72bba5e861ac08ee (patch)
treee7a981a169b4a3bf82aa42b8192050b6dbac3af0 /funcs
parentc7e57134d9212f54e556b967a10bc3672e731230 (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.2@243485 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 62bd0d0f8..02e7208c6 100644
--- a/funcs/func_channel.c
+++ b/funcs/func_channel.c
@@ -191,9 +191,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
</enumlist>
<para><emphasis>chan_iax2</emphasis> provides the following additional options:</para>
<enumlist>
- <enum name="osptoken">
- <para>R/W Get or set the OSP token information for a call.</para>
- </enum>
<enum name="peerip">
<para>R/O Get the peer's ip address.</para>
</enum>