[asterisk-commits] file: branch 1.6.1 r229968 - in /branches/1.6.1: ./ apps/ configs/

[SVN commits to the Asterisk project]

Author: file
Date: Fri Nov 13 11:21:26 2009
New Revision: 229968

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=229968
Log:
Merged revisions 229966 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r229966 | file | 2009-11-13 11:20:26 -0600 (Fri, 13 Nov 2009) | 13 lines
  
  Merged revisions 229965 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r229965 | file | 2009-11-13 11:19:59 -0600 (Fri, 13 Nov 2009) | 6 lines
    
    Document a limitation in the AVAILSTATUS variable from ChanIsAvail and provide
    a workaround for it that does not change existing behavior.
    
    (closes issue #14426)
    Reported by: macli
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_chanisavail.c
    branches/1.6.1/configs/extensions.conf.sample

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_chanisavail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_chanisavail.c?view=diff&rev=229968&r1=229967&r2=229968
==============================================================================
--- branches/1.6.1/apps/app_chanisavail.c (original)
+++ branches/1.6.1/apps/app_chanisavail.c Fri Nov 13 11:21:26 2009
@@ -54,6 +54,11 @@
 "    s - Consider the channel unavailable if the channel is in use at all.\n"
 "    t - Simply checks if specified channels exist in the channel list\n"
 "        (implies option s).\n"
+"Note that the AVAILSTATUS variable is used for both device state\n"
+"and cause code. It is therefore possible for it to give a value that may\n"
+"indicate a device is available when it is not. It is suggested that the\n"
+"AVAILORIGCHAN variable is used instead to see whether a device is available\n"
+"or not.\n"
 "This application sets the following channel variable upon completion:\n"
 "  AVAILCHAN     - the name of the available channel, if one exists\n"
 "  AVAILORIGCHAN - the canonical channel name that was used to create the channel\n"

Modified: branches/1.6.1/configs/extensions.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/configs/extensions.conf.sample?view=diff&rev=229968&r1=229967&r2=229968
==============================================================================
--- branches/1.6.1/configs/extensions.conf.sample (original)
+++ branches/1.6.1/configs/extensions.conf.sample Fri Nov 13 11:21:26 2009
@@ -493,7 +493,7 @@
 ;   ${ARG1} - Device to page
 
 exten => s,1,ChanIsAvail(${ARG1},s)			; s is for ANY call
-exten => s,n,GoToIf([${AVAILSTATUS} = "1"]?autoanswer:fail)
+exten => s,n,GoToIf([${AVAILORIGCHAN} = ""]?fail:autoanswer)
 exten => s,n(autoanswer),Set(_ALERT_INFO="RA")			; This is for the PolyComs
 exten => s,n,SIPAddHeader(Call-Info: Answer-After=0)	; This is for the Grandstream, Snoms, and Others
 exten => s,n,NoOp()					; Add others here and Post on the Wiki!!!!