[asterisk-commits] branch kpfleming/vldtmf r10431 - in
/team/kpfleming/vldtmf: ./ apps/ channels...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Feb 17 18:27:03 MST 2006
Author: kpfleming
Date: Fri Feb 17 19:26:29 2006
New Revision: 10431
URL: http://svn.digium.com/view/asterisk?rev=10431&view=rev
Log:
update to trunk, and re-enable automerge
Modified:
team/kpfleming/vldtmf/ (props changed)
team/kpfleming/vldtmf/Makefile
team/kpfleming/vldtmf/UPGRADE.txt
team/kpfleming/vldtmf/app.c
team/kpfleming/vldtmf/apps/app_adsiprog.c
team/kpfleming/vldtmf/apps/app_alarmreceiver.c
team/kpfleming/vldtmf/apps/app_amd.c
team/kpfleming/vldtmf/apps/app_authenticate.c
team/kpfleming/vldtmf/apps/app_cdr.c
team/kpfleming/vldtmf/apps/app_chanisavail.c
team/kpfleming/vldtmf/apps/app_chanspy.c
team/kpfleming/vldtmf/apps/app_controlplayback.c
team/kpfleming/vldtmf/apps/app_curl.c
team/kpfleming/vldtmf/apps/app_db.c
team/kpfleming/vldtmf/apps/app_dial.c
team/kpfleming/vldtmf/apps/app_dictate.c
team/kpfleming/vldtmf/apps/app_directed_pickup.c
team/kpfleming/vldtmf/apps/app_directory.c
team/kpfleming/vldtmf/apps/app_disa.c
team/kpfleming/vldtmf/apps/app_dumpchan.c
team/kpfleming/vldtmf/apps/app_echo.c
team/kpfleming/vldtmf/apps/app_exec.c
team/kpfleming/vldtmf/apps/app_externalivr.c
team/kpfleming/vldtmf/apps/app_festival.c
team/kpfleming/vldtmf/apps/app_flash.c
team/kpfleming/vldtmf/apps/app_forkcdr.c
team/kpfleming/vldtmf/apps/app_getcpeid.c
team/kpfleming/vldtmf/apps/app_hasnewvoicemail.c
team/kpfleming/vldtmf/apps/app_ices.c
team/kpfleming/vldtmf/apps/app_image.c
team/kpfleming/vldtmf/apps/app_ivrdemo.c
team/kpfleming/vldtmf/apps/app_lookupblacklist.c
team/kpfleming/vldtmf/apps/app_lookupcidname.c
team/kpfleming/vldtmf/apps/app_macro.c
team/kpfleming/vldtmf/apps/app_meetme.c
team/kpfleming/vldtmf/apps/app_milliwatt.c
team/kpfleming/vldtmf/apps/app_mixmonitor.c
team/kpfleming/vldtmf/apps/app_morsecode.c
team/kpfleming/vldtmf/apps/app_mp3.c
team/kpfleming/vldtmf/apps/app_nbscat.c
team/kpfleming/vldtmf/apps/app_osplookup.c
team/kpfleming/vldtmf/apps/app_page.c
team/kpfleming/vldtmf/apps/app_parkandannounce.c
team/kpfleming/vldtmf/apps/app_playback.c
team/kpfleming/vldtmf/apps/app_privacy.c
team/kpfleming/vldtmf/apps/app_queue.c
team/kpfleming/vldtmf/apps/app_random.c
team/kpfleming/vldtmf/apps/app_read.c
team/kpfleming/vldtmf/apps/app_readfile.c
team/kpfleming/vldtmf/apps/app_realtime.c
team/kpfleming/vldtmf/apps/app_record.c
team/kpfleming/vldtmf/apps/app_rpt.c
team/kpfleming/vldtmf/apps/app_sayunixtime.c
team/kpfleming/vldtmf/apps/app_senddtmf.c
team/kpfleming/vldtmf/apps/app_sendtext.c
team/kpfleming/vldtmf/apps/app_setcallerid.c
team/kpfleming/vldtmf/apps/app_setcdruserfield.c
team/kpfleming/vldtmf/apps/app_settransfercapability.c
team/kpfleming/vldtmf/apps/app_skel.c
team/kpfleming/vldtmf/apps/app_sms.c
team/kpfleming/vldtmf/apps/app_softhangup.c
team/kpfleming/vldtmf/apps/app_stack.c
team/kpfleming/vldtmf/apps/app_system.c
team/kpfleming/vldtmf/apps/app_talkdetect.c
team/kpfleming/vldtmf/apps/app_test.c
team/kpfleming/vldtmf/apps/app_transfer.c
team/kpfleming/vldtmf/apps/app_url.c
team/kpfleming/vldtmf/apps/app_userevent.c
team/kpfleming/vldtmf/apps/app_verbose.c
team/kpfleming/vldtmf/apps/app_voicemail.c
team/kpfleming/vldtmf/apps/app_waitforring.c
team/kpfleming/vldtmf/apps/app_waitforsilence.c
team/kpfleming/vldtmf/apps/app_while.c
team/kpfleming/vldtmf/apps/app_zapateller.c
team/kpfleming/vldtmf/apps/app_zapbarge.c
team/kpfleming/vldtmf/apps/app_zapras.c
team/kpfleming/vldtmf/apps/app_zapscan.c
team/kpfleming/vldtmf/astmm.c
team/kpfleming/vldtmf/autoservice.c
team/kpfleming/vldtmf/callerid.c
team/kpfleming/vldtmf/cdr.c
team/kpfleming/vldtmf/channel.c
team/kpfleming/vldtmf/channels/chan_agent.c
team/kpfleming/vldtmf/channels/chan_iax2.c
team/kpfleming/vldtmf/channels/chan_misdn.c
team/kpfleming/vldtmf/channels/chan_sip.c
team/kpfleming/vldtmf/channels/misdn/chan_misdn_config.h
team/kpfleming/vldtmf/channels/misdn/isdn_lib.c
team/kpfleming/vldtmf/channels/misdn/isdn_lib.h
team/kpfleming/vldtmf/channels/misdn_config.c
team/kpfleming/vldtmf/chanvars.c
team/kpfleming/vldtmf/cli.c
team/kpfleming/vldtmf/configs/misdn.conf.sample
team/kpfleming/vldtmf/configs/queues.conf.sample
team/kpfleming/vldtmf/file.c
team/kpfleming/vldtmf/funcs/func_cut.c
team/kpfleming/vldtmf/funcs/func_enum.c
team/kpfleming/vldtmf/funcs/func_rand.c
team/kpfleming/vldtmf/funcs/func_sha1.c
team/kpfleming/vldtmf/include/asterisk/cli.h
team/kpfleming/vldtmf/include/asterisk/linkedlists.h
team/kpfleming/vldtmf/include/asterisk/module.h
team/kpfleming/vldtmf/jitterbuf.c
team/kpfleming/vldtmf/logger.c
team/kpfleming/vldtmf/pbx.c
team/kpfleming/vldtmf/pbx/pbx_dundi.c
team/kpfleming/vldtmf/res/Makefile
team/kpfleming/vldtmf/res/res_agi.c
team/kpfleming/vldtmf/res/res_config_odbc.c
team/kpfleming/vldtmf/res/res_features.c
team/kpfleming/vldtmf/res/res_odbc.c
Propchange: team/kpfleming/vldtmf/
------------------------------------------------------------------------------
automerge = yes
Propchange: team/kpfleming/vldtmf/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/kpfleming/vldtmf/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 17 19:26:29 2006
@@ -1,1 +1,1 @@
-/trunk:1-10116
+/trunk:1-10430
Modified: team/kpfleming/vldtmf/Makefile
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/Makefile?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/Makefile (original)
+++ team/kpfleming/vldtmf/Makefile Fri Feb 17 19:26:29 2006
@@ -418,8 +418,6 @@
else
HAVEDOT=no
endif
-
-LIBS+=-lssl
INSTALL=install
Modified: team/kpfleming/vldtmf/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/UPGRADE.txt?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/UPGRADE.txt (original)
+++ team/kpfleming/vldtmf/UPGRADE.txt Fri Feb 17 19:26:29 2006
@@ -47,7 +47,7 @@
modules.conf file then you will need to explicitly load the modules that
contain the functions you want to use.
-* The ENUMLOOP() function no longer supplies a default zone for searching; instead,
+* The ENUMLOOKUP() function no longer supplies a default zone for searching; instead,
it uses the default zone(s) defined in enum.conf. In addition, when the 'c'
option (for counting the number of records is specified), but the lookup fails
to match any records, the returned value will now be "0" instead of blank.
Modified: team/kpfleming/vldtmf/app.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/app.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/app.c (original)
+++ team/kpfleming/vldtmf/app.c Fri Feb 17 19:26:29 2006
@@ -852,6 +852,7 @@
res = ast_set_read_format(chan, AST_FORMAT_SLINEAR);
if (res < 0) {
ast_log(LOG_WARNING, "Unable to set to linear mode, giving up\n");
+ ast_dsp_free(sildet);
return -1;
}
}
@@ -956,6 +957,7 @@
} else {
ast_log(LOG_WARNING, "Error creating writestream '%s', format '%s'\n", prependfile, sfmt[x]);
}
+ ast_dsp_free(sildet);
*duration = end - start;
#if 0
if (outmsg > 1) {
Modified: team/kpfleming/vldtmf/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_adsiprog.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_adsiprog.c (original)
+++ team/kpfleming/vldtmf/apps/app_adsiprog.c Fri Feb 17 19:26:29 2006
@@ -60,8 +60,6 @@
static char *descrip =
" ADSIProg(script): This application programs an ADSI Phone with the given\n"
"script. If nothing is specified, the default script (asterisk.adsi) is used.\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_alarmreceiver.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_alarmreceiver.c (original)
+++ team/kpfleming/vldtmf/apps/app_alarmreceiver.c Fri Feb 17 19:26:29 2006
@@ -95,15 +95,9 @@
static char db_family[128] = {'\0'};
static char time_stamp_format[128] = {"%a %b %d, %Y @ %H:%M:%S %Z"};
-
/* Misc variables */
-
static char event_file[14] = "/event-XXXXXX";
-
-
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_amd.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_amd.c (original)
+++ team/kpfleming/vldtmf/apps/app_amd.c Fri Feb 17 19:26:29 2006
@@ -70,8 +70,6 @@
" LONGGREETING-<%d voiceDuration>-<%d greeting>\n";
-STANDARD_LOCAL_USER;
-
LOCAL_USER_DECL;
#define STATE_IN_WORD 1
Modified: team/kpfleming/vldtmf/apps/app_authenticate.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_authenticate.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_authenticate.c (original)
+++ team/kpfleming/vldtmf/apps/app_authenticate.c Fri Feb 17 19:26:29 2006
@@ -91,8 +91,6 @@
" press the '#' key).\n"
" Defaults to 0 - no limit - wait for the user press the '#' key.\n"
;
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_cdr.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_cdr.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_cdr.c (original)
+++ team/kpfleming/vldtmf/apps/app_cdr.c Fri Feb 17 19:26:29 2006
@@ -45,8 +45,6 @@
static char *nocdr_app = "NoCDR";
static char *nocdr_synopsis = "Tell Asterisk to not maintain a CDR for the current call";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_chanisavail.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_chanisavail.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_chanisavail.c (original)
+++ team/kpfleming/vldtmf/apps/app_chanisavail.c Fri Feb 17 19:26:29 2006
@@ -64,8 +64,6 @@
" Options:\n"
" s - Consider the channel unavailable if the channel is in use at all\n"
" j - Support jumping to priority n+101 if no channel is available\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_chanspy.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_chanspy.c (original)
+++ team/kpfleming/vldtmf/apps/app_chanspy.c Fri Feb 17 19:26:29 2006
@@ -107,7 +107,6 @@
AST_APP_OPTION_ARG('r', OPTION_RECORD, OPT_ARG_RECORD),
});
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
struct chanspy_translation_helper {
Modified: team/kpfleming/vldtmf/apps/app_controlplayback.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_controlplayback.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_controlplayback.c (original)
+++ team/kpfleming/vldtmf/apps/app_controlplayback.c Fri Feb 17 19:26:29 2006
@@ -67,8 +67,6 @@
"This application sets the following channel variable upon completion:\n"
" CPLAYBACKSTATUS - This variable contains the status of the attempt as a text\n"
" string, one of: SUCCESS | USERSTOPPED | ERROR\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_curl.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_curl.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_curl.c (original)
+++ team/kpfleming/vldtmf/apps/app_curl.c Fri Feb 17 19:26:29 2006
@@ -49,8 +49,6 @@
#include "asterisk/utils.h"
static char *tdesc = "Load external URL";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_db.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_db.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_db.c (original)
+++ team/kpfleming/vldtmf/apps/app_db.c Fri Feb 17 19:26:29 2006
@@ -63,8 +63,6 @@
static char *d_synopsis = "Delete a key from the database";
static char *dt_synopsis = "Delete a family or keytree from the database";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_dial.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_dial.c (original)
+++ team/kpfleming/vldtmf/apps/app_dial.c Fri Feb 17 19:26:29 2006
@@ -271,7 +271,6 @@
};
LOCAL_USER_DECL;
-STANDARD_LOCAL_USER;
static void hanguptree(struct dial_localuser *outgoing, struct ast_channel *exception)
{
Modified: team/kpfleming/vldtmf/apps/app_dictate.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_dictate.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_dictate.c (original)
+++ team/kpfleming/vldtmf/apps/app_dictate.c Fri Feb 17 19:26:29 2006
@@ -52,8 +52,6 @@
static char *desc = " Dictate([<base_dir>[|<filename>]])\n"
"Start dictation machine using optional base dir for files.\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
typedef enum {
Modified: team/kpfleming/vldtmf/apps/app_directed_pickup.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_directed_pickup.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_directed_pickup.c (original)
+++ team/kpfleming/vldtmf/apps/app_directed_pickup.c Fri Feb 17 19:26:29 2006
@@ -49,8 +49,6 @@
" Pickup(extension[@context][&extension2 at context...]): This application can pickup any ringing channel\n"
"that is calling the specified extension. If no context is specified, the current\n"
"context will be used.\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_directory.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_directory.c (original)
+++ team/kpfleming/vldtmf/apps/app_directory.c Fri Feb 17 19:26:29 2006
@@ -75,8 +75,6 @@
/* How many digits to read in */
#define NUMDIGITS 3
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_disa.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_disa.c (original)
+++ team/kpfleming/vldtmf/apps/app_disa.c Fri Feb 17 19:26:29 2006
@@ -97,8 +97,6 @@
"exists in the context, it will be used. Also, if you set the 5th argument\n"
"to 'NOANSWER', the DISA application will not answer initially.\n";
-STANDARD_LOCAL_USER;
-
LOCAL_USER_DECL;
static void play_dialtone(struct ast_channel *chan, char *mailbox)
Modified: team/kpfleming/vldtmf/apps/app_dumpchan.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_dumpchan.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_dumpchan.c (original)
+++ team/kpfleming/vldtmf/apps/app_dumpchan.c Fri Feb 17 19:26:29 2006
@@ -55,8 +55,6 @@
"variables. If min_verbose_level is specified, output is only\n"
"displayed when the verbose level is currently set to that number\n"
"or greater. \n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_echo.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_echo.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_echo.c (original)
+++ team/kpfleming/vldtmf/apps/app_echo.c Fri Feb 17 19:26:29 2006
@@ -51,8 +51,6 @@
" Echo(): This application will echo any audio, video, or DTMF frames read from\n"
"the calling channel back to itself. If the DTMF digit '#' is received, the\n"
"application will exit.\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_exec.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_exec.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_exec.c (original)
+++ team/kpfleming/vldtmf/apps/app_exec.c Fri Feb 17 19:26:29 2006
@@ -55,8 +55,6 @@
"hardcoded into the dialplan. To invoke external applications\n"
"see the application System. Returns whatever value the\n"
"app returns or a non-zero value if the app cannot be found.\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_externalivr.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_externalivr.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_externalivr.c (original)
+++ team/kpfleming/vldtmf/apps/app_externalivr.c Fri Feb 17 19:26:29 2006
@@ -85,7 +85,6 @@
};
LOCAL_USER_DECL;
-STANDARD_LOCAL_USER;
struct gen_state {
struct ivr_localuser *u;
@@ -268,6 +267,7 @@
AST_LIST_HEAD_INIT(&u->playlist);
AST_LIST_HEAD_INIT(&u->finishlist);
u->abort_current_sound = 0;
+ u->chan = chan;
if (ast_strlen_zero(args)) {
ast_log(LOG_WARNING, "ExternalIVR requires a command to execute\n");
Modified: team/kpfleming/vldtmf/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_festival.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_festival.c (original)
+++ team/kpfleming/vldtmf/apps/app_festival.c Fri Feb 17 19:26:29 2006
@@ -68,8 +68,6 @@
" Festival(text[|intkeys]): Connect to Festival, send the argument, get back the waveform,"
"play it to the user, allowing any given interrupt keys to immediately terminate and return\n"
"the value, or 'any' to allow any number back (useful in dialplan)\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_flash.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_flash.c (original)
+++ team/kpfleming/vldtmf/apps/app_flash.c Fri Feb 17 19:26:29 2006
@@ -60,8 +60,6 @@
" Flash(): Sends a flash on a zap trunk. This is only a hack for\n"
"people who want to perform transfers and such via AGI and is generally\n"
"quite useless oths application will only work on Zap trunks.\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_forkcdr.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_forkcdr.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_forkcdr.c (original)
+++ team/kpfleming/vldtmf/apps/app_forkcdr.c Fri Feb 17 19:26:29 2006
@@ -51,9 +51,6 @@
"cdr record starting from the time of the fork call\n"
"If the option 'v' is passed all cdr variables will be passed along also.\n"
"";
-
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_getcpeid.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_getcpeid.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_getcpeid.c (original)
+++ team/kpfleming/vldtmf/apps/app_getcpeid.c Fri Feb 17 19:26:29 2006
@@ -52,8 +52,6 @@
static char *descrip =
" GetCPEID: Obtains and displays ADSI CPE ID and other information in order\n"
"to properly setup zapata.conf for on-hook operations.\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_hasnewvoicemail.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_hasnewvoicemail.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_hasnewvoicemail.c (original)
+++ team/kpfleming/vldtmf/apps/app_hasnewvoicemail.c Fri Feb 17 19:26:29 2006
@@ -78,8 +78,6 @@
" HASVMSTATUS The result of the new voicemail check returned as a text string as follows\n"
" <# of messages in the folder, 0 for NONE>\n";
-STANDARD_LOCAL_USER;
-
LOCAL_USER_DECL;
static int hasvoicemail_internal(char *context, char *box, char *folder)
Modified: team/kpfleming/vldtmf/apps/app_ices.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_ices.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_ices.c (original)
+++ team/kpfleming/vldtmf/apps/app_ices.c Fri Feb 17 19:26:29 2006
@@ -60,8 +60,6 @@
" ICES(config.xml) Streams to an icecast server using ices\n"
"(available separately). A configuration file must be supplied\n"
"for ices (see examples/asterisk-ices.conf). \n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_image.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_image.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_image.c (original)
+++ team/kpfleming/vldtmf/apps/app_image.c Fri Feb 17 19:26:29 2006
@@ -60,8 +60,6 @@
"This application sets the following channel variable upon completion:\n"
" SENDIMAGESTATUS The status is the result of the attempt as a text string, one of\n"
" OK | NOSUPPORT \n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_ivrdemo.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_ivrdemo.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_ivrdemo.c (original)
+++ team/kpfleming/vldtmf/apps/app_ivrdemo.c Fri Feb 17 19:26:29 2006
@@ -84,8 +84,6 @@
{ NULL },
});
-STANDARD_LOCAL_USER;
-
LOCAL_USER_DECL;
static int skel_exec(struct ast_channel *chan, void *data)
Modified: team/kpfleming/vldtmf/apps/app_lookupblacklist.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_lookupblacklist.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_lookupblacklist.c (original)
+++ team/kpfleming/vldtmf/apps/app_lookupblacklist.c Fri Feb 17 19:26:29 2006
@@ -62,8 +62,6 @@
" LOOKUPBLSTATUS The status of the Blacklist lookup as a text string, one of\n"
" FOUND | NOTFOUND\n"
"Example: exten => 1234,1,LookupBlacklist()\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_lookupcidname.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_lookupcidname.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_lookupcidname.c (original)
+++ team/kpfleming/vldtmf/apps/app_lookupcidname.c Fri Feb 17 19:26:29 2006
@@ -59,8 +59,6 @@
"name delivery, or if you want to change the names on some incoming\n"
"calls.\n";
-STANDARD_LOCAL_USER;
-
LOCAL_USER_DECL;
static int
Modified: team/kpfleming/vldtmf/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_macro.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_macro.c (original)
+++ team/kpfleming/vldtmf/apps/app_macro.c Fri Feb 17 19:26:29 2006
@@ -84,8 +84,6 @@
static char *synopsis = "Macro Implementation";
static char *if_synopsis = "Conditional Macro Implementation";
static char *exit_synopsis = "Exit From Macro";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_meetme.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_meetme.c (original)
+++ team/kpfleming/vldtmf/apps/app_meetme.c Fri Feb 17 19:26:29 2006
@@ -131,8 +131,6 @@
"";
#define CONFIG_FILE_NAME "meetme.conf"
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_milliwatt.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_milliwatt.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_milliwatt.c (original)
+++ team/kpfleming/vldtmf/apps/app_milliwatt.c Fri Feb 17 19:26:29 2006
@@ -51,8 +51,6 @@
static char *descrip =
"Milliwatt(): Generate a Constant 1000Hz tone at 0dbm (mu-law)\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_mixmonitor.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_mixmonitor.c (original)
+++ team/kpfleming/vldtmf/apps/app_mixmonitor.c Fri Feb 17 19:26:29 2006
@@ -80,7 +80,13 @@
"The variable MIXMONITOR_FILENAME will contain the filename used to record.\n"
"";
-STANDARD_LOCAL_USER;
+static const char *stop_app = "StopMixMonitor";
+static const char *stop_synopsis = "Stop recording a call through MixMonitor";
+static const char *stop_desc = ""
+" StopMixMonitor()\n\n"
+"Stops the audio recording that was started with a call to MixMonitor()\n"
+"on the current channel.\n"
+"";
LOCAL_USER_DECL;
@@ -399,6 +405,25 @@
return 0;
}
+static int stop_mixmonitor_exec(struct ast_channel *chan, void *data)
+{
+ struct localuser *u;
+
+ LOCAL_USER_ADD(u);
+
+ if (!ast_mutex_lock(&chan->lock)) {
+ ast_channel_spy_stop_by_type(chan, mixmonitor_spy_type);
+ ast_mutex_unlock(&chan->lock);
+ } else {
+ ast_log(LOG_WARNING, "Could not lock %s to stop MixMonitor on it\n",
+ chan->name);
+ }
+
+ LOCAL_USER_REMOVE(u);
+
+ return 0;
+}
+
static int mixmonitor_cli(int fd, int argc, char **argv)
{
struct ast_channel *chan;
@@ -421,20 +446,27 @@
return RESULT_SUCCESS;
}
+static char *complete_mixmonitor_cli(const char *line, const char *word, int pos, int state)
+{
+ return ast_complete_channels(line, word, pos, state, 2);
+}
static struct ast_cli_entry cli_mixmonitor = {
{ "mixmonitor", NULL, NULL },
mixmonitor_cli,
- "Execute a MixMonitor command",
- "mixmonitor <start|stop> <chan_name> [<args>]\n"
+ "Execute a MixMonitor command.",
+ "mixmonitor <start|stop> <chan_name> [args]\n\n"
+ "The optional arguments are passed to the\n"
+ "MixMonitor application when the 'start' command is used.\n",
+ complete_mixmonitor_cli
};
-
int unload_module(void)
{
int res;
res = ast_cli_unregister(&cli_mixmonitor);
+ res |= ast_unregister_application(stop_app);
res |= ast_unregister_application(app);
STANDARD_HANGUP_LOCALUSERS;
@@ -448,6 +480,7 @@
res = ast_cli_register(&cli_mixmonitor);
res |= ast_register_application(app, mixmonitor_exec, synopsis, desc);
+ res |= ast_register_application(stop_app, stop_mixmonitor_exec, stop_synopsis, stop_desc);
return res;
}
Modified: team/kpfleming/vldtmf/apps/app_morsecode.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_morsecode.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_morsecode.c (original)
+++ team/kpfleming/vldtmf/apps/app_morsecode.c Fri Feb 17 19:26:29 2006
@@ -53,8 +53,6 @@
"MORSEDITLEN is set, it will use that value for the length (in ms) of the dit\n"
"(defaults to 80). Additionally, if MORSETONE is set, it will use that tone\n"
"(in Hz). The tone default is 800.\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_mp3.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_mp3.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_mp3.c (original)
+++ team/kpfleming/vldtmf/apps/app_mp3.c Fri Feb 17 19:26:29 2006
@@ -59,8 +59,6 @@
" MP3Player(location) Executes mpg123 to play the given location,\n"
"which typically would be a filename or a URL. User can exit by pressing\n"
"any key on the dialpad, or by hanging up.";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_nbscat.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_nbscat.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_nbscat.c (original)
+++ team/kpfleming/vldtmf/apps/app_nbscat.c Fri Feb 17 19:26:29 2006
@@ -63,8 +63,6 @@
static char *descrip =
" NBScat: Executes nbscat to listen to the local NBS stream.\n"
"User can exit by pressing any key\n.";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_osplookup.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_osplookup.c (original)
+++ team/kpfleming/vldtmf/apps/app_osplookup.c Fri Feb 17 19:26:29 2006
@@ -95,8 +95,6 @@
"This application sets the following channel variable upon completion:\n"
" OSPFINISHSTATUS The status of the OSP Finish attempt as a text string, one of\n"
" SUCCESS | FAILED \n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_page.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_page.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_page.c (original)
+++ team/kpfleming/vldtmf/apps/app_page.c Fri Feb 17 19:26:29 2006
@@ -59,8 +59,6 @@
"destroyed when the original caller leaves. Valid options are:\n"
" d - full duplex audio\n"
" q - quiet, do not play beep to caller\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_parkandannounce.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_parkandannounce.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_parkandannounce.c (original)
+++ team/kpfleming/vldtmf/apps/app_parkandannounce.c Fri Feb 17 19:26:29 2006
@@ -74,9 +74,6 @@
"The variable ${PARKEDAT} will contain the parking extension into which the\n"
"call was placed. Use with the Local channel to allow the dialplan to make\n"
"use of this information.\n";
-
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_playback.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_playback.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_playback.c (original)
+++ team/kpfleming/vldtmf/apps/app_playback.c Fri Feb 17 19:26:29 2006
@@ -65,8 +65,6 @@
" PLAYBACKSTATUS The status of the playback attempt as a text string, one of\n"
" SUCCESS | FAILED\n"
;
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_privacy.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_privacy.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_privacy.c (original)
+++ team/kpfleming/vldtmf/apps/app_privacy.c Fri Feb 17 19:26:29 2006
@@ -76,11 +76,7 @@
" SUCCESS | FAILED \n"
;
-STANDARD_LOCAL_USER;
-
LOCAL_USER_DECL;
-
-
static int privacy_exec (struct ast_channel *chan, void *data)
{
Modified: team/kpfleming/vldtmf/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_queue.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_queue.c (original)
+++ team/kpfleming/vldtmf/apps/app_queue.c Fri Feb 17 19:26:29 2006
@@ -272,8 +272,6 @@
struct member *member;
};
-STANDARD_LOCAL_USER;
-
LOCAL_USER_DECL;
struct queue_ent {
@@ -326,6 +324,7 @@
unsigned int joinempty:2;
unsigned int eventwhencalled:1;
unsigned int leavewhenempty:2;
+ unsigned int ringinuse:1;
unsigned int reportholdtime:1;
unsigned int wrapped:1;
unsigned int timeoutrestart:1;
@@ -575,6 +574,7 @@
q->announceholdtime = 0;
q->roundingseconds = 0; /* Default - don't announce seconds */
q->servicelevel = 0;
+ q->ringinuse = 1;
q->moh[0] = '\0';
q->announce[0] = '\0';
q->context[0] = '\0';
@@ -626,6 +626,8 @@
q->timeout = atoi(val);
if (q->timeout < 0)
q->timeout = DEFAULT_TIMEOUT;
+ } else if (!strcasecmp(param, "ringinuse")) {
+ q->ringinuse = ast_true(val);
} else if (!strcasecmp(param, "monitor-join")) {
q->monjoin = ast_true(val);
} else if (!strcasecmp(param, "monitor-format")) {
@@ -1034,11 +1036,11 @@
q->count++;
res = 0;
manager_event(EVENT_FLAG_CALL, "Join",
- "Channel: %s\r\nCallerID: %s\r\nCallerIDName: %s\r\nQueue: %s\r\nPosition: %d\r\nCount: %d\r\n",
+ "Channel: %s\r\nCallerID: %s\r\nCallerIDName: %s\r\nQueue: %s\r\nPosition: %d\r\nCount: %d\r\nUniqueid: %s\r\n",
qe->chan->name,
qe->chan->cid.cid_num ? qe->chan->cid.cid_num : "unknown",
qe->chan->cid.cid_name ? qe->chan->cid.cid_name : "unknown",
- q->name, qe->pos, q->count );
+ q->name, qe->pos, q->count, qe->chan->uniqueid );
#if 0
ast_log(LOG_NOTICE, "Queue '%s' Join, Channel '%s', Position '%d'\n", q->name, qe->chan->name, qe->pos );
#endif
@@ -1378,7 +1380,16 @@
(*busies)++;
return 0;
}
-
+
+ if (!qe->parent->ringinuse && (tmp->member->status == AST_DEVICE_INUSE)) {
+ if (option_debug)
+ ast_log(LOG_DEBUG, "%s in use, can't receive call\n", tmp->interface);
+ if (qe->chan->cdr)
+ ast_cdr_busy(qe->chan->cdr);
+ tmp->stillgoing = 0;
+ return 0;
+ }
+
if (tmp->member->paused) {
if (option_debug)
ast_log(LOG_DEBUG, "%s paused, can't receive call\n", tmp->interface);
Modified: team/kpfleming/vldtmf/apps/app_random.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_random.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_random.c (original)
+++ team/kpfleming/vldtmf/apps/app_random.c Fri Feb 17 19:26:29 2006
@@ -51,8 +51,6 @@
"Random([probability]:[[context|]extension|]priority)\n"
" probability := INTEGER in the range 1 to 100\n"
"DEPRECATED: Use GotoIf($[${RAND(1,100)} > <number>]?<label>)\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_read.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_read.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_read.c (original)
+++ team/kpfleming/vldtmf/apps/app_read.c Fri Feb 17 19:26:29 2006
@@ -81,8 +81,6 @@
" event no data is entered.\n"
" timeout -- if greater than 0, that value will override the default timeout.\n\n"
"Read should disconnect if the function fails or errors out.\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_readfile.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_readfile.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_readfile.c (original)
+++ team/kpfleming/vldtmf/apps/app_readfile.c Fri Feb 17 19:26:29 2006
@@ -54,10 +54,7 @@
" File - The name of the file to read.\n"
" Length - Maximum number of characters to capture.\n";
-STANDARD_LOCAL_USER;
-
LOCAL_USER_DECL;
-
static int readfile_exec(struct ast_channel *chan, void *data)
{
Modified: team/kpfleming/vldtmf/apps/app_realtime.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_realtime.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_realtime.c (original)
+++ team/kpfleming/vldtmf/apps/app_realtime.c Fri Feb 17 19:26:29 2006
@@ -69,7 +69,6 @@
"updated to <newval>. REALTIMECOUNT will be set with the number of rows\n"
"updated or -1 if an error occurs.\n";
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
static int cli_load_realtime(int fd, int argc, char **argv)
Modified: team/kpfleming/vldtmf/apps/app_record.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/apps/app_record.c?rev=10431&r1=10430&r2=10431&view=diff
==============================================================================
--- team/kpfleming/vldtmf/apps/app_record.c (original)
+++ team/kpfleming/vldtmf/apps/app_record.c Fri Feb 17 19:26:29 2006
@@ -71,8 +71,6 @@
"User can press '#' to terminate the recording and continue to the next priority.\n\n"
"If the user should hangup during a recording, all data will be lost and the\n"
"application will teminate. \n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/kpfleming/vldtmf/apps/app_rpt.c
[... 2072 lines stripped ...]
More information about the asterisk-commits
mailing list