[asterisk-commits] irroot: branch irroot/distrotech-customers-10 r341767 - in /team/irroot/distr...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Oct 21 00:57:29 CDT 2011
Author: irroot
Date: Fri Oct 21 00:57:25 2011
New Revision: 341767
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=341767
Log:
Multiple revisions 341599,341665,341707,341718
........
r341599 | irroot | 2011-10-20 20:20:08 +0200 (Thu, 20 Oct 2011) | 8 lines
add documentation for check_state_unknown in configs/queues.conf.sample
app_queue allows calls to members in a "Unknown" state to be treated as available
setting check_state_unknown = yes will cause app_queue to query the channel driver
to better determine the state this only applies to queues with ringinuse or ignorebusy
set appropriately.
........
r341665 | pabelanger | 2011-10-20 22:47:39 +0200 (Thu, 20 Oct 2011) | 5 lines
Updated documentation for the optional CID parameter with CALLERID
........
Merged revisions 341664 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
r341707 | pabelanger | 2011-10-20 23:27:19 +0200 (Thu, 20 Oct 2011) | 5 lines
Fixed typo from previous commit
........
Merged revisions 341704 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
r341718 | rmudgett | 2011-10-20 23:58:39 +0200 (Thu, 20 Oct 2011) | 21 lines
Fix AGI exec Park to honor the Park application parameters.
The fix for ASTERISK-12715 and ASTERISK-12685 added a check for the Park
application because the channel needed to be masqueraded to prevent a
crash. Since the Park application now always masquerades the channel into
the parking lot, the special check is no longer needed. The fix also
resulted in AGI exec Park attempting to double park the call and not honor
the Park application parameters.
* Removed no longer necessary call to ast_masq_park_call() by AGI exec for
the Park application. (Reverts -r146923)
* Fix Park application to only return 0 or -1. The AGI exec Park was
causing broken pipe error messages because the Park application returned 1
on successful park.
(closes issue ASTERISK-18737)
........
Merged revisions 341717 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 341599,341665,341707,341718 from http://svn.asterisk.org/svn/asterisk/branches/10
Modified:
team/irroot/distrotech-customers-10/ (props changed)
team/irroot/distrotech-customers-10/funcs/func_callerid.c
team/irroot/distrotech-customers-10/include/asterisk/features.h
team/irroot/distrotech-customers-10/main/features.c
team/irroot/distrotech-customers-10/res/res_agi.c
Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
automerge = *
Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Oct 21 00:57:25 2011
@@ -1,1 +1,1 @@
-/branches/10:1-341584
+/branches/10:1-341766
Modified: team/irroot/distrotech-customers-10/funcs/func_callerid.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/funcs/func_callerid.c?view=diff&rev=341767&r1=341766&r2=341767
==============================================================================
--- team/irroot/distrotech-customers-10/funcs/func_callerid.c (original)
+++ team/irroot/distrotech-customers-10/funcs/func_callerid.c Fri Oct 21 00:57:25 2011
@@ -120,7 +120,8 @@
</enumlist>
</parameter>
<parameter name="CID">
- <para>Optional Caller*ID</para>
+ <para>Optional Caller*ID to parse instead of using the Caller*ID from the
+ channel. This parameter is only optional when reading the Caller*ID.</para>
</parameter>
</syntax>
<description>
Modified: team/irroot/distrotech-customers-10/include/asterisk/features.h
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/include/asterisk/features.h?view=diff&rev=341767&r1=341766&r2=341767
==============================================================================
--- team/irroot/distrotech-customers-10/include/asterisk/features.h (original)
+++ team/irroot/distrotech-customers-10/include/asterisk/features.h Fri Oct 21 00:57:25 2011
@@ -34,7 +34,6 @@
#define FEATURE_EXTEN_LEN 32
#define FEATURE_MOH_LEN 80 /* same as MAX_MUSICCLASS from channel.h */
-#define PARK_APP_NAME "Park"
#define DEFAULT_PARKINGLOT "default" /*!< Default parking lot */
#define AST_FEATURE_RETURN_HANGUP -1
Modified: team/irroot/distrotech-customers-10/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/main/features.c?view=diff&rev=341767&r1=341766&r2=341767
==============================================================================
--- team/irroot/distrotech-customers-10/main/features.c (original)
+++ team/irroot/distrotech-customers-10/main/features.c Fri Oct 21 00:57:25 2011
@@ -416,7 +416,7 @@
FEATURE_INTERPRET_CHECK, /* Used by feature_check */
} feature_interpret_op;
-static char *parkedcall = "ParkedCall";
+static const char *parkedcall = "ParkedCall";
static char pickup_ext[AST_MAX_EXTENSION]; /*!< Call pickup extension */
@@ -630,7 +630,7 @@
);
/* module and CLI command definitions */
-static char *parkcall = PARK_APP_NAME;
+static const char *parkcall = "Park";
static struct ast_app *monitor_app = NULL;
static int monitor_ok = 1;
@@ -783,7 +783,7 @@
}
app_at_exten = ast_get_extension_app(exten);
- if (!app_at_exten || strcasecmp(PARK_APP_NAME, app_at_exten)) {
+ if (!app_at_exten || strcasecmp(parkcall, app_at_exten)) {
return NULL;
}
@@ -4967,7 +4967,7 @@
res = 0;
} else {
/* Park succeeded. */
- res = 1;
+ res = -1;
}
return res;
Modified: team/irroot/distrotech-customers-10/res/res_agi.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/res/res_agi.c?view=diff&rev=341767&r1=341766&r2=341767
==============================================================================
--- team/irroot/distrotech-customers-10/res/res_agi.c (original)
+++ team/irroot/distrotech-customers-10/res/res_agi.c Fri Oct 21 00:57:25 2011
@@ -61,7 +61,6 @@
#include "asterisk/ast_version.h"
#include "asterisk/speech.h"
#include "asterisk/manager.h"
-#include "asterisk/features.h"
#include "asterisk/term.h"
#include "asterisk/xmldoc.h"
#include "asterisk/srv.h"
@@ -2474,9 +2473,6 @@
ast_verb(3, "AGI Script Executing Application: (%s) Options: (%s)\n", argv[1], argc >= 3 ? argv[2] : "");
if ((app_to_exec = pbx_findapp(argv[1]))) {
- if(!strcasecmp(argv[1], PARK_APP_NAME)) {
- ast_masq_park_call(chan, NULL, 0, NULL);
- }
if (!(workaround = ast_test_flag(chan, AST_FLAG_DISABLE_WORKAROUNDS))) {
ast_set_flag(chan, AST_FLAG_DISABLE_WORKAROUNDS);
}
More information about the asterisk-commits
mailing list