[svn-commits] irroot: branch 10 r337433 - in /branches/10: CHANGES apps/app_originate.c

[SVN commits to the Digium repositories]

Author: irroot
Date: Thu Sep 22 01:42:42 2011
New Revision: 337433

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=337433
Log:
Revert commit r337261

This commit is for trunk not version 10

-----
Adds a timeout argument to app_originate

the default is 30s this will be used if the timout supplied is invalid or
no timeout is supplied.
-----


Modified:
    branches/10/CHANGES
    branches/10/apps/app_originate.c

Modified: branches/10/CHANGES
URL: http://svnview.digium.com/svn/asterisk/branches/10/CHANGES?view=diff&rev=337433&r1=337432&r2=337433
==============================================================================
--- branches/10/CHANGES (original)
+++ branches/10/CHANGES Thu Sep 22 01:42:42 2011
@@ -204,7 +204,6 @@
    a MeetMe conference
  * Added 'k' option to MeetMe to automatically kill the conference when there's only
    one participant left (much like a normal call bridge)
- * Added extra argument to Originate to set timeout.
 
 Asterisk Database
 -----------------

Modified: branches/10/apps/app_originate.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/apps/app_originate.c?view=diff&rev=337433&r1=337432&r2=337433
==============================================================================
--- branches/10/apps/app_originate.c (original)
+++ branches/10/apps/app_originate.c Thu Sep 22 01:42:42 2011
@@ -69,9 +69,6 @@
 			</parameter>
 			<parameter name="arg3" required="false">
 				<para>If the type is <literal>exten</literal>, then this is the priority that the channel is sent to.  If the type is <literal>app</literal>, then this parameter is ignored.</para>
-			</parameter>
-			<parameter name="timeout" required="false">
-				<para>Timeout in seconds. Default is 30 seconds.</para>
 			</parameter>
 		</syntax>
 		<description>
@@ -104,13 +101,12 @@
 		AST_APP_ARG(arg1);
 		AST_APP_ARG(arg2);
 		AST_APP_ARG(arg3);
-		AST_APP_ARG(timeout);
 	);
 	char *parse;
 	char *chantech, *chandata;
 	int res = -1;
 	int outgoing_status = 0;
-	unsigned int timeout = 30;
+	static const unsigned int timeout = 30;
 	static const char default_exten[] = "s";
 	struct ast_format tmpfmt;
 	struct ast_format_cap *cap_slin = ast_format_cap_alloc_nolock();
@@ -133,13 +129,6 @@
 	if (args.argc < 3) {
 		ast_log(LOG_ERROR, "Incorrect number of arguments\n");
 		goto return_cleanup;
-	}
-
-	if (!ast_strlen_zero(args.timeout)) {
-		if(sscanf(args.timeout, "%u", &timeout) != 1) {
-			ast_log(LOG_NOTICE, "Invalid timeout: '%s'. Setting timeout to 30 seconds\n", args.timeout);
-			timeout = 30;
-		}
 	}
 
 	chandata = ast_strdupa(args.tech_data);