[svn-commits] mmichelson: branch jrothenberger/asterisk-urgent r103804 - in /team/jrothenbe...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Feb 18 18:51:13 CST 2008
Author: mmichelson
Date: Mon Feb 18 18:51:11 2008
New Revision: 103804
URL: http://svn.digium.com/view/asterisk?view=rev&rev=103804
Log:
resolve, reset
Added:
team/jrothenberger/asterisk-urgent/UPGRADE-1.2.txt
- copied unchanged from r103802, trunk/UPGRADE-1.2.txt
team/jrothenberger/asterisk-urgent/UPGRADE-1.4.txt
- copied unchanged from r103802, trunk/UPGRADE-1.4.txt
team/jrothenberger/asterisk-urgent/main/features.c
- copied unchanged from r103802, trunk/main/features.c
Removed:
team/jrothenberger/asterisk-urgent/res/res_features.c
Modified:
team/jrothenberger/asterisk-urgent/ (props changed)
team/jrothenberger/asterisk-urgent/.cleancount
team/jrothenberger/asterisk-urgent/CHANGES
team/jrothenberger/asterisk-urgent/CREDITS
team/jrothenberger/asterisk-urgent/Makefile
team/jrothenberger/asterisk-urgent/UPGRADE.txt
team/jrothenberger/asterisk-urgent/apps/app_adsiprog.c
team/jrothenberger/asterisk-urgent/apps/app_alarmreceiver.c
team/jrothenberger/asterisk-urgent/apps/app_amd.c
team/jrothenberger/asterisk-urgent/apps/app_authenticate.c
team/jrothenberger/asterisk-urgent/apps/app_cdr.c
team/jrothenberger/asterisk-urgent/apps/app_chanisavail.c
team/jrothenberger/asterisk-urgent/apps/app_channelredirect.c
team/jrothenberger/asterisk-urgent/apps/app_chanspy.c
team/jrothenberger/asterisk-urgent/apps/app_controlplayback.c
team/jrothenberger/asterisk-urgent/apps/app_db.c
team/jrothenberger/asterisk-urgent/apps/app_dial.c
team/jrothenberger/asterisk-urgent/apps/app_dictate.c
team/jrothenberger/asterisk-urgent/apps/app_directed_pickup.c
team/jrothenberger/asterisk-urgent/apps/app_directory.c
team/jrothenberger/asterisk-urgent/apps/app_disa.c
team/jrothenberger/asterisk-urgent/apps/app_dumpchan.c
team/jrothenberger/asterisk-urgent/apps/app_echo.c
team/jrothenberger/asterisk-urgent/apps/app_exec.c
team/jrothenberger/asterisk-urgent/apps/app_externalivr.c
team/jrothenberger/asterisk-urgent/apps/app_followme.c
team/jrothenberger/asterisk-urgent/apps/app_meetme.c
team/jrothenberger/asterisk-urgent/apps/app_minivm.c
team/jrothenberger/asterisk-urgent/apps/app_playback.c
team/jrothenberger/asterisk-urgent/apps/app_privacy.c
team/jrothenberger/asterisk-urgent/apps/app_queue.c
team/jrothenberger/asterisk-urgent/apps/app_rpt.c
team/jrothenberger/asterisk-urgent/apps/app_speech_utils.c
team/jrothenberger/asterisk-urgent/apps/app_voicemail.c
team/jrothenberger/asterisk-urgent/apps/app_zapras.c
team/jrothenberger/asterisk-urgent/build_tools/cflags.xml
team/jrothenberger/asterisk-urgent/build_tools/make_defaults_h
team/jrothenberger/asterisk-urgent/build_tools/make_version
team/jrothenberger/asterisk-urgent/channels/chan_agent.c
team/jrothenberger/asterisk-urgent/channels/chan_h323.c
team/jrothenberger/asterisk-urgent/channels/chan_iax2.c
team/jrothenberger/asterisk-urgent/channels/chan_local.c
team/jrothenberger/asterisk-urgent/channels/chan_mgcp.c
team/jrothenberger/asterisk-urgent/channels/chan_misdn.c
team/jrothenberger/asterisk-urgent/channels/chan_sip.c
team/jrothenberger/asterisk-urgent/channels/chan_skinny.c
team/jrothenberger/asterisk-urgent/channels/chan_unistim.c
team/jrothenberger/asterisk-urgent/channels/chan_usbradio.c
team/jrothenberger/asterisk-urgent/channels/chan_zap.c
team/jrothenberger/asterisk-urgent/channels/misdn/chan_misdn_config.h
team/jrothenberger/asterisk-urgent/channels/misdn/ie.c
team/jrothenberger/asterisk-urgent/channels/misdn/isdn_lib.c
team/jrothenberger/asterisk-urgent/channels/misdn/isdn_lib.h
team/jrothenberger/asterisk-urgent/channels/misdn/isdn_msg_parser.c
team/jrothenberger/asterisk-urgent/channels/misdn/portinfo.c
team/jrothenberger/asterisk-urgent/channels/misdn_config.c
team/jrothenberger/asterisk-urgent/configs/cli.conf.sample
team/jrothenberger/asterisk-urgent/configs/extensions.ael.sample
team/jrothenberger/asterisk-urgent/configs/extensions.conf.sample
team/jrothenberger/asterisk-urgent/configs/extensions.lua.sample
team/jrothenberger/asterisk-urgent/configs/features.conf.sample
team/jrothenberger/asterisk-urgent/configs/queues.conf.sample
team/jrothenberger/asterisk-urgent/configs/res_odbc.conf.sample
team/jrothenberger/asterisk-urgent/configs/rtp.conf.sample
team/jrothenberger/asterisk-urgent/configs/zapata.conf.sample
team/jrothenberger/asterisk-urgent/configure
team/jrothenberger/asterisk-urgent/configure.ac
team/jrothenberger/asterisk-urgent/doc/tex/imapstorage.tex
team/jrothenberger/asterisk-urgent/funcs/func_cdr.c
team/jrothenberger/asterisk-urgent/funcs/func_channel.c
team/jrothenberger/asterisk-urgent/funcs/func_devstate.c
team/jrothenberger/asterisk-urgent/funcs/func_realtime.c
team/jrothenberger/asterisk-urgent/funcs/func_strings.c
team/jrothenberger/asterisk-urgent/include/asterisk/_private.h
team/jrothenberger/asterisk-urgent/include/asterisk/aes.h
team/jrothenberger/asterisk-urgent/include/asterisk/app.h
team/jrothenberger/asterisk-urgent/include/asterisk/autoconfig.h.in
team/jrothenberger/asterisk-urgent/include/asterisk/channel.h
team/jrothenberger/asterisk-urgent/include/asterisk/config.h
team/jrothenberger/asterisk-urgent/include/asterisk/dial.h
team/jrothenberger/asterisk-urgent/include/asterisk/event.h
team/jrothenberger/asterisk-urgent/include/asterisk/extconf.h
team/jrothenberger/asterisk-urgent/include/asterisk/features.h
team/jrothenberger/asterisk-urgent/include/asterisk/frame.h
team/jrothenberger/asterisk-urgent/include/asterisk/jabber.h
team/jrothenberger/asterisk-urgent/include/asterisk/pbx.h
team/jrothenberger/asterisk-urgent/include/asterisk/rtp.h
team/jrothenberger/asterisk-urgent/include/asterisk/sched.h
team/jrothenberger/asterisk-urgent/include/asterisk/strings.h
team/jrothenberger/asterisk-urgent/include/asterisk/time.h
team/jrothenberger/asterisk-urgent/main/Makefile
team/jrothenberger/asterisk-urgent/main/acl.c
team/jrothenberger/asterisk-urgent/main/app.c
team/jrothenberger/asterisk-urgent/main/ast_expr2f.c
team/jrothenberger/asterisk-urgent/main/asterisk.c
team/jrothenberger/asterisk-urgent/main/astmm.c
team/jrothenberger/asterisk-urgent/main/cdr.c
team/jrothenberger/asterisk-urgent/main/channel.c
team/jrothenberger/asterisk-urgent/main/cli.c
team/jrothenberger/asterisk-urgent/main/config.c
team/jrothenberger/asterisk-urgent/main/dial.c
team/jrothenberger/asterisk-urgent/main/dnsmgr.c
team/jrothenberger/asterisk-urgent/main/event.c
team/jrothenberger/asterisk-urgent/main/file.c
team/jrothenberger/asterisk-urgent/main/frame.c
team/jrothenberger/asterisk-urgent/main/indications.c
team/jrothenberger/asterisk-urgent/main/loader.c
team/jrothenberger/asterisk-urgent/main/logger.c
team/jrothenberger/asterisk-urgent/main/manager.c
team/jrothenberger/asterisk-urgent/main/pbx.c
team/jrothenberger/asterisk-urgent/main/rtp.c
team/jrothenberger/asterisk-urgent/main/slinfactory.c
team/jrothenberger/asterisk-urgent/main/tcptls.c
team/jrothenberger/asterisk-urgent/main/translate.c
team/jrothenberger/asterisk-urgent/main/udptl.c
team/jrothenberger/asterisk-urgent/main/utils.c
team/jrothenberger/asterisk-urgent/pbx/pbx_ael.c
team/jrothenberger/asterisk-urgent/pbx/pbx_dundi.c
team/jrothenberger/asterisk-urgent/res/res_agi.c
team/jrothenberger/asterisk-urgent/res/res_clioriginate.c
team/jrothenberger/asterisk-urgent/res/res_config_curl.c
team/jrothenberger/asterisk-urgent/res/res_config_ldap.c
team/jrothenberger/asterisk-urgent/res/res_jabber.c
team/jrothenberger/asterisk-urgent/res/res_monitor.c
team/jrothenberger/asterisk-urgent/res/res_musiconhold.c
team/jrothenberger/asterisk-urgent/res/res_odbc.c
team/jrothenberger/asterisk-urgent/res/res_phoneprov.c
team/jrothenberger/asterisk-urgent/utils/conf2ael.c
team/jrothenberger/asterisk-urgent/utils/muted.c
Propchange: team/jrothenberger/asterisk-urgent/
------------------------------------------------------------------------------
automerge = *
Propchange: team/jrothenberger/asterisk-urgent/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/jrothenberger/asterisk-urgent/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/jrothenberger/asterisk-urgent/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb 18 18:51:11 2008
@@ -1,1 +1,1 @@
-/trunk:1-99790
+/trunk:1-103803
Modified: team/jrothenberger/asterisk-urgent/.cleancount
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/.cleancount?view=diff&rev=103804&r1=103803&r2=103804
==============================================================================
--- team/jrothenberger/asterisk-urgent/.cleancount (original)
+++ team/jrothenberger/asterisk-urgent/.cleancount Mon Feb 18 18:51:11 2008
@@ -1,1 +1,1 @@
-33
+35
Modified: team/jrothenberger/asterisk-urgent/CHANGES
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/CHANGES?view=diff&rev=103804&r1=103803&r2=103804
==============================================================================
--- team/jrothenberger/asterisk-urgent/CHANGES (original)
+++ team/jrothenberger/asterisk-urgent/CHANGES Mon Feb 18 18:51:11 2008
@@ -39,6 +39,15 @@
Reporting privilege, instead of only under Call or System.
* The IAX* commands now require either System or Reporting privilege, to
mirror the privileges of the SIP* commands.
+ * Added ability to retrieve list of categories in a config file.
+ * Added ability to retrieve the content of a particular category.
+ * Added ability to empty a context.
+ * Created new action to create a new file.
+ * Updated delete action to allow deletion by line number with respect to category.
+ * Added new action insert to add new variable to category at specified line.
+ * Updated action newcat to allow new category to be inserted in file above another
+ existing category.
+ * Added new event "JitterBufStats" in the IAX2 channel
Dialplan functions
------------------
@@ -159,7 +168,7 @@
* Added separate settings for media QoS in mgcp.conf
Console Channel Driver changes
--------------------
+------------------------------
* Added experimental support for video send & receive to chan_oss.
This requires SDL and ffmpeg/avcodec, plus Video4Linux or X11 to act as
a video source.
@@ -356,6 +365,7 @@
direct options to the app.
* AMD() has a new "maximum word length" option. "show application AMD" from the CLI
for more details
+ * GotoIfTime() now may branch based on a "false" condition, like other Goto-related applications
Music On Hold Changes
---------------------
@@ -409,6 +419,8 @@
* Updated the ParkedCall application to allow you to not specify a parking
extension. If you don't specify a parking space to pick up, it will grab
the first one available.
+ * Added cli command 'features reload' to reload call features from features.conf
+ * Moved into core asterisk binary.
Language Support Changes
------------------------
@@ -465,6 +477,8 @@
backend functionality.
* Added a new module, res_config_ldap, which permits the use of an LDAP
server for realtime data access.
+ * Added support for writing and running your dialplan in lua using the pbx_lua
+ module. See configs/extensions.lua.sample for examples of how to do this.
Miscellaneous
-------------
@@ -484,8 +498,6 @@
will now be available in the failed extension using the REASON dialplan variable.
* Added support for reading the TOUCH_MONITOR_PREFIX channel variable.
It allows you to configure a prefix for auto-monitor recordings.
- * Added support for writing and running your dialplan in lua. See
- configs/extensions.lua.sample for examples of how to do this.
* A new extension pattern matching algorithm, based on a trie, is introduced
here, that could noticeably speed up mid-sized to large dialplans.
It is NOT used by default, as duplicating the behaviour of the old pattern
@@ -498,4 +510,10 @@
specifying which socket to use to connect to the running Asterisk daemon
(-s)
* Added logging to 'make update' command. See update.log
-
+ * Added strictrtp option to rtp.conf. If enabled this will drop RTP packets that
+ do not come from the remote party.
+ * Added the 'n' option to the SpeechBackground application to tell it to not
+ answer the channel if it has not already been answered.
+ * Added a compiler flag, CHANNEL_TRACE, which permits channel tracing to be
+ turned on, via the CHANNEL(trace) dialplan function. Could be useful for
+ dialplan debugging.
Modified: team/jrothenberger/asterisk-urgent/CREDITS
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/CREDITS?view=diff&rev=103804&r1=103803&r2=103804
==============================================================================
--- team/jrothenberger/asterisk-urgent/CREDITS (original)
+++ team/jrothenberger/asterisk-urgent/CREDITS Mon Feb 18 18:51:11 2008
@@ -183,6 +183,12 @@
TCP and TLS support for SIP, and various bug fixes.
brettbryant(AT)gmail.com
+Sergey Tamkovich - Realtime support for MusicOnHold, store and destroy realtime methods and
+ implementations for odbc, sqlite, and pgsql realtime drivers, attended transfer updates,
+ multiple speeds for ControlPlayback, and multiple bug fixes
+ - See http://voip-info.org/users/view/sergee
+ serg(AT)voipsolutions.ru
+
=== OTHER CONTRIBUTIONS ===
John Todd - Monkey sounds and associated teletorture prompt
Michael Jerris - bug marshaling
Modified: team/jrothenberger/asterisk-urgent/Makefile
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/Makefile?view=diff&rev=103804&r1=103803&r2=103804
==============================================================================
--- team/jrothenberger/asterisk-urgent/Makefile (original)
+++ team/jrothenberger/asterisk-urgent/Makefile Mon Feb 18 18:51:11 2008
@@ -57,6 +57,7 @@
export ASTSPOOLDIR
export ASTVARLIBDIR
export ASTDATADIR
+export ASTDBDIR
export ASTLOGDIR
export ASTLIBDIR
export ASTMANDIR
@@ -107,7 +108,9 @@
#Uncomment this to see all build commands instead of 'quiet' output
#NOISY_BUILD=yes
-ASTTOPDIR:=$(CURDIR)
+empty:=
+space:=$(empty) $(empty)
+ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
# Overwite config files on "make samples"
OVERWRITE=y
Modified: team/jrothenberger/asterisk-urgent/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/UPGRADE.txt?view=diff&rev=103804&r1=103803&r2=103804
==============================================================================
--- team/jrothenberger/asterisk-urgent/UPGRADE.txt (original)
+++ team/jrothenberger/asterisk-urgent/UPGRADE.txt Mon Feb 18 18:51:11 2008
@@ -1,4 +1,10 @@
-Information for Upgrading From Previous Asterisk Releases
+=========================================================
+=== Information for upgrading from Asterisk 1.4 to 1.6
+===
+===
+=== UPGRADE-1.2.txt -- Upgrade info for 1.0 to 1.2
+=== UPGRADE-1.4.txt -- Upgrade info for 1.2 to 1.4
+=== UPGRADE.txt -- Upgrade info for 1.4 to 1.6
=========================================================
AEL:
@@ -88,6 +94,11 @@
you need to do so explicitly in your dialplan.
* Privacy() no longer uses privacy.conf, so any options must be specified
directly in the application arguments.
+* MusicOnHold application now has duration parameter which allows specifying
+ timeout in seconds.
+* WaitMusicOnHold application is now deprecated in favor of extended MusicOnHold.
+* SetMusicOnHold is now deprecated. You should use Set(CHANNEL(musicclass)=...)
+ instead.
Dialplan Functions:
@@ -151,6 +162,9 @@
lowcost and other is not acceptable now. Look into qos.tex for description of
this parameter.
+* queues.conf: the queue-lessthan sound file option is no longer available, and the
+ queue-round-seconds option no longer takes '1' as a valid parameter.
+
Manager:
* Manager has been upgraded to version 1.1 with a lot of changes.
Modified: team/jrothenberger/asterisk-urgent/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/apps/app_adsiprog.c?view=diff&rev=103804&r1=103803&r2=103804
==============================================================================
--- team/jrothenberger/asterisk-urgent/apps/app_adsiprog.c (original)
+++ team/jrothenberger/asterisk-urgent/apps/app_adsiprog.c Mon Feb 18 18:51:11 2008
@@ -21,7 +21,7 @@
* \brief Program Asterisk ADSI Scripts into phone
*
* \author Mark Spencer <markster at digium.com>
- *
+ *
* \ingroup applications
*/
@@ -36,7 +36,7 @@
#include <netinet/in.h>
#include <ctype.h>
-#include "asterisk/paths.h" /* use ast_config_AST_CONFIG_DIR */
+#include "asterisk/paths.h" /* use ast_config_AST_CONFIG_DIR */
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
@@ -94,25 +94,25 @@
{ 3, "INDENT" },
};
-#define STATE_NORMAL 0
-#define STATE_INKEY 1
-#define STATE_INSUB 2
-#define STATE_INIF 3
-
-#define MAX_RET_CODE 20
-#define MAX_SUB_LEN 255
-#define MAX_MAIN_LEN 1600
-
-#define ARG_STRING (1 << 0)
-#define ARG_NUMBER (1 << 1)
+#define STATE_NORMAL 0
+#define STATE_INKEY 1
+#define STATE_INSUB 2
+#define STATE_INIF 3
+
+#define MAX_RET_CODE 20
+#define MAX_SUB_LEN 255
+#define MAX_MAIN_LEN 1600
+
+#define ARG_STRING (1 << 0)
+#define ARG_NUMBER (1 << 1)
struct adsi_soft_key {
- char vname[40]; /* Which "variable" is associated with it */
- int retstrlen; /* Length of return string */
- int initlen; /* initial length */
+ char vname[40]; /* Which "variable" is associated with it */
+ int retstrlen; /* Length of return string */
+ int initlen; /* initial length */
int id;
int defined;
- char retstr[80]; /* Return string data */
+ char retstr[80]; /* Return string data */
};
struct adsi_subscript {
@@ -267,7 +267,7 @@
a = dtmfstr;
- while(*a) {
+ while (*a) {
if (strchr(validdtmf, *a)) {
*buf = *a;
buf++;
@@ -292,11 +292,11 @@
return 0;
}
- if (!strcasecmp(page, "INFO")) {
+ if (!strcasecmp(page, "INFO"))
cmd = 0;
- } else if (!strcasecmp(page, "COMM")) {
+ else if (!strcasecmp(page, "COMM"))
cmd = 0x80;
- } else {
+ else {
ast_log(LOG_WARNING, "Expecting either 'INFO' or 'COMM' page, got got '%s' at line %d of %s\n", page, lineno, script);
return 0;
}
@@ -325,11 +325,11 @@
return 0;
}
- if (!strcasecmp(dir, "UP")) {
+ if (!strcasecmp(dir, "UP"))
cmd = 0;
- } else if (!strcasecmp(dir, "DOWN")) {
+ else if (!strcasecmp(dir, "DOWN"))
cmd = 0x20;
- } else {
+ else {
ast_log(LOG_WARNING, "Expecting either 'UP' or 'DOWN' direction, got '%s' at line %d of %s\n", dir, lineno, script);
return 0;
}
@@ -396,7 +396,7 @@
{
char *tok = get_token(&args, script, lineno);
- if (tok)
+ if (tok)
ast_log(LOG_WARNING, "Clearing timer requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
buf[0] = id;
@@ -415,7 +415,7 @@
int x;
for (x = 0; x < state->numflags; x++) {
- if (!strcasecmp(state->flags[x].vname, name))
+ if (!strcasecmp(state->flags[x].vname, name))
return &state->flags[x];
}
@@ -540,7 +540,7 @@
int x;
for (x = 0; x < state->numkeys; x++) {
- if (!strcasecmp(state->keys[x].vname, name))
+ if (!strcasecmp(state->keys[x].vname, name))
return &state->keys[x];
}
@@ -561,7 +561,7 @@
int x;
for (x = 0; x < state->numsubs; x++) {
- if (!strcasecmp(state->subs[x].vname, name))
+ if (!strcasecmp(state->subs[x].vname, name))
return &state->subs[x];
}
@@ -582,7 +582,7 @@
int x;
for (x = 0; x <state->numstates; x++) {
- if (!strcasecmp(state->states[x].vname, name))
+ if (!strcasecmp(state->states[x].vname, name))
return &state->states[x];
}
@@ -607,7 +607,7 @@
int x;
for (x = 0; x < state->numdisplays; x++) {
- if (!strcasecmp(state->displays[x].vname, name))
+ if (!strcasecmp(state->displays[x].vname, name))
return &state->displays[x];
}
@@ -641,13 +641,13 @@
break;
if (!strcasecmp(tok, "UNLESS")) {
/* Check for trailing UNLESS flag */
- if (!(tok = get_token(&args, script, lineno))) {
+ if (!(tok = get_token(&args, script, lineno)))
ast_log(LOG_WARNING, "Missing argument for UNLESS clause at line %d of %s\n", lineno, script);
- } else if (process_token(newkey, tok, sizeof(newkey) - 1, ARG_STRING)) {
+ else if (process_token(newkey, tok, sizeof(newkey) - 1, ARG_STRING))
ast_log(LOG_WARNING, "Invalid flag name '%s' at line %d of %s\n", tok, lineno, script);
- } else if (!(flag = getflagbyname(state, newkey, script, lineno, 0))) {
+ else if (!(flag = getflagbyname(state, newkey, script, lineno, 0)))
ast_log(LOG_WARNING, "Flag '%s' is undeclared at line %d of %s\n", newkey, lineno, script);
- } else
+ else
flagid = flag->id;
if ((tok = get_token(&args, script, lineno)))
ast_log(LOG_WARNING, "Extra arguments after UNLESS clause: '%s' at line %d of %s\n", tok, lineno, script);
@@ -658,19 +658,19 @@
break;
}
if (process_token(newkey, tok, sizeof(newkey) - 1, ARG_STRING)) {
- ast_log(LOG_WARNING, "Invalid token for key name: %s\n", tok);
+ ast_log(LOG_WARNING, "Invalid token for key name: %s\n", tok);
continue;
}
-
+
if (!(key = getkeybyname(state, newkey, script, lineno)))
break;
keyid[x] = key->id;
}
buf[0] = id;
buf[1] = (flagid & 0x7) << 3 | (x & 0x7);
- for (bytes = 0; bytes < x; bytes++) {
+ for (bytes = 0; bytes < x; bytes++)
buf[bytes + 2] = keyid[bytes];
- }
+
return 2 + x;
}
@@ -709,17 +709,17 @@
if (tok && !strcasecmp(tok, "UNLESS")) {
/* Check for trailing UNLESS flag */
- if (!(tok = get_token(&args, script, lineno))) {
+ if (!(tok = get_token(&args, script, lineno)))
ast_log(LOG_WARNING, "Missing argument for UNLESS clause at line %d of %s\n", lineno, script);
- } else if (process_token(&flag, tok, sizeof(flag), ARG_NUMBER)) {
+ else if (process_token(&flag, tok, sizeof(flag), ARG_NUMBER))
ast_log(LOG_WARNING, "Invalid flag number '%s' at line %d of %s\n", tok, lineno, script);
- }
+
if ((tok = get_token(&args, script, lineno)))
ast_log(LOG_WARNING, "Extra arguments after UNLESS clause: '%s' at line %d of %s\n", tok, lineno, script);
}
-
+
buf[0] = id;
- buf[1] = (cmd << 6) | (disp->id & 0x3f);
+ buf[1] = (cmd << 6) | (disp->id & 0x3f);
buf[2] = ((line & 0x1f) << 3) | (flag & 0x7);
return 3;
@@ -729,7 +729,7 @@
{
char *tok = get_token(&args, script, lineno);
- if (tok)
+ if (tok)
ast_log(LOG_WARNING, "Clearing display requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
buf[0] = id;
@@ -741,7 +741,7 @@
{
char *tok = get_token(&args, script, lineno);
- if (tok)
+ if (tok)
ast_log(LOG_WARNING, "Digitdirect requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
buf[0] = id;
@@ -765,7 +765,7 @@
{
char *tok = get_token(&args, script, lineno);
- if (tok)
+ if (tok)
ast_log(LOG_WARNING, "Digitcollect requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
buf[0] = id;
@@ -816,8 +816,7 @@
}
tok = get_token(&args, script, lineno);
- while ((!sawin && !strcasecmp(tok, "IN")) ||
- (sawin && !strcasecmp(tok, "OR"))) {
+ while ((!sawin && !strcasecmp(tok, "IN")) || (sawin && !strcasecmp(tok, "OR"))) {
sawin = 1;
if (scnt > 7) {
ast_log(LOG_WARNING, "No more than 8 states may be specified for inclusion at line %d of %s\n", lineno, script);
@@ -840,7 +839,7 @@
if (!tok || strcasecmp(tok, "GOTO")) {
if (!tok)
tok = "<nothing>";
- if (sawin)
+ if (sawin)
ast_log(LOG_WARNING, "Got '%s' while looking for 'GOTO' or 'OR' at line %d of %s\n", tok, lineno, script);
else
ast_log(LOG_WARNING, "Got '%s' while looking for 'GOTO' or 'IN' at line %d of %s\n", tok, lineno, script);
@@ -941,17 +940,17 @@
if (kcmds[x].add_args) {
res = kcmds[x].add_args(key->retstr + key->retstrlen,
code, kcmds[x].id, args, state, script, lineno);
- if ((key->retstrlen + res - key->initlen) <= MAX_RET_CODE)
+ if ((key->retstrlen + res - key->initlen) <= MAX_RET_CODE)
key->retstrlen += res;
- else
+ else
ast_log(LOG_WARNING, "No space for '%s' code in key '%s' at line %d of %s\n", kcmds[x].name, key->vname, lineno, script);
} else {
- if ((unused = get_token(&args, script, lineno)))
+ if ((unused = get_token(&args, script, lineno)))
ast_log(LOG_WARNING, "'%s' takes no arguments at line %d of %s (token is '%s')\n", kcmds[x].name, lineno, script, unused);
if ((key->retstrlen + 1 - key->initlen) <= MAX_RET_CODE) {
key->retstr[key->retstrlen] = kcmds[x].id;
key->retstrlen++;
- } else
+ } else
ast_log(LOG_WARNING, "No space for '%s' code in key '%s' at line %d of %s\n", kcmds[x].name, key->vname, lineno, script);
}
return 0;
@@ -970,14 +969,14 @@
if (opcmds[x].add_args) {
res = opcmds[x].add_args(sub->data + sub->datalen,
code, opcmds[x].id, args, state, script, lineno);
- if ((sub->datalen + res + 1) <= max)
+ if ((sub->datalen + res + 1) <= max)
sub->datalen += res;
else {
ast_log(LOG_WARNING, "No space for '%s' code in subscript '%s' at line %d of %s\n", opcmds[x].name, sub->vname, lineno, script);
return -1;
}
} else {
- if ((unused = get_token(&args, script, lineno)))
+ if ((unused = get_token(&args, script, lineno)))
ast_log(LOG_WARNING, "'%s' takes no arguments at line %d of %s (token is '%s')\n", opcmds[x].name, lineno, script, unused);
if ((sub->datalen + 2) <= max) {
sub->data[sub->datalen] = opcmds[x].id;
@@ -1005,7 +1004,7 @@
struct adsi_display *disp;
struct adsi_subscript *newsub;
- if (!keyword)
+ if (!keyword)
return 0;
switch(state->state) {
@@ -1141,7 +1140,7 @@
break;
}
state->state = STATE_INSUB;
- } else if (!strcasecmp(keyword, "STATE")) {
+ } else if (!strcasecmp(keyword, "STATE")) {
if (!(args = get_token(&buf, script, lineno))) {
ast_log(LOG_WARNING, "STATE definition missing name at line %d of %s\n", lineno, script);
break;
@@ -1155,7 +1154,7 @@
break;
}
getstatebyname(state, vname, script, lineno, 1);
- } else if (!strcasecmp(keyword, "FLAG")) {
+ } else if (!strcasecmp(keyword, "FLAG")) {
if (!(args = get_token(&buf, script, lineno))) {
ast_log(LOG_WARNING, "FLAG definition missing name at line %d of %s\n", lineno, script);
break;
@@ -1217,7 +1216,7 @@
disp->datalen += strlen(tmp);
args = get_token(&buf, script, lineno);
}
- while(args) {
+ while (args) {
if (!strcasecmp(args, "JUSTIFY")) {
args = get_token(&buf, script, lineno);
if (!args) {
@@ -1324,8 +1323,7 @@
break;
}
state->sub->ifinscount = 0;
- state->sub->ifdata = state->sub->data +
- state->sub->datalen;
+ state->sub->ifdata = state->sub->data + state->sub->datalen;
/* Reserve header and insert op codes */
state->sub->ifdata[0] = 0x1;
state->sub->ifdata[1] = event;
@@ -1370,7 +1368,7 @@
/* Create "main" as first subroutine */
getsubbyname(scr, "main", NULL, 0);
- while(!feof(f)) {
+ while (!feof(f)) {
fgets(buf, sizeof(buf), f);
if (!feof(f)) {
lineno++;
@@ -1447,7 +1445,7 @@
return -1;
/* Start an empty ADSI Session */
- if (ast_adsi_load_session(chan, NULL, 0, 1) < 1)
+ if (ast_adsi_load_session(chan, NULL, 0, 1) < 1)
return -1;
/* Now begin the download attempt */
@@ -1530,7 +1528,6 @@
return -1;
}
}
-
bytes = 0;
bytes += ast_adsi_display(buf, ADSI_INFO_PAGE, 1, ADSI_JUST_LEFT, 0, "Download complete.", "");
@@ -1555,14 +1552,14 @@
if (ast_strlen_zero(data))
data = "asterisk.adsi";
-
+
if (!ast_adsi_available(chan)) {
ast_verb(3, "ADSI Unavailable on CPE. Not bothering to try.\n");
} else {
ast_verb(3, "ADSI Available on CPE. Attempting Upload.\n");
res = adsi_prog(chan, data);
}
-
+
return res;
}
Modified: team/jrothenberger/asterisk-urgent/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/apps/app_alarmreceiver.c?view=diff&rev=103804&r1=103803&r2=103804
==============================================================================
--- team/jrothenberger/asterisk-urgent/apps/app_alarmreceiver.c (original)
+++ team/jrothenberger/asterisk-urgent/apps/app_alarmreceiver.c Mon Feb 18 18:51:11 2008
@@ -17,18 +17,18 @@
*/
/*! \file
- * \brief Central Station Alarm receiver for Ademco Contact ID
+ * \brief Central Station Alarm receiver for Ademco Contact ID
* \author Steve Rodgers <hwstar at rodgers.sdcoxmail.com>
- *
- * *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***
+ *
+ * *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***
*
* Use at your own risk. Please consult the GNU GPL license document included with Asterisk. *
*
* *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***
*
* \ingroup applications
- */
-
+ */
+
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -73,13 +73,12 @@
"until the panel hangs up. Once the panel hangs up, the application will run the\n"
"system command specified by the eventcmd setting in alarmreceiver.conf and pipe\n"
"the events to the standard input of the application. The configuration file also\n"
-"contains settings for DTMF timing, and for the loudness of the acknowledgement\n"
+"contains settings for DTMF timing, and for the loudness of the acknowledgement\n"
"tones.\n";
/* Config Variables */
-
static int fdtimeout = 2000;
-static int sdtimeout = 200;
+static int sdtimeout = 200;
static int toneloudness = 4096;
static int log_individual_events = 0;
static char event_spool_dir[128] = {'\0'};
@@ -88,7 +87,6 @@
static char time_stamp_format[128] = {"%a %b %d, %Y @ %H:%M:%S %Z"};
/* Misc variables */
-
static char event_file[14] = "/event-XXXXXX";
/*
@@ -98,7 +96,6 @@
* in this family if it is defined. If the new key doesn't exist in the
* family, then create it and set its value to 1.
*/
-
static void database_increment( char *key )
{
int res = 0;
@@ -111,7 +108,7 @@
res = ast_db_get(db_family, key, value, sizeof(value) - 1);
- if(res){
+ if (res) {
ast_verb(4, "AlarmReceiver: Creating database entry %s and setting to 1\n", key);
/* Guess we have to create it */
res = ast_db_put(db_family, key, "1");
@@ -120,46 +117,44 @@
sscanf(value, "%u", &v);
v++;
-
- if(option_verbose >= 4)
- ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: New value for %s: %u\n", key, v);
-
+
+ ast_verb(4, "AlarmReceiver: New value for %s: %u\n", key, v);
+
snprintf(value, sizeof(value), "%u", v);
-
+
res = ast_db_put(db_family, key, value);
-
- if((res)&&(option_verbose >= 4))
- ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: database_increment write error\n");
-
- return;
+
+ if (res)
+ ast_verb(4, "AlarmReceiver: database_increment write error\n");
+
+ return;
}
/*
* Build a MuLaw data block for a single frequency tone
*/
-
static void make_tone_burst(unsigned char *data, float freq, float loudness, int len, int *x)
{
int i;
float val;
-
- for(i = 0; i < len; i++){
+
+ for (i = 0; i < len; i++) {
val = loudness * sin((freq * 2.0 * M_PI * (*x)++)/8000.0);
data[i] = AST_LIN2MU((int)val);
}
/* wrap back around from 8000 */
- if (*x >= 8000) *x = 0;
+ if (*x >= 8000)
+ *x = 0;
return;
}
/*
-* Send a single tone burst for a specifed duration and frequency.
+* Send a single tone burst for a specifed duration and frequency.
* Returns 0 if successful
*/
-
static int send_tone_burst(struct ast_channel *chan, float freq, int duration, int tldn)
{
int res = 0;
@@ -172,20 +167,19 @@
unsigned char buf[640];
} tone_block;
- for(;;)
- {
-
- if (ast_waitfor(chan, -1) < 0){
+ for (;;) {
+
+ if (ast_waitfor(chan, -1) < 0) {
res = -1;
break;
}
-
+
f = ast_read(chan);
- if (!f){
+ if (!f) {
res = -1;
break;
}
-
+
if (f->frametype == AST_FRAME_VOICE) {
wf.frametype = AST_FRAME_VOICE;
wf.subclass = AST_FORMAT_ULAW;
@@ -202,7 +196,7 @@
ast_frfree(f);
break;
}
- if (ast_write(chan, &wf)){
+ if (ast_write(chan, &wf)) {
ast_verb(4, "AlarmReceiver: Failed to write frame on %s\n", chan->name);
ast_log(LOG_WARNING, "AlarmReceiver Failed to write frame on %s\n",chan->name);
res = -1;
@@ -210,7 +204,7 @@
break;
}
}
-
+
ast_frfree(f);
}
return res;
@@ -226,7 +220,6 @@
* Returns -1 if the caller hung up or there was a channel error.
*
*/
-
static int receive_dtmf_digits(struct ast_channel *chan, char *digit_string, int length, int fdto, int sdto)
{
int res = 0;
@@ -234,67 +227,60 @@
int r;
struct ast_frame *f;
struct timeval lastdigittime;
-
+
lastdigittime = ast_tvnow();
- for(;;){
- /* if outa time, leave */
- if (ast_tvdiff_ms(ast_tvnow(), lastdigittime) >
- ((i > 0) ? sdto : fdto)){
- if(option_verbose >= 4)
- ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: DTMF Digit Timeout on %s\n", chan->name);
-
+ for (;;) {
+ /* if outa time, leave */
+ if (ast_tvdiff_ms(ast_tvnow(), lastdigittime) > ((i > 0) ? sdto : fdto)) {
+ ast_verb(4, "AlarmReceiver: DTMF Digit Timeout on %s\n", chan->name);
ast_debug(1,"AlarmReceiver: DTMF timeout on chan %s\n",chan->name);
-
res = 1;
break;
}
-
+
if ((r = ast_waitfor(chan, -1) < 0)) {
ast_debug(1, "Waitfor returned %d\n", r);
continue;
}
-
+
f = ast_read(chan);
-
- if (f == NULL){
+
+ if (f == NULL) {
res = -1;
break;
}
-
+
/* If they hung up, leave */
- if ((f->frametype == AST_FRAME_CONTROL) &&
- (f->subclass == AST_CONTROL_HANGUP)){
+ if ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_HANGUP)) {
ast_frfree(f);
res = -1;
break;
}
-
+
/* if not DTMF, just do it again */
- if (f->frametype != AST_FRAME_DTMF){
+ if (f->frametype != AST_FRAME_DTMF) {
ast_frfree(f);
continue;
}
digit_string[i++] = f->subclass; /* save digit */
-
+
ast_frfree(f);
-
+
/* If we have all the digits we expect, leave */
if(i >= length)
break;
-
+
lastdigittime = ast_tvnow();
}
-
+
digit_string[i] = '\0'; /* Nul terminate the end of the digit string */
return res;
-
}
/*
* Write the metadata to the log file
*/
-
static int write_metadata( FILE *logfile, char *signalling_type, struct ast_channel *chan)
{
int res = 0;
@@ -308,46 +294,39 @@
if (chan->cid.cid_num)
ast_copy_string(workstring, chan->cid.cid_num, sizeof(workstring));
workstring[sizeof(workstring) - 1] = '\0';
-
+
ast_callerid_parse(workstring, &cn, &cl);
- if (cl)
+ if (cl)
ast_shrink_phone_number(cl);
-
/* Get the current time */
-
t = ast_tvnow();
ast_localtime(&t, &now, NULL);
-
+
/* Format the time */
-
- ast_strftime(timestamp, sizeof(timestamp), time_stamp_format, &now);
-
-
+ ast_strftime(timestamp, sizeof(timestamp), time_stamp_format, &now);
+
res = fprintf(logfile, "\n\n[metadata]\n\n");
-
- if(res >= 0)
+
+ if (res >= 0)
res = fprintf(logfile, "PROTOCOL=%s\n", signalling_type);
-
- if(res >= 0)
+
+ if (res >= 0)
res = fprintf(logfile, "CALLINGFROM=%s\n", (!cl) ? "<unknown>" : cl);
-
- if(res >- 0)
+
+ if (res >- 0)
res = fprintf(logfile, "CALLERNAME=%s\n", (!cn) ? "<unknown>" : cn);
-
- if(res >= 0)
+
+ if (res >= 0)
res = fprintf(logfile, "TIMESTAMP=%s\n\n", timestamp);
-
- if(res >= 0)
+
+ if (res >= 0)
res = fprintf(logfile, "[events]\n\n");
-
- if(res < 0){
- if (option_verbose >= 3 )
- ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: can't write metadata\n");
-
+
+ if (res < 0) {
+ ast_verb(3, "AlarmReceiver: can't write metadata\n");
ast_debug(1,"AlarmReceiver: can't write metadata\n");
- }
- else
+ } else
res = 0;
return res;
@@ -356,23 +335,20 @@
/*
* Write a single event to the log file
*/
-
static int write_event( FILE *logfile, event_node_t *event)
{
int res = 0;
- if( fprintf(logfile, "%s\n", event->data) < 0)
+ if (fprintf(logfile, "%s\n", event->data) < 0)
res = -1;
-
+
return res;
}
-
/*
* If we are configured to log events, do so here.
*
*/
-
static int log_events(struct ast_channel *chan, char *signalling_type, event_node_t *event)
{
@@ -385,46 +361,42 @@
if (!ast_strlen_zero(event_spool_dir)) {
/* Make a template */
-
ast_copy_string(workstring, event_spool_dir, sizeof(workstring));
strncat(workstring, event_file, sizeof(workstring) - strlen(workstring) - 1);
/* Make the temporary file */
-
fd = mkstemp(workstring);
- if(fd == -1) {
- if (option_verbose >= 3)
- ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: can't make temporary file\n");
+ if (fd == -1) {
+ ast_verb(3, "AlarmReceiver: can't make temporary file\n");
ast_debug(1,"AlarmReceiver: can't make temporary file\n");
res = -1;
}
-
- if(!res){
+
+ if (!res) {
logfile = fdopen(fd, "w");
- if(logfile){
+ if (logfile) {
/* Write the file */
res = write_metadata(logfile, signalling_type, chan);
- if(!res)
- while((!res) && (elp != NULL)){
+ if (!res)
+ while ((!res) && (elp != NULL)) {
res = write_event(logfile, elp);
elp = elp->next;
}
- if(!res){
- if(fflush(logfile) == EOF)
+ if (!res) {
+ if (fflush(logfile) == EOF)
res = -1;
- if(!res){
- if(fclose(logfile) == EOF)
+ if (!res) {
+ if (fclose(logfile) == EOF)
res = -1;
- }
+ }
}
- }
- else
+ } else
res = -1;
}
}
- return res;
+ return res;
}
/*
@@ -432,10 +404,9 @@
*
* The function will return 0 when the caller hangs up, else a -1 if there was a problem.
*/
-
static int receive_ademco_contact_id( struct ast_channel *chan, void *data, int fdto, int sdto, int tldn, event_node_t **ehead)
{
- int i,j;
+ int i, j;
int res = 0;
int checksum;
char event[17];
@@ -445,94 +416,72 @@
int ack_retries = 0;
static char digit_map[15] = "0123456789*#ABC";
- static unsigned char digit_weights[15] = {10,1,2,3,4,5,6,7,8,9,11,12,13,14,15};
-
+ static unsigned char digit_weights[15] = {10,1,2,3,4,5,6,7,8,9,11,12,13,14,15};
+
database_increment("calls-received");
/* Wait for first event */
-
- if(option_verbose >= 4)
- ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Waiting for first event from panel\n");
-
- while(res >= 0){
-
- if(got_some_digits == 0){
-
- /* Send ACK tone sequence */
-
-
- if(option_verbose >= 4)
[... 17510 lines stripped ...]
More information about the svn-commits
mailing list