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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@243484 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2010-01-27 17:39:16 +00:00
parent d61d49ee1b
commit f813a38885
2 changed files with 2 additions and 33 deletions

View File

@@ -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"