[svn-commits] seanbright: branch seanbright/hoard-integration r134534 - in /team/seanbright...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Jul 30 14:45:28 CDT 2008
Author: seanbright
Date: Wed Jul 30 14:45:27 2008
New Revision: 134534
URL: http://svn.digium.com/view/asterisk?view=rev&rev=134534
Log:
Merged revisions 134086,134088,134125,134162-134163,134253,134260,134312,134353,134355,134401,134442-134443,134476,134481,134483 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r134086 | kpfleming | 2008-07-28 12:42:00 -0400 (Mon, 28 Jul 2008) | 3 lines
remove remaining Zaptel references in various places
................
r134088 | tilghman | 2008-07-28 12:49:29 -0400 (Mon, 28 Jul 2008) | 7 lines
Change SendImage() to output a more consistent status variable.
(closes issue #13134)
Reported by: eliel
Patches:
app_image.c.patch uploaded by eliel (license 64)
UPGRADE.patch uploaded by eliel (license 64)
................
r134125 | mmichelson | 2008-07-28 15:53:56 -0400 (Mon, 28 Jul 2008) | 27 lines
This commit compensates for buggy poll(2)
implementations. Asterisk has, for a long time,
had its own implementation of poll(2) which
just used the input arguments to call select(2).
In 1.4, this internal implementation was used
for Darwin systems. This was removed in Asterisk
trunk at some point, but it seems as though this
was not the right move to make.
On Mac OS X, it appears as though the poll used
to gather CLI input does not respond properly
when connecting via a remote Asterisk console.
Reverting to the use of Asterisk's poll fixed
the issue.
Also, there is now an option for the configure
script, --enable-internal-poll, which will allow
for anyone to use Asterisk's internal poll
implementation in case they suspect that their
system's poll implementation is buggy.
closes issue #11928)
Reported by: adriavidal
Patches:
1.6.0-configurev2.patch uploaded by putnopvut (license 60)
................
r134162 | tilghman | 2008-07-28 17:56:00 -0400 (Mon, 28 Jul 2008) | 2 lines
Restore properties mistakenly removed (broke merging)
................
r134163 | tilghman | 2008-07-28 18:07:12 -0400 (Mon, 28 Jul 2008) | 15 lines
Merged revisions 134161 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r134161 | tilghman | 2008-07-28 16:50:50 -0500 (Mon, 28 Jul 2008) | 7 lines
Detect when sox fails to raise the volume, because sox can't read the file.
(closes issue #12939)
Reported by: rickbradley
Patches:
20080728__bug12939.diff.txt uploaded by Corydon76 (license 14)
Tested by: rickbradley
........
................
r134253 | bbryant | 2008-07-29 17:23:43 -0400 (Tue, 29 Jul 2008) | 1 line
Fix deadlock when unloading res_http_post because the uris lock was still locked.
................
r134260 | kpfleming | 2008-07-29 18:22:13 -0400 (Tue, 29 Jul 2008) | 2 lines
build against the now-typedef-free dahdi/user.h, and remove some #ifdefs for features that will always be present in DAHDI
................
r134312 | tilghman | 2008-07-29 19:00:45 -0400 (Tue, 29 Jul 2008) | 6 lines
Minor changes to reduce packaging changes made by the Fedora maintainer.
(closes issue #12974)
Reported by: jcollie
Patches:
0001-Don-t-override-duplicate-optimization-flags.patch uploaded by jcollie (license 412)
................
r134353 | tilghman | 2008-07-30 11:30:18 -0400 (Wed, 30 Jul 2008) | 8 lines
Add %u and %g to the ASTERISK_PROMPT settings, for username and group,
respectively. Also, take the opportunity to clean up the CLI prompt
generation code.
(closes issue #13175)
Reported by: eliel
Patches:
cliprompt.patch uploaded by eliel (license 64)
................
r134355 | kpfleming | 2008-07-30 11:32:14 -0400 (Wed, 30 Jul 2008) | 10 lines
Merged revisions 134352 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r134352 | kpfleming | 2008-07-30 10:29:17 -0500 (Wed, 30 Jul 2008) | 2 lines
use the proper method for building version.h
........
................
r134401 | tilghman | 2008-07-30 12:40:43 -0400 (Wed, 30 Jul 2008) | 7 lines
Move implementation of an attended-transfer-complete sound from one channel
driver into a common place for multiple channel drivers.
(closes issue #13152)
Reported by: caio1982
Patches:
atxfer_complete_sound3.diff uploaded by caio1982 (license 22)
................
r134442 | tilghman | 2008-07-30 13:32:28 -0400 (Wed, 30 Jul 2008) | 7 lines
Add adaptive capabilities to the sqlite realtime driver
(closes issue #13097)
Reported by: gknispel_proformatique
Patches:
20080730__bug13097.diff.txt uploaded by Corydon76 (license 14)
Tested by: Corydon76
................
r134443 | tilghman | 2008-07-30 13:36:31 -0400 (Wed, 30 Jul 2008) | 2 lines
Document adaptive capabilities
................
r134476 | mmichelson | 2008-07-30 14:33:12 -0400 (Wed, 30 Jul 2008) | 12 lines
Merged revisions 134475 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r134475 | mmichelson | 2008-07-30 13:31:47 -0500 (Wed, 30 Jul 2008) | 4 lines
Fix a spot where a function could return without bringing
a channel out of autoservice.
........
................
r134481 | tilghman | 2008-07-30 15:05:35 -0400 (Wed, 30 Jul 2008) | 13 lines
Merged revisions 134480 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r134480 | tilghman | 2008-07-30 14:03:44 -0500 (Wed, 30 Jul 2008) | 5 lines
launch_netscript sometimes returns -1, which fails to set AGISTATUS. Map
failure to -1, so that AGISTATUS is always set.
(closes issue #13199)
Reported by: smw1218
........
................
r134483 | tilghman | 2008-07-30 15:17:38 -0400 (Wed, 30 Jul 2008) | 4 lines
Let "roundrobin" also reference rrmemory, for the 1.6 release (as described in
UPGRADE-1.4.txt)
(Closes issue #13181)
................
Modified:
team/seanbright/hoard-integration/ (props changed)
team/seanbright/hoard-integration/CHANGES
team/seanbright/hoard-integration/Makefile
team/seanbright/hoard-integration/UPGRADE.txt
team/seanbright/hoard-integration/apps/app_dahdibarge.c
team/seanbright/hoard-integration/apps/app_dahdiras.c
team/seanbright/hoard-integration/apps/app_dahdiscan.c
team/seanbright/hoard-integration/apps/app_image.c
team/seanbright/hoard-integration/apps/app_meetme.c
team/seanbright/hoard-integration/apps/app_parkandannounce.c
team/seanbright/hoard-integration/apps/app_queue.c
team/seanbright/hoard-integration/apps/app_rpt.c
team/seanbright/hoard-integration/apps/app_voicemail.c
team/seanbright/hoard-integration/build_tools/cflags.xml
team/seanbright/hoard-integration/channels/chan_dahdi.c
team/seanbright/hoard-integration/channels/chan_sip.c
team/seanbright/hoard-integration/configs/chan_dahdi.conf.sample
team/seanbright/hoard-integration/configs/iax.conf.sample
team/seanbright/hoard-integration/configs/sip.conf.sample
team/seanbright/hoard-integration/configs/skinny.conf.sample
team/seanbright/hoard-integration/configure
team/seanbright/hoard-integration/configure.ac
team/seanbright/hoard-integration/contrib/scripts/autosupport
team/seanbright/hoard-integration/doc/osp.txt
team/seanbright/hoard-integration/doc/ss7.txt
team/seanbright/hoard-integration/doc/tex/cliprompt.tex
team/seanbright/hoard-integration/main/Makefile
team/seanbright/hoard-integration/main/app.c
team/seanbright/hoard-integration/main/asterisk.c
team/seanbright/hoard-integration/main/channel.c
team/seanbright/hoard-integration/main/features.c
team/seanbright/hoard-integration/main/http.c
team/seanbright/hoard-integration/main/loader.c
team/seanbright/hoard-integration/pbx/pbx_config.c
team/seanbright/hoard-integration/res/res_agi.c
team/seanbright/hoard-integration/res/res_config_sqlite.c
team/seanbright/hoard-integration/sample.call
Propchange: team/seanbright/hoard-integration/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/seanbright/hoard-integration/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/seanbright/hoard-integration/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 30 14:45:27 2008
@@ -1,1 +1,1 @@
-/trunk:1-134078
+/trunk:1-134532
Modified: team/seanbright/hoard-integration/CHANGES
URL: http://svn.digium.com/view/asterisk/team/seanbright/hoard-integration/CHANGES?view=diff&rev=134534&r1=134533&r2=134534
==============================================================================
--- team/seanbright/hoard-integration/CHANGES (original)
+++ team/seanbright/hoard-integration/CHANGES Wed Jul 30 14:45:27 2008
@@ -102,11 +102,13 @@
* The Dial() application no longer copies the language used by the caller to the callee's
channel. If you desire for the caller's channel's language to be used for file playback
to the callee, then the file specified may be prepended with "${CHANNEL(language)}/" .
+ * SendImage() no longer hangs up the channel on error; instead, it sets the
+ status variable SENDIMAGESTATUS to one of 'SUCCESS', 'FAILURE', or
+ 'UNSUPPORTED'. This change makes SendImage() more consistent with other
+ applications.
SIP Changes
-----------
- * The ATTENDED_TRANSFER_COMPLETE_SOUND can now be set using setvar to cause a given
- audio file to be played upon completion of an attended transfer.
* Added DNS manager support to registrations for peers referencing peer entries.
DNS manager runs in the background which allows DNS lookups to be run asynchronously
as well as periodically updating the IP address. These properties allow for
@@ -175,6 +177,22 @@
* A new configuration option, "timeoutpriority" has been added. Please see the section labeled
"QUEUE TIMING OPTIONS" in configs/queues.conf.sample for a detailed explanation of the option
as well as an explanation about timeout options in general
+
+Realtime changes
+----------------
+ * Several (ODBC, Postgres, MySQL, SQLite) realtime drivers have been given
+ adaptive capabilities. What this means in practical terms is that if your
+ realtime table lacks critical fields, Asterisk will now emit warnings to
+ that effect. Also, some of the realtime drivers have the ability (if
+ configured) to automatically add those columns to the table with the
+ correct type and length.
+
+Miscellaneous
+-------------
+ * The channel variable ATTENDED_TRANSFER_COMPLETE_SOUND can now be set using
+ the 'setvar' option to cause a given audio file to be played upon completion
+ of an attended transfer. Currently it works for DAHDI, IAX2, SIP, and
+ Skinny channels only.
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.4.X to Asterisk 1.6.0 -------------
@@ -814,3 +832,9 @@
as a backtrace of the stack which led to the lock calls.
* users.conf now sports an optional alternateexts property, which permits
allocation of additional extensions which will reach the specified user.
+ * A new option for the configure script, --enable-internal-poll, has been added
+ for use with systems which may have a buggy implementation of the poll system
+ call. If you notice odd behavior such as the CLI being unresponsive on remote
+ consoles, you may want to try using this option. This option is enabled by default
+ on Darwin systems since it is known that the Darwin poll() implementation has
+ odd issues.
Modified: team/seanbright/hoard-integration/Makefile
URL: http://svn.digium.com/view/asterisk/team/seanbright/hoard-integration/Makefile?view=diff&rev=134534&r1=134533&r2=134534
==============================================================================
--- team/seanbright/hoard-integration/Makefile (original)
+++ team/seanbright/hoard-integration/Makefile Wed Jul 30 14:45:27 2008
@@ -221,10 +221,16 @@
endif
ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
-ASTCFLAGS+=-pipe
-endif
-
-ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+ ifeq ($(findstring -pipe,$(ASTCFLAGS)),)
+ ASTCFLAGS+=-pipe
+ endif
+endif
+
+ifeq ($(findstring -Wall,$(ASTCFLAGS)),)
+ ASTCFLAGS+=-Wall
+endif
+
+ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
@@ -237,8 +243,10 @@
ASTLDFLAGS+=-L/usr/local/lib
endif
-ifneq ($(PROC),ultrasparc)
- ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+ifeq ($(findstring -march,$(ASTCFLAGS)),)
+ ifneq ($(PROC),ultrasparc)
+ ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+ endif
endif
ifeq ($(PROC),ppc)
@@ -404,12 +412,12 @@
@cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
-main/version.c:
+main/version.c: FORCE
@build_tools/make_version_c > $@.tmp
@cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
-include/asterisk/version.h:
+include/asterisk/version.h: FORCE
@build_tools/make_version_h > $@.tmp
@cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
@@ -907,4 +915,7 @@
asterisk.pdf:
$(MAKE) -C doc/tex asterisk.pdf
-.PHONY: menuselect menuselect.makeopts main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell main/version.c include/asterisk/version.h installdirs
+.PHONY: menuselect menuselect.makeopts main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell installdirs
+
+FORCE:
+
Modified: team/seanbright/hoard-integration/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/seanbright/hoard-integration/UPGRADE.txt?view=diff&rev=134534&r1=134533&r2=134534
==============================================================================
--- team/seanbright/hoard-integration/UPGRADE.txt (original)
+++ team/seanbright/hoard-integration/UPGRADE.txt Wed Jul 30 14:45:27 2008
@@ -97,6 +97,13 @@
Applications:
+* SendImage() no longer hangs up the channel on transmission error or on
+ another type of error; in those cases, a FAILURE status is stored in
+ SENDIMAGESTATUS and dialplan execution continues. The possible return values
+ stored in SENDIMAGESTATUS are: SUCCESS, FAILURE, and UNSUPPORTED. ('OK' has
+ been replaced with 'SUCCESS', and 'NOSUPPORT' has been replaced with
+ 'UNSUPPORTED'). This change makes the SendImage application more consistent
+ with other applications.
* ChanIsAvail() now has a 't' option, which allows the specified device
to be queried for state without consulting the channel drivers. This
performs mostly a 'ChanExists' sort of function.
Modified: team/seanbright/hoard-integration/apps/app_dahdibarge.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/hoard-integration/apps/app_dahdibarge.c?view=diff&rev=134534&r1=134533&r2=134534
==============================================================================
--- team/seanbright/hoard-integration/apps/app_dahdibarge.c (original)
+++ team/seanbright/hoard-integration/apps/app_dahdibarge.c Wed Jul 30 14:45:27 2008
@@ -53,7 +53,6 @@
#include "asterisk/utils.h"
static char *app = "DAHDIBarge";
-static char *deprecated_app = "ZapBarge";
static char *synopsis = "Barge in (monitor) DAHDI channel";
@@ -100,7 +99,7 @@
int origfd;
int ret = -1;
- DAHDI_BUFFERINFO bi;
+ struct dahdi_bufferinfo bi;
char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
char *buf = __buf + AST_FRIENDLY_OFFSET;
@@ -287,12 +286,6 @@
return res;
}
-static int conf_exec_warn(struct ast_channel *chan, void *data)
-{
- ast_log(LOG_WARNING, "Use of the command %s is deprecated, please use %s instead.\n", deprecated_app, app);
- return conf_exec(chan, data);
-}
-
static int unload_module(void)
{
return ast_unregister_application(app);
@@ -300,7 +293,6 @@
static int load_module(void)
{
- ast_register_application(deprecated_app, conf_exec_warn, synopsis, descrip);
return ((ast_register_application(app, conf_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
Modified: team/seanbright/hoard-integration/apps/app_dahdiras.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/hoard-integration/apps/app_dahdiras.c?view=diff&rev=134534&r1=134533&r2=134534
==============================================================================
--- team/seanbright/hoard-integration/apps/app_dahdiras.c (original)
+++ team/seanbright/hoard-integration/apps/app_dahdiras.c Wed Jul 30 14:45:27 2008
@@ -53,7 +53,6 @@
#include "asterisk/app.h"
static char *app = "DAHDIRAS";
-static char *deprecated_app = "ZapRAS";
static char *synopsis = "Executes DAHDI ISDN RAS application";
@@ -181,7 +180,7 @@
{
int res=-1;
char *args;
- DAHDI_PARAMS dahdip;
+ struct dahdi_params dahdip;
if (!data)
data = "";
@@ -212,12 +211,6 @@
return res;
}
-static int dahdiras_exec_warn(struct ast_channel *chan, void *data)
-{
- ast_log(LOG_WARNING, "Use of the command %s is deprecated, please use %s instead.\n", deprecated_app, app);
- return dahdiras_exec(chan, data);
-}
-
static int unload_module(void)
{
return ast_unregister_application(app);
@@ -225,7 +218,6 @@
static int load_module(void)
{
- ast_register_application(deprecated_app, dahdiras_exec_warn, synopsis, descrip);
return ((ast_register_application(app, dahdiras_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
Modified: team/seanbright/hoard-integration/apps/app_dahdiscan.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/hoard-integration/apps/app_dahdiscan.c?view=diff&rev=134534&r1=134533&r2=134534
==============================================================================
--- team/seanbright/hoard-integration/apps/app_dahdiscan.c (original)
+++ team/seanbright/hoard-integration/apps/app_dahdiscan.c Wed Jul 30 14:45:27 2008
@@ -53,7 +53,6 @@
#include "asterisk/options.h"
static char *app = "DAHDIScan";
-static char *deprecated_app = "ZapScan";
static char *synopsis = "Scan DAHDI channels to monitor calls";
@@ -109,7 +108,7 @@
char input[4];
int ic = 0;
- DAHDI_BUFFERINFO bi;
+ struct dahdi_bufferinfo bi;
char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
char *buf = __buf + AST_FRIENDLY_OFFSET;
@@ -357,12 +356,6 @@
return res;
}
-static int conf_exec_warn(struct ast_channel *chan, void *data)
-{
- ast_log(LOG_WARNING, "Use of the command %s is deprecated, please use %s instead.\n", deprecated_app, app);
- return conf_exec(chan, data);
-}
-
static int unload_module(void)
{
return ast_unregister_application(app);
@@ -370,7 +363,6 @@
static int load_module(void)
{
- ast_register_application(deprecated_app, conf_exec_warn, synopsis, descrip);
return ((ast_register_application(app, conf_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
Modified: team/seanbright/hoard-integration/apps/app_image.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/hoard-integration/apps/app_image.c?view=diff&rev=134534&r1=134533&r2=134534
==============================================================================
--- team/seanbright/hoard-integration/apps/app_image.c (original)
+++ team/seanbright/hoard-integration/apps/app_image.c Wed Jul 30 14:45:27 2008
@@ -39,16 +39,15 @@
static char *descrip =
" SendImage(filename): Sends an image on a channel.\n"
-"If the channel supports image transport but the image send fails, the channel\n"
-"will be hung up. Otherwise, the dialplan continues execution. This\n"
-"application sets the following channel variable upon completion:\n"
-" SENDIMAGESTATUS The status is the result of the attempt, one of:\n"
-" OK | NOSUPPORT \n";
+"Result of transmission will be stored in SENDIMAGESTATUS\n"
+"channel variable:\n"
+" SUCCESS Transmission succeeded\n"
+" FAILURE Transmission failed\n"
+" UNSUPPORTED Image transmission not supported by channel\n";
static int sendimage_exec(struct ast_channel *chan, void *data)
{
- int res = 0;
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "SendImage requires an argument (filename)\n");
@@ -57,14 +56,17 @@
if (!ast_supports_images(chan)) {
/* Does not support transport */
- pbx_builtin_setvar_helper(chan, "SENDIMAGESTATUS", "NOSUPPORT");
+ pbx_builtin_setvar_helper(chan, "SENDIMAGESTATUS", "UNSUPPORTED");
return 0;
}
- if (!(res = ast_send_image(chan, data)))
- pbx_builtin_setvar_helper(chan, "SENDIMAGESTATUS", "OK");
-
- return res;
+ if (!ast_send_image(chan, data)) {
+ pbx_builtin_setvar_helper(chan, "SENDIMAGESTATUS", "SUCCESS");
+ } else {
+ pbx_builtin_setvar_helper(chan, "SENDIMAGESTATUS", "FAILURE");
+ }
+
+ return 0;
}
static int unload_module(void)
Modified: team/seanbright/hoard-integration/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/hoard-integration/apps/app_meetme.c?view=diff&rev=134534&r1=134533&r2=134534
==============================================================================
--- team/seanbright/hoard-integration/apps/app_meetme.c (original)
+++ team/seanbright/hoard-integration/apps/app_meetme.c Wed Jul 30 14:45:27 2008
@@ -1520,7 +1520,7 @@
char members[10] = "";
int dtmf, opt_waitmarked_timeout = 0;
time_t timeout = 0;
- DAHDI_BUFFERINFO bi;
+ struct dahdi_bufferinfo bi;
char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
char *buf = __buf + AST_FRIENDLY_OFFSET;
char *exitkeys = NULL;
Modified: team/seanbright/hoard-integration/apps/app_parkandannounce.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/hoard-integration/apps/app_parkandannounce.c?view=diff&rev=134534&r1=134533&r2=134534
==============================================================================
--- team/seanbright/hoard-integration/apps/app_parkandannounce.c (original)
+++ team/seanbright/hoard-integration/apps/app_parkandannounce.c Wed Jul 30 14:45:27 2008
@@ -95,7 +95,7 @@
timeout = atoi(args.timeout) * 1000;
if (ast_strlen_zero(args.dial)) {
- ast_log(LOG_WARNING, "PARK: A dial resource must be specified i.e: Console/dsp or Zap/g1/5551212\n");
+ ast_log(LOG_WARNING, "PARK: A dial resource must be specified i.e: Console/dsp or DAHDI/g1/5551212\n");
return -1;
}
Modified: team/seanbright/hoard-integration/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/hoard-integration/apps/app_queue.c?view=diff&rev=134534&r1=134533&r2=134534
==============================================================================
--- team/seanbright/hoard-integration/apps/app_queue.c (original)
+++ team/seanbright/hoard-integration/apps/app_queue.c Wed Jul 30 14:45:27 2008
@@ -127,6 +127,7 @@
{ QUEUE_STRATEGY_FEWESTCALLS, "fewestcalls" },
{ QUEUE_STRATEGY_RANDOM, "random" },
{ QUEUE_STRATEGY_RRMEMORY, "rrmemory" },
+ { QUEUE_STRATEGY_RRMEMORY, "roundrobin" },
{ QUEUE_STRATEGY_LINEAR, "linear" },
{ QUEUE_STRATEGY_WRANDOM, "wrandom"},
};
Modified: team/seanbright/hoard-integration/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/hoard-integration/apps/app_rpt.c?view=diff&rev=134534&r1=134533&r2=134534
==============================================================================
--- team/seanbright/hoard-integration/apps/app_rpt.c (original)
+++ team/seanbright/hoard-integration/apps/app_rpt.c Wed Jul 30 14:45:27 2008
@@ -3929,7 +3929,7 @@
static void *rpt_tele_thread(void *this)
{
-DAHDI_CONFINFO ci; /* conference info */
+struct dahdi_confinfo ci; /* conference info */
int res = 0,haslink,hastx,hasremote,imdone = 0, unkeys_queued, x;
struct rpt_tele *mytele = (struct rpt_tele *)this;
struct rpt_tele *tlist;
@@ -5280,7 +5280,7 @@
static void *rpt_call(void *this)
{
-DAHDI_CONFINFO ci; /* conference info */
+struct dahdi_confinfo ci; /* conference info */
struct rpt *myrpt = (struct rpt *)this;
int res;
int stopped,congstarted,dialtimer,lastcidx,aborted;
@@ -5685,7 +5685,7 @@
struct rpt_link *l;
int reconnects = 0;
int i,n;
- DAHDI_CONFINFO ci; /* conference info */
+ struct dahdi_confinfo ci; /* conference info */
val = node_lookup(myrpt,node);
if (!val){
@@ -10721,7 +10721,7 @@
int ms = MSWAIT,i,lasttx=0,val,remrx=0,identqueued,othertelemqueued;
int tailmessagequeued,ctqueued,dtmfed,lastmyrx,localmsgqueued;
struct ast_channel *who;
-DAHDI_CONFINFO ci; /* conference info */
+struct dahdi_confinfo ci; /* conference info */
time_t t;
struct rpt_link *l,*m;
struct rpt_tele *telem;
@@ -13120,8 +13120,8 @@
struct ast_channel *who;
struct ast_channel *cs[20];
struct rpt_link *l;
- DAHDI_CONFINFO ci; /* conference info */
- DAHDI_PARAMS par;
+ struct dahdi_confinfo ci; /* conference info */
+ struct dahdi_params par;
int ms,elap,nullfd;
time_t t,last_timeout_warning;
struct dahdi_radio_param z;
Modified: team/seanbright/hoard-integration/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/hoard-integration/apps/app_voicemail.c?view=diff&rev=134534&r1=134533&r2=134534
==============================================================================
--- team/seanbright/hoard-integration/apps/app_voicemail.c (original)
+++ team/seanbright/hoard-integration/apps/app_voicemail.c Wed Jul 30 14:45:27 2008
@@ -2600,10 +2600,16 @@
chmod(newtmp, VOICEMAIL_FILE_MODE & ~my_umask);
ast_debug(3, "newtmp: %s\n", newtmp);
if (tmpfd > -1) {
+ int soxstatus;
snprintf(tmpcmd, sizeof(tmpcmd), "sox -v %.4f %s.%s %s.%s", vmu->volgain, attach, format, newtmp, format);
- ast_safe_system(tmpcmd);
- attach = newtmp;
- ast_debug(3, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", attach, format, vmu->volgain, mailbox);
+ if ((soxstatus = ast_safe_system(tmpcmd)) == 0) {
+ attach = newtmp;
+ ast_debug(3, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", attach, format, vmu->volgain, mailbox);
+ } else {
+ ast_log(LOG_WARNING, "Sox failed to reencode %s.%s: %s (have you installed support for all sox file formats?)\n", attach, format,
+ soxstatus == 1 ? "Problem with command line options" : "An error occurred during file processing");
+ ast_log(LOG_WARNING, "Voicemail attachment will have no volume gain.\n");
+ }
}
}
fprintf(p, "--%s" ENDL, bound);
Modified: team/seanbright/hoard-integration/build_tools/cflags.xml
URL: http://svn.digium.com/view/asterisk/team/seanbright/hoard-integration/build_tools/cflags.xml?view=diff&rev=134534&r1=134533&r2=134534
==============================================================================
--- team/seanbright/hoard-integration/build_tools/cflags.xml (original)
+++ team/seanbright/hoard-integration/build_tools/cflags.xml Wed Jul 30 14:45:27 2008
@@ -14,7 +14,7 @@
<defaultenabled>no</defaultenabled>
<depend>hoard</depend>
</member>
- <member name="LOTS_OF_SPANS" displayname="More than 32 Zaptel spans">
+ <member name="LOTS_OF_SPANS" displayname="More than 32 DAHDI spans">
</member>
<member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
</member>
Modified: team/seanbright/hoard-integration/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/hoard-integration/channels/chan_dahdi.c?view=diff&rev=134534&r1=134533&r2=134534
==============================================================================
--- team/seanbright/hoard-integration/channels/chan_dahdi.c (original)
+++ team/seanbright/hoard-integration/channels/chan_dahdi.c Wed Jul 30 14:45:27 2008
@@ -103,7 +103,6 @@
#define SMDI_MD_WAIT_TIMEOUT 1500 /* 1.5 seconds */
-#ifdef DAHDI_SPANINFO_HAS_LINECONFIG
static const char *lbostr[] = {
"0 db (CSU)/0-133 feet (DSX-1)",
"133-266 feet (DSX-1)",
@@ -114,7 +113,6 @@
"-15db (CSU)",
"-22.5db (CSU)"
};
-#endif
/*! Global jitterbuffer configuration - by default, jb is disabled */
static struct ast_jb_conf default_jbconf =
@@ -489,7 +487,7 @@
unsigned int needunhold:1;
unsigned int linear:1;
unsigned int inthreeway:1;
- DAHDI_CONFINFO curconf;
+ struct dahdi_confinfo curconf;
};
#define CONF_USER_REAL (1 << 0)
@@ -651,7 +649,7 @@
struct timeval flashtime; /*!< Last flash-hook time */
struct ast_dsp *dsp;
int cref; /*!< Call reference number */
- DAHDI_DIAL_OPERATION dop;
+ struct dahdi_dialoperation dop;
int whichwink; /*!< SIG_FEATDMF_TA Which wink are we on? */
char finaldial[64];
char accountcode[AST_MAX_ACCOUNT_CODE]; /*!< Account code */
@@ -731,7 +729,7 @@
#ifdef HAVE_SS7
struct dahdi_ss7 ss7;
#endif
- DAHDI_PARAMS timing;
+ struct dahdi_params timing;
int is_sig_auto; /*!< Use channel signalling from DAHDI? */
char smdi_port[SMDI_MAX_FILENAME_LEN];
@@ -1144,7 +1142,7 @@
static int alloc_sub(struct dahdi_pvt *p, int x)
{
- DAHDI_BUFFERINFO bi;
+ struct dahdi_bufferinfo bi;
int res;
if (p->subs[x].zfd >= 0) {
ast_log(LOG_WARNING, "%s subchannel of %d already in use\n", subnames[x], p->channel);
@@ -1254,7 +1252,7 @@
if (pvt->pulse || ioctl(pvt->subs[SUB_REAL].zfd, DAHDI_SENDTONE, &dtmf)) {
int res;
- DAHDI_DIAL_OPERATION zo = {
+ struct dahdi_dialoperation zo = {
.op = DAHDI_DIAL_OP_APPEND,
};
@@ -1450,7 +1448,7 @@
{
/* If the conference already exists, and we're already in it
don't bother doing anything */
- DAHDI_CONFINFO zi;
+ struct dahdi_confinfo zi;
memset(&zi, 0, sizeof(zi));
zi.chan = 0;
@@ -1497,7 +1495,7 @@
static int conf_del(struct dahdi_pvt *p, struct dahdi_subchannel *c, int index)
{
- DAHDI_CONFINFO zi;
+ struct dahdi_confinfo zi;
if (/* Can't delete if there's no zfd */
(c->zfd < 0) ||
/* Don't delete from the conference if it's not our conference */
@@ -1563,7 +1561,7 @@
static int reset_conf(struct dahdi_pvt *p)
{
- DAHDI_CONFINFO zi;
+ struct dahdi_confinfo zi;
memset(&zi, 0, sizeof(zi));
p->confno = -1;
memset(&p->subs[SUB_REAL].curconf, 0, sizeof(p->subs[SUB_REAL].curconf));
@@ -2968,7 +2966,7 @@
struct dahdi_pvt *p = ast->tech_pvt;
struct dahdi_pvt *tmp = NULL;
struct dahdi_pvt *prev = NULL;
- DAHDI_PARAMS par;
+ struct dahdi_params par;
ast_debug(1, "dahdi_hangup(%s)\n", ast->name);
if (!ast->tech_pvt) {
@@ -3690,16 +3688,13 @@
static void disable_dtmf_detect(struct dahdi_pvt *p)
{
-#ifdef DAHDI_TONEDETECT
int val;
-#endif
p->ignoredtmf = 1;
-#ifdef DAHDI_TONEDETECT
val = 0;
ioctl(p->subs[SUB_REAL].zfd, DAHDI_TONEDETECT, &val);
-#endif
+
if (!p->hardwaredtmf && p->dsp) {
p->dsp_features &= ~DSP_FEATURE_DIGIT_DETECT;
ast_dsp_set_features(p->dsp, p->dsp_features);
@@ -3708,19 +3703,16 @@
static void enable_dtmf_detect(struct dahdi_pvt *p)
{
-#ifdef DAHDI_TONEDETECT
int val;
-#endif
if (p->channel == CHAN_PSEUDO)
return;
p->ignoredtmf = 0;
-#ifdef DAHDI_TONEDETECT
val = DAHDI_TONEDETECT_ON | DAHDI_TONEDETECT_MUTE;
ioctl(p->subs[SUB_REAL].zfd, DAHDI_TONEDETECT, &val);
-#endif
+
if (!p->hardwaredtmf && p->dsp) {
p->dsp_features |= DSP_FEATURE_DIGIT_DETECT;
ast_dsp_set_features(p->dsp, p->dsp_features);
@@ -4129,7 +4121,7 @@
static int check_for_conference(struct dahdi_pvt *p)
{
- DAHDI_CONFINFO ci;
+ struct dahdi_confinfo ci;
/* Fine if we already have a master, etc */
if (p->master || (p->confno > -1))
return 0;
@@ -4156,7 +4148,7 @@
static int get_alarms(struct dahdi_pvt *p)
{
int res;
- DAHDI_SPANINFO zi;
+ struct dahdi_spaninfo zi;
struct dahdi_params params;
memset(&zi, 0, sizeof(zi));
@@ -4304,12 +4296,10 @@
}
switch (res) {
-#ifdef DAHDI_EVENT_EC_DISABLED
case DAHDI_EVENT_EC_DISABLED:
ast_verb(3, "Channel %d echo canceler disabled due to CED detection\n", p->channel);
p->echocanon = 0;
break;
-#endif
case DAHDI_EVENT_BITSCHANGED:
ast_log(LOG_WARNING, "Recieved bits changed on %s signalling?\n", sig2str(p->sig));
case DAHDI_EVENT_PULSE_START:
@@ -4696,7 +4686,6 @@
ast_log(LOG_WARNING, "Don't know how to handle ring/off hook for signalling %d\n", p->sig);
}
break;
-#ifdef DAHDI_EVENT_RINGBEGIN
case DAHDI_EVENT_RINGBEGIN:
switch (p->sig) {
case SIG_FXSLS:
@@ -4708,7 +4697,6 @@
break;
}
break;
-#endif
case DAHDI_EVENT_RINGEROFF:
if (p->inalarm) break;
if ((p->radio || (p->oprmode < 0))) break;
@@ -5232,7 +5220,7 @@
/* make sure it sends initial key state as first frame */
if ((p->radio || (p->oprmode < 0)) && (!p->firstradio))
{
- DAHDI_PARAMS ps;
+ struct dahdi_params ps;
ps.channo = p->channel;
if (ioctl(p->subs[SUB_REAL].zfd, DAHDI_GET_PARAMS, &ps) < 0) {
@@ -5834,7 +5822,7 @@
int features;
struct ast_str *chan_name;
struct ast_variable *v;
- DAHDI_PARAMS ps;
+ struct dahdi_params ps;
if (i->subs[index].owner) {
ast_log(LOG_WARNING, "Channel %d already has a %s call\n", i->channel,subnames[index]);
return NULL;
@@ -5896,18 +5884,14 @@
(i->outgoing && (i->callprogress & CALLPROGRESS_FAX_OUTGOING))) {
features |= DSP_FEATURE_FAX_DETECT;
}
-#ifdef DAHDI_TONEDETECT
x = DAHDI_TONEDETECT_ON | DAHDI_TONEDETECT_MUTE;
if (ioctl(i->subs[index].zfd, DAHDI_TONEDETECT, &x)) {
-#endif
i->hardwaredtmf = 0;
features |= DSP_FEATURE_DIGIT_DETECT;
-#ifdef DAHDI_TONEDETECT
} else if (NEED_MFDETECT(i)) {
i->hardwaredtmf = 1;
features |= DSP_FEATURE_DIGIT_DETECT;
}
-#endif
}
if (features) {
if (i->dsp) {
@@ -6828,12 +6812,10 @@
ast_log(LOG_NOTICE, "Got event %d (%s)...\n", res, event2str(res));
if (p->cid_signalling == CID_SIG_V23_JP) {
-#ifdef DAHDI_EVENT_RINGBEGIN
if (res == DAHDI_EVENT_RINGBEGIN) {
res = dahdi_set_hook(p->subs[SUB_REAL].zfd, DAHDI_OFFHOOK);
usleep(1);
}
-#endif
} else {
res = 0;
break;
@@ -7335,10 +7317,8 @@
res = dahdi_get_event(mtd->pvt->subs[SUB_REAL].zfd);
switch (res) {
-#ifdef HAVE_DAHDI_NEONMWI
case DAHDI_EVENT_NEONMWI_ACTIVE:
case DAHDI_EVENT_NEONMWI_INACTIVE:
-#endif
case DAHDI_EVENT_NONE:
case DAHDI_EVENT_BITSCHANGED:
break;
@@ -7821,7 +7801,6 @@
i->channel);
dahdi_destroy_channel_bynum(i->channel);
break;
-#ifdef HAVE_DAHDI_NEONMWI
case DAHDI_EVENT_NEONMWI_ACTIVE:
if (i->mwimonitor_neon) {
notify_message(i->mailbox, 1);
@@ -7834,7 +7813,6 @@
ast_log(LOG_NOTICE, "NEON MWI cleared for channel %d, mailbox %s\n", i->channel, i->mailbox);
}
break;
-#endif
}
return thread_spawned;
}
@@ -7931,12 +7909,10 @@
pthread_attr_t attr;
pthread_t threadid;
struct mwi_thread_data *mtd;
-#ifdef DAHDI_VMWI
res2 = ioctl(last->subs[SUB_REAL].zfd, DAHDI_VMWI, res);
if (res2) {
ast_log(LOG_DEBUG, "Unable to control message waiting led on channel %d: %s\n", last->channel, strerror(errno));
}
-#endif
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if ((mtd = ast_calloc(1, sizeof(*mtd)))) {
@@ -8116,7 +8092,7 @@
static int pri_create_trunkgroup(int trunkgroup, int *channels)
{
struct dahdi_spaninfo si;
- DAHDI_PARAMS p;
+ struct dahdi_params p;
int fd;
int span;
int ospan=0;
@@ -8237,7 +8213,7 @@
int x;
struct dahdi_pvt **wlist;
struct dahdi_pvt **wend;
- DAHDI_PARAMS p;
+ struct dahdi_params p;
wlist = &iflist;
wend = &ifend;
@@ -8780,7 +8756,7 @@
static inline int available(struct dahdi_pvt *p, int channelmatch, ast_group_t groupmatch, int *busy, int *channelmatched, int *groupmatched)
{
int res;
- DAHDI_PARAMS par;
+ struct dahdi_params par;
/* First, check group matching */
if (groupmatch) {
@@ -8852,11 +8828,7 @@
if (par.rxisoffhook)
return 1;
else
-#ifdef DAHDI_CHECK_HOOKSTATE
return 0;
-#else
- return 1;
-#endif
} else if (par.rxisoffhook) {
ast_debug(1, "Channel %d off hook, can't use\n", p->channel);
/* Not available when the other end is off hook */
@@ -8896,7 +8868,7 @@
static struct dahdi_pvt *chandup(struct dahdi_pvt *src)
{
struct dahdi_pvt *p;
- DAHDI_BUFFERINFO bi;
+ struct dahdi_bufferinfo bi;
int res;
if ((p = ast_malloc(sizeof(*p)))) {
@@ -10020,7 +9992,7 @@
int x;
int span = PRI_SPAN(channel);
int spanfd;
- DAHDI_PARAMS param;
+ struct dahdi_params param;
int principle = -1;
int explicit = PRI_EXPLICIT(channel);
channel = PRI_CHANNEL(channel);
@@ -11428,8 +11400,8 @@
static int start_pri(struct dahdi_pri *pri)
{
int res, x;
- DAHDI_PARAMS p;
- DAHDI_BUFFERINFO bi;
+ struct dahdi_params p;
+ struct dahdi_bufferinfo bi;
struct dahdi_spaninfo si;
int i;
@@ -11912,24 +11884,6 @@
return ( RESULT_SUCCESS == ret ) ? CLI_SUCCESS : CLI_FAILURE;
}
-static char *handle_cli_zap_destroy_channel_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "zap destroy channel";
- e->usage =
- "Usage: zap destroy channel <chan num>\n"
- " DON'T USE THIS UNLESS YOU KNOW WHAT YOU ARE DOING. Immediately removes a given channel, whether it is in use or not\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- case CLI_HANDLER:
- return dahdi_destroy_channel(e, cmd, a);
- }
-
- return CLI_FAILURE;
-}
-
static int setup_dahdi(int reload);
static int dahdi_restart(void)
{
@@ -11968,27 +11922,6 @@
if (dahdi_restart() != 0)
return CLI_FAILURE;
return CLI_SUCCESS;
-}
-
-static char *handle_cli_zap_restart_cmd_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "zap restart";
- e->usage =
- "Usage: zap restart\n"
- " Restarts the zap channels: destroys them all and then\n"
- " re-reads them from chan_dahdi.conf.\n"
- " Note that this will STOP any running CALL on zap channels.\n"
- "";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- case CLI_HANDLER:
- return dahdi_restart_cmd(e, cmd, a);
- }
-
- return CLI_FAILURE;
}
static int action_dahdirestart(struct mansession *s, const struct message *m)
@@ -12125,31 +12058,12 @@
#undef FORMAT2
}
-static char *handle_cli_zap_show_channels_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "zap show channels [trunkgroup|group|context]";
- e->usage =
- "Usage: zap show channels [ trunkgroup <trunkgroup> | group <group> | context <context> ]\n"
- " Shows a list of available channels with optional filtering\n"
- " <group> must be a number between 0 and 63\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- case CLI_HANDLER:
- return dahdi_show_channels(e, cmd, a);
- }
-
- return CLI_FAILURE;
-}
-
static char *dahdi_show_channel(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
int channel;
struct dahdi_pvt *tmp = NULL;
- DAHDI_CONFINFO ci;
- DAHDI_PARAMS ps;
+ struct dahdi_confinfo ci;
+ struct dahdi_params ps;
int x;
ast_mutex_t *lock;
struct dahdi_pvt *start;
@@ -12299,11 +12213,9 @@
if (!ioctl(tmp->subs[SUB_REAL].zfd, DAHDI_GETCONF, &ci)) {
ast_cli(a->fd, "Actual Confinfo: Num/%d, Mode/0x%04x\n", ci.confno, ci.confmode);
}
-#ifdef DAHDI_GETCONFMUTE
if (!ioctl(tmp->subs[SUB_REAL].zfd, DAHDI_GETCONFMUTE, &x)) {
[... 1467 lines stripped ...]
More information about the svn-commits
mailing list