[asterisk-commits] branch oej/rtcp r10657 - in /team/oej/rtcp: ./
apps/ channels/ channels/misdn...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue Feb 21 12:21:00 MST 2006
Author: oej
Date: Tue Feb 21 13:19:51 2006
New Revision: 10657
URL: http://svn.digium.com/view/asterisk?rev=10657&view=rev
Log:
Update to current head
Modified:
team/oej/rtcp/ (props changed)
team/oej/rtcp/.cleancount
team/oej/rtcp/Makefile
team/oej/rtcp/UPGRADE.txt
team/oej/rtcp/app.c
team/oej/rtcp/apps/app_adsiprog.c
team/oej/rtcp/apps/app_alarmreceiver.c
team/oej/rtcp/apps/app_amd.c
team/oej/rtcp/apps/app_authenticate.c
team/oej/rtcp/apps/app_cdr.c
team/oej/rtcp/apps/app_chanisavail.c
team/oej/rtcp/apps/app_chanspy.c
team/oej/rtcp/apps/app_controlplayback.c
team/oej/rtcp/apps/app_curl.c
team/oej/rtcp/apps/app_db.c
team/oej/rtcp/apps/app_dial.c
team/oej/rtcp/apps/app_dictate.c
team/oej/rtcp/apps/app_directed_pickup.c
team/oej/rtcp/apps/app_directory.c
team/oej/rtcp/apps/app_disa.c
team/oej/rtcp/apps/app_dumpchan.c
team/oej/rtcp/apps/app_echo.c
team/oej/rtcp/apps/app_exec.c
team/oej/rtcp/apps/app_externalivr.c
team/oej/rtcp/apps/app_festival.c
team/oej/rtcp/apps/app_flash.c
team/oej/rtcp/apps/app_forkcdr.c
team/oej/rtcp/apps/app_getcpeid.c
team/oej/rtcp/apps/app_hasnewvoicemail.c
team/oej/rtcp/apps/app_ices.c
team/oej/rtcp/apps/app_image.c
team/oej/rtcp/apps/app_ivrdemo.c
team/oej/rtcp/apps/app_lookupblacklist.c
team/oej/rtcp/apps/app_lookupcidname.c
team/oej/rtcp/apps/app_macro.c
team/oej/rtcp/apps/app_meetme.c
team/oej/rtcp/apps/app_milliwatt.c
team/oej/rtcp/apps/app_mixmonitor.c
team/oej/rtcp/apps/app_morsecode.c
team/oej/rtcp/apps/app_mp3.c
team/oej/rtcp/apps/app_nbscat.c
team/oej/rtcp/apps/app_osplookup.c
team/oej/rtcp/apps/app_page.c
team/oej/rtcp/apps/app_parkandannounce.c
team/oej/rtcp/apps/app_playback.c
team/oej/rtcp/apps/app_privacy.c
team/oej/rtcp/apps/app_queue.c
team/oej/rtcp/apps/app_random.c
team/oej/rtcp/apps/app_read.c
team/oej/rtcp/apps/app_readfile.c
team/oej/rtcp/apps/app_realtime.c
team/oej/rtcp/apps/app_record.c
team/oej/rtcp/apps/app_rpt.c
team/oej/rtcp/apps/app_sayunixtime.c
team/oej/rtcp/apps/app_senddtmf.c
team/oej/rtcp/apps/app_sendtext.c
team/oej/rtcp/apps/app_setcallerid.c
team/oej/rtcp/apps/app_setcdruserfield.c
team/oej/rtcp/apps/app_settransfercapability.c
team/oej/rtcp/apps/app_skel.c
team/oej/rtcp/apps/app_sms.c
team/oej/rtcp/apps/app_softhangup.c
team/oej/rtcp/apps/app_stack.c
team/oej/rtcp/apps/app_system.c
team/oej/rtcp/apps/app_talkdetect.c
team/oej/rtcp/apps/app_test.c
team/oej/rtcp/apps/app_transfer.c
team/oej/rtcp/apps/app_url.c
team/oej/rtcp/apps/app_userevent.c
team/oej/rtcp/apps/app_verbose.c
team/oej/rtcp/apps/app_voicemail.c
team/oej/rtcp/apps/app_waitforring.c
team/oej/rtcp/apps/app_waitforsilence.c
team/oej/rtcp/apps/app_while.c
team/oej/rtcp/apps/app_zapateller.c
team/oej/rtcp/apps/app_zapbarge.c
team/oej/rtcp/apps/app_zapras.c
team/oej/rtcp/apps/app_zapscan.c
team/oej/rtcp/asterisk.c
team/oej/rtcp/astmm.c
team/oej/rtcp/autoservice.c
team/oej/rtcp/callerid.c
team/oej/rtcp/cdr.c
team/oej/rtcp/channel.c
team/oej/rtcp/channels/chan_agent.c
team/oej/rtcp/channels/chan_iax2.c
team/oej/rtcp/channels/chan_misdn.c
team/oej/rtcp/channels/chan_sip.c
team/oej/rtcp/channels/chan_zap.c
team/oej/rtcp/channels/misdn/chan_misdn_config.h
team/oej/rtcp/channels/misdn/isdn_lib.c
team/oej/rtcp/channels/misdn/isdn_lib.h
team/oej/rtcp/channels/misdn_config.c
team/oej/rtcp/chanvars.c
team/oej/rtcp/cli.c
team/oej/rtcp/config.c
team/oej/rtcp/configs/amd.conf.sample
team/oej/rtcp/configs/misdn.conf.sample
team/oej/rtcp/configs/queues.conf.sample
team/oej/rtcp/dnsmgr.c
team/oej/rtcp/doc/asterisk-conf.txt
team/oej/rtcp/doc/channelvariables.txt
team/oej/rtcp/file.c
team/oej/rtcp/formats/format_au.c
team/oej/rtcp/formats/format_g723.c
team/oej/rtcp/formats/format_g726.c
team/oej/rtcp/formats/format_g729.c
team/oej/rtcp/formats/format_gsm.c
team/oej/rtcp/formats/format_h263.c
team/oej/rtcp/formats/format_ilbc.c
team/oej/rtcp/formats/format_ogg_vorbis.c
team/oej/rtcp/formats/format_pcm.c
team/oej/rtcp/formats/format_pcm_alaw.c
team/oej/rtcp/formats/format_sln.c
team/oej/rtcp/formats/format_vox.c
team/oej/rtcp/formats/format_wav.c
team/oej/rtcp/formats/format_wav_gsm.c
team/oej/rtcp/funcs/func_channel.c (contents, props changed)
team/oej/rtcp/funcs/func_cut.c
team/oej/rtcp/funcs/func_enum.c
team/oej/rtcp/funcs/func_rand.c
team/oej/rtcp/funcs/func_sha1.c
team/oej/rtcp/funcs/func_strings.c
team/oej/rtcp/include/asterisk.h
team/oej/rtcp/include/asterisk/cdr.h
team/oej/rtcp/include/asterisk/channel.h
team/oej/rtcp/include/asterisk/cli.h
team/oej/rtcp/include/asterisk/config.h
team/oej/rtcp/include/asterisk/file.h
team/oej/rtcp/include/asterisk/linkedlists.h
team/oej/rtcp/include/asterisk/module.h
team/oej/rtcp/include/asterisk/rtp.h
team/oej/rtcp/include/asterisk/strings.h
team/oej/rtcp/include/asterisk/translate.h
team/oej/rtcp/jitterbuf.c
team/oej/rtcp/loader.c
team/oej/rtcp/logger.c
team/oej/rtcp/pbx.c
team/oej/rtcp/pbx/pbx_dundi.c
team/oej/rtcp/res/Makefile
team/oej/rtcp/res/res_agi.c
team/oej/rtcp/res/res_config_odbc.c
team/oej/rtcp/res/res_features.c
team/oej/rtcp/res/res_odbc.c
team/oej/rtcp/rtp.c
team/oej/rtcp/utils.c
Propchange: team/oej/rtcp/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/oej/rtcp/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/rtcp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb 21 13:19:51 2006
@@ -1,1 +1,1 @@
-/trunk:1-10076
+/trunk:1-10652
Modified: team/oej/rtcp/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/.cleancount?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/.cleancount (original)
+++ team/oej/rtcp/.cleancount Tue Feb 21 13:19:51 2006
@@ -1,1 +1,1 @@
-10
+11
Modified: team/oej/rtcp/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/Makefile?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/Makefile (original)
+++ team/oej/rtcp/Makefile Tue Feb 21 13:19:51 2006
@@ -147,6 +147,9 @@
ASTCFLAGS=
+# Define this to use files larger than 2GB (useful for sound files longer than 37 hours and logfiles)
+ASTCFLAGS+=-D_FILE_OFFSET_BITS=64
+
# Pentium Pro Optimize
#PROC=i686
@@ -418,8 +421,6 @@
else
HAVEDOT=no
endif
-
-LIBS+=-lssl
INSTALL=install
Modified: team/oej/rtcp/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/UPGRADE.txt?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/UPGRADE.txt (original)
+++ team/oej/rtcp/UPGRADE.txt Tue Feb 21 13:19:51 2006
@@ -1,5 +1,12 @@
Information for Upgrading From Previous Asterisk Releases
=========================================================
+
+Command Line Interface:
+
+* 'show channels concise', designed to be used by applications that will parse
+ its output, previously used ':' characters to separate fields. However, some
+ of those fields can easily contain that character, making the output not
+ parseable. The delimiter has been changed to '!'.
Applications:
@@ -40,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/oej/rtcp/app.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/app.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/app.c (original)
+++ team/oej/rtcp/app.c Tue Feb 21 13:19:51 2006
@@ -594,7 +594,7 @@
while((fmt = strsep(&stringp, "|"))) {
if (fmtcnt > MAX_OTHER_FORMATS - 1) {
- ast_log(LOG_WARNING, "Please increase MAX_OTHER_FORMATS in app_voicemail.c\n");
+ ast_log(LOG_WARNING, "Please increase MAX_OTHER_FORMATS in app.c\n");
break;
}
sfmt[fmtcnt++] = ast_strdupa(fmt);
@@ -824,7 +824,7 @@
while((fmt = strsep(&stringp, "|"))) {
if (fmtcnt > MAX_OTHER_FORMATS - 1) {
- ast_log(LOG_WARNING, "Please increase MAX_OTHER_FORMATS in app_voicemail.c\n");
+ ast_log(LOG_WARNING, "Please increase MAX_OTHER_FORMATS in app.c\n");
break;
}
sfmt[fmtcnt++] = ast_strdupa(fmt);
@@ -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/oej/rtcp/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_adsiprog.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_adsiprog.c (original)
+++ team/oej/rtcp/apps/app_adsiprog.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_alarmreceiver.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_alarmreceiver.c (original)
+++ team/oej/rtcp/apps/app_alarmreceiver.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_amd.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_amd.c (original)
+++ team/oej/rtcp/apps/app_amd.c Tue Feb 21 13:19:51 2006
@@ -60,17 +60,15 @@
"This application sets the following channel variable upon completion:\n"
" AMDSTATUS - This is the status of the answering machine detection.\n"
" Possible values are:\n"
-" AMD_MACHINE | AMD_PERSON | AMD_NOTSURE | AMD_HANGUP\n"
+" MACHINE | HUMAN | NOTSURE | HANGUP\n"
" AMDCAUSE - Indicates the cause that led to the conclusion.\n"
" Possible values are:\n"
-" AMD_TOOLONG-<%d total_time>\n"
-" AMD_INITIALSILENCE-<%d silenceDuration>-<%d initialSilence>\n"
-" AMD_HUMAN-<%d silenceDuration>-<%d afterGreetingSilence>\n"
-" AMD_MAXWORDS-<%d wordsCount>-<%d maximumNumberOfWords>\n"
-" AMD_LONGGREETING-<%d voiceDuration>-<%d greeting>\n";
-
-
-STANDARD_LOCAL_USER;
+" TOOLONG-<%d total_time>\n"
+" INITIALSILENCE-<%d silenceDuration>-<%d initialSilence>\n"
+" HUMAN-<%d silenceDuration>-<%d afterGreetingSilence>\n"
+" MAXWORDS-<%d wordsCount>-<%d maximumNumberOfWords>\n"
+" LONGGREETING-<%d voiceDuration>-<%d greeting>\n";
+
LOCAL_USER_DECL;
@@ -96,6 +94,7 @@
struct ast_dsp *silenceDetector; /* silence detector dsp */
int dspsilence = 0;
int readFormat;
+ int framelength;
int inInitialSilence = 1;
int inGreeting = 0;
@@ -208,16 +207,17 @@
/* No Frame: Called Party Must Have Dropped */
ast_verbose(VERBOSE_PREFIX_3 "AMD: HANGUP\n");
ast_log(LOG_DEBUG, "Got hangup\n");
- strcpy(amdStatus , "AMD_HANGUP" );
+ strcpy(amdStatus , "HANGUP" );
strcpy(amdCause , "" );
break;
}
- iTotalTime += 20;
+ framelength = (ast_codec_get_samples(f) / 8);
+ iTotalTime += framelength;
if (iTotalTime >= totalAnalysisTime ) {
ast_verbose(VERBOSE_PREFIX_3 "AMD: Channel [%s]. Too long...\n", chan->name );
ast_frfree(f);
- strcpy(amdStatus , "AMD_NOTSURE" );
- sprintf(amdCause , "AMD_TOOLONG-%d", iTotalTime );
+ strcpy(amdStatus , "NOTSURE" );
+ sprintf(amdCause , "TOOLONG-%d", iTotalTime );
break;
}
if (f->frametype == AST_FRAME_VOICE ) {
@@ -238,8 +238,8 @@
ast_verbose(VERBOSE_PREFIX_3 "AMD: ANSWERING MACHINE: silenceDuration:%d initialSilence:%d\n",
silenceDuration, initialSilence );
ast_frfree(f);
- strcpy(amdStatus , "AMD_MACHINE" );
- sprintf(amdCause , "AMD_INITIALSILENCE-%d-%d", silenceDuration, initialSilence );
+ strcpy(amdStatus , "MACHINE" );
+ sprintf(amdCause , "INITIALSILENCE-%d-%d", silenceDuration, initialSilence );
break;
}
@@ -247,13 +247,13 @@
ast_verbose(VERBOSE_PREFIX_3 "AMD: HUMAN: silenceDuration:%d afterGreetingSilence:%d\n",
silenceDuration, afterGreetingSilence );
ast_frfree(f);
- strcpy(amdStatus , "AMD_PERSON" );
- sprintf(amdCause , "AMD_HUMAN-%d-%d", silenceDuration, afterGreetingSilence );
+ strcpy(amdStatus , "HUMAN" );
+ sprintf(amdCause , "HUMAN-%d-%d", silenceDuration, afterGreetingSilence );
break;
}
} else {
- consecutiveVoiceDuration += 20;
- voiceDuration += 20;
+ consecutiveVoiceDuration += framelength;
+ voiceDuration += framelength;
/* ast_verbose(VERBOSE_PREFIX_3 "AMD: %d VOICE: ConsecutiveVoice:%d voiceDuration:%d inGreeting:%d\n", currentState, consecutiveVoiceDuration, voiceDuration, inGreeting ); */
/* If I have enough consecutive voice to say that I am in a Word, I can only increment the
@@ -270,8 +270,8 @@
if (iWordsCount >= maximumNumberOfWords ) {
ast_verbose(VERBOSE_PREFIX_3 "AMD: ANSWERING MACHINE: iWordsCount:%d\n", iWordsCount );
ast_frfree(f);
- strcpy(amdStatus , "AMD_MACHINE" );
- sprintf(amdCause , "AMD_MAXWORDS-%d-%d", iWordsCount, maximumNumberOfWords );
+ strcpy(amdStatus , "MACHINE" );
+ sprintf(amdCause , "MAXWORDS-%d-%d", iWordsCount, maximumNumberOfWords );
break;
}
@@ -279,8 +279,8 @@
ast_verbose(VERBOSE_PREFIX_3 "AMD: ANSWERING MACHINE: voiceDuration:%d greeting:%d\n",
voiceDuration, greeting );
ast_frfree(f);
- strcpy(amdStatus , "AMD_MACHINE" );
- sprintf(amdCause , "AMD_LONGGREETING-%d-%d", voiceDuration, greeting );
+ strcpy(amdStatus , "MACHINE" );
+ sprintf(amdCause , "LONGGREETING-%d-%d", voiceDuration, greeting );
break;
}
if (voiceDuration >= minimumWordLength ) {
Modified: team/oej/rtcp/apps/app_authenticate.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_authenticate.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_authenticate.c (original)
+++ team/oej/rtcp/apps/app_authenticate.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_cdr.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_cdr.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_cdr.c (original)
+++ team/oej/rtcp/apps/app_cdr.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_chanisavail.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_chanisavail.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_chanisavail.c (original)
+++ team/oej/rtcp/apps/app_chanisavail.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_chanspy.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_chanspy.c (original)
+++ team/oej/rtcp/apps/app_chanspy.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_controlplayback.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_controlplayback.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_controlplayback.c (original)
+++ team/oej/rtcp/apps/app_controlplayback.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_curl.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_curl.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_curl.c (original)
+++ team/oej/rtcp/apps/app_curl.c Tue Feb 21 13:19:51 2006
@@ -49,8 +49,6 @@
#include "asterisk/utils.h"
static char *tdesc = "Load external URL";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/oej/rtcp/apps/app_db.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_db.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_db.c (original)
+++ team/oej/rtcp/apps/app_db.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_dial.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_dial.c (original)
+++ team/oej/rtcp/apps/app_dial.c Tue Feb 21 13:19:51 2006
@@ -271,7 +271,6 @@
};
LOCAL_USER_DECL;
-STANDARD_LOCAL_USER;
static void hanguptree(struct dial_localuser *outgoing, struct ast_channel *exception)
{
Modified: team/oej/rtcp/apps/app_dictate.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_dictate.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_dictate.c (original)
+++ team/oej/rtcp/apps/app_dictate.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_directed_pickup.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_directed_pickup.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_directed_pickup.c (original)
+++ team/oej/rtcp/apps/app_directed_pickup.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_directory.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_directory.c (original)
+++ team/oej/rtcp/apps/app_directory.c Tue Feb 21 13:19:51 2006
@@ -75,8 +75,6 @@
/* How many digits to read in */
#define NUMDIGITS 3
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/oej/rtcp/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_disa.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_disa.c (original)
+++ team/oej/rtcp/apps/app_disa.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_dumpchan.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_dumpchan.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_dumpchan.c (original)
+++ team/oej/rtcp/apps/app_dumpchan.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_echo.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_echo.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_echo.c (original)
+++ team/oej/rtcp/apps/app_echo.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_exec.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_exec.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_exec.c (original)
+++ team/oej/rtcp/apps/app_exec.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_externalivr.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_externalivr.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_externalivr.c (original)
+++ team/oej/rtcp/apps/app_externalivr.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_festival.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_festival.c (original)
+++ team/oej/rtcp/apps/app_festival.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_flash.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_flash.c (original)
+++ team/oej/rtcp/apps/app_flash.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_forkcdr.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_forkcdr.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_forkcdr.c (original)
+++ team/oej/rtcp/apps/app_forkcdr.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_getcpeid.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_getcpeid.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_getcpeid.c (original)
+++ team/oej/rtcp/apps/app_getcpeid.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_hasnewvoicemail.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_hasnewvoicemail.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_hasnewvoicemail.c (original)
+++ team/oej/rtcp/apps/app_hasnewvoicemail.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_ices.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_ices.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_ices.c (original)
+++ team/oej/rtcp/apps/app_ices.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_image.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_image.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_image.c (original)
+++ team/oej/rtcp/apps/app_image.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_ivrdemo.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_ivrdemo.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_ivrdemo.c (original)
+++ team/oej/rtcp/apps/app_ivrdemo.c Tue Feb 21 13:19:51 2006
@@ -84,8 +84,6 @@
{ NULL },
});
-STANDARD_LOCAL_USER;
-
LOCAL_USER_DECL;
static int skel_exec(struct ast_channel *chan, void *data)
Modified: team/oej/rtcp/apps/app_lookupblacklist.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_lookupblacklist.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_lookupblacklist.c (original)
+++ team/oej/rtcp/apps/app_lookupblacklist.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_lookupcidname.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_lookupcidname.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_lookupcidname.c (original)
+++ team/oej/rtcp/apps/app_lookupcidname.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_macro.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_macro.c (original)
+++ team/oej/rtcp/apps/app_macro.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_meetme.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_meetme.c (original)
+++ team/oej/rtcp/apps/app_meetme.c Tue Feb 21 13:19:51 2006
@@ -131,8 +131,6 @@
"";
#define CONFIG_FILE_NAME "meetme.conf"
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/oej/rtcp/apps/app_milliwatt.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_milliwatt.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_milliwatt.c (original)
+++ team/oej/rtcp/apps/app_milliwatt.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_mixmonitor.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_mixmonitor.c (original)
+++ team/oej/rtcp/apps/app_mixmonitor.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_morsecode.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_morsecode.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_morsecode.c (original)
+++ team/oej/rtcp/apps/app_morsecode.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_mp3.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_mp3.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_mp3.c (original)
+++ team/oej/rtcp/apps/app_mp3.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_nbscat.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_nbscat.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_nbscat.c (original)
+++ team/oej/rtcp/apps/app_nbscat.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_osplookup.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_osplookup.c (original)
+++ team/oej/rtcp/apps/app_osplookup.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_page.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_page.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_page.c (original)
+++ team/oej/rtcp/apps/app_page.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_parkandannounce.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_parkandannounce.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_parkandannounce.c (original)
+++ team/oej/rtcp/apps/app_parkandannounce.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_playback.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_playback.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_playback.c (original)
+++ team/oej/rtcp/apps/app_playback.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_privacy.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_privacy.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_privacy.c (original)
+++ team/oej/rtcp/apps/app_privacy.c Tue Feb 21 13:19:51 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/oej/rtcp/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/oej/rtcp/apps/app_queue.c?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- team/oej/rtcp/apps/app_queue.c (original)
+++ team/oej/rtcp/apps/app_queue.c Tue Feb 21 13:19:51 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;
[... 5083 lines stripped ...]
More information about the asterisk-commits
mailing list