[asterisk-commits] file: trunk r229970 - in /trunk: CHANGES UPGRADE.txt apps/app_chanisavail.c

[SVN commits to the Asterisk project]

Author: file
Date: Fri Nov 13 11:22:47 2009
New Revision: 229970

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=229970
Log:
Store the cause code that is returned when trying to create a channel in ChanIsAvail in the
AVAILCAUSECODE dialplan variable instead of overwriting the device state in AVAILSTATUS.

(closes issue #14426)
Reported by: macli

Modified:
    trunk/CHANGES
    trunk/UPGRADE.txt
    trunk/apps/app_chanisavail.c

Modified: trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=229970&r1=229969&r2=229970
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Fri Nov 13 11:22:47 2009
@@ -99,6 +99,8 @@
    spool directory of each individual user.  The control for this is located in
    the "passwordlocation" option in voicemail.conf.  Please see the sample
    configuration for more information.
+ * The ChanIsAvail application now exposes the returned cause code using a separate
+   variable, AVAILCAUSECODE, instead of overwriting the device state in AVAILSTATUS.
 
 Dialplan Functions
 ------------------

Modified: trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE.txt?view=diff&rev=229970&r1=229969&r2=229970
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Fri Nov 13 11:22:47 2009
@@ -54,6 +54,12 @@
   collisions, the channel name format is changed.
   The new channel naming for PRI channels is:
   DAHDI/i<span>/<number>[:<subaddress>]-<sequence-number>
+
+* The ChanIsAvail application has been changed so the AVAILSTATUS variable
+  no longer contains both the device state and cause code. The cause code
+  is now available in the AVAILCAUSECODE variable. If existing dialplan logic
+  is written to expect AVAILSTATUS to contain the cause code it needs to be
+  changed to use AVAILCAUSECODE.
 
 From 1.6.1 to 1.6.2:
 

Modified: trunk/apps/app_chanisavail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_chanisavail.c?view=diff&rev=229970&r1=229969&r2=229970
==============================================================================
--- trunk/apps/app_chanisavail.c (original)
+++ trunk/apps/app_chanisavail.c Fri Nov 13 11:22:47 2009
@@ -85,8 +85,11 @@
 					<para>The canonical channel name that was used to create the channel</para>
 				</variable>
 				<variable name="AVAILSTATUS">
-					<para>The status code for the available channel</para>
+					<para>The device state for the device</para>
 				</variable>
+				<variable name="AVAILCAUSECODE">
+				        <para>The cause code returned when requesting the channel</para>
+				</variable>	
 			</variablelist>
 		</description>
 	</application>
@@ -100,6 +103,7 @@
 	struct ast_str *tmp_availchan = ast_str_alloca(2048);
 	struct ast_str *tmp_availorig = ast_str_alloca(2048);
 	struct ast_str *tmp_availstat = ast_str_alloca(2048);
+	struct ast_str *tmp_availcause = ast_str_alloca(2048);
 	struct ast_channel *tempchan;
 	AST_DECLARE_APP_ARGS(args,
 		AST_APP_ARG(reqchans);
@@ -159,6 +163,8 @@
 				snprintf(trychan, sizeof(trychan), "%s/%s",cur,number);
 				status = inuse = ast_device_state(trychan);
 			}
+			snprintf(tmp, sizeof(tmp), "%d", status);
+			ast_str_append(&tmp_availstat, 0, "%s%s", ast_str_strlen(tmp_availstat) ? "&" : "", tmp);
 			if ((inuse <= 1) && (tempchan = ast_request(tech, chan->nativeformats, chan, number, &status))) {
 					ast_str_append(&tmp_availchan, 0, "%s%s", ast_str_strlen(tmp_availchan) ? "&" : "", tempchan->name);
 					
@@ -166,7 +172,7 @@
 					ast_str_append(&tmp_availorig, 0, "%s%s", ast_str_strlen(tmp_availorig) ? "&" : "", tmp);
 
 					snprintf(tmp, sizeof(tmp), "%d", status);
-					ast_str_append(&tmp_availstat, 0, "%s%s", ast_str_strlen(tmp_availstat) ? "&" : "", tmp);
+					ast_str_append(&tmp_availcause, 0, "%s%s", ast_str_strlen(tmp_availcause) ? "&" : "", tmp);
 
 					ast_hangup(tempchan);
 					tempchan = NULL;
@@ -174,9 +180,6 @@
 					if (!option_all_avail) {
 						break;
 					}
-			} else {
-				snprintf(tmp, sizeof(tmp), "%d", status);
-				ast_str_append(&tmp_availstat, 0, "%s%s", ast_str_strlen(tmp_availstat) ? "&" : "", tmp);
 			}
 			cur = rest;
 		} while (cur);
@@ -186,6 +189,7 @@
 	/* Store the originally used channel too */
 	pbx_builtin_setvar_helper(chan, "AVAILORIGCHAN", ast_str_buffer(tmp_availorig));
 	pbx_builtin_setvar_helper(chan, "AVAILSTATUS", ast_str_buffer(tmp_availstat));
+	pbx_builtin_setvar_helper(chan, "AVAILCAUSECODE", ast_str_buffer(tmp_availcause));
 
 	return 0;
 }