[asterisk-commits] russell: branch russell/gmenuselect r58944 - in
/team/russell/gmenuselect: ./...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Mar 15 16:27:11 MST 2007
Author: russell
Date: Thu Mar 15 18:27:10 2007
New Revision: 58944
URL: http://svn.digium.com/view/asterisk?view=rev&rev=58944
Log:
Merged revisions 58822,58844,58846,58866,58871,58873,58881,58895,58898,58900-58901,58904,58907,58924,58932,58934,58936,58938,58940,58942 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r58822 | oej | 2007-03-12 04:37:13 -0500 (Mon, 12 Mar 2007) | 2 lines
Change URL to OpenH323 (thanks, Tzafrir!)
................
r58844 | oej | 2007-03-13 04:15:17 -0500 (Tue, 13 Mar 2007) | 10 lines
Merged revisions 58843 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58843 | oej | 2007-03-13 10:12:16 +0100 (Tue, 13 Mar 2007) | 2 lines
Issue #9251 - Clear From URI from user attributes (tgrman)
........
................
r58846 | oej | 2007-03-13 05:14:13 -0500 (Tue, 13 Mar 2007) | 11 lines
Merged revisions 58845 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58845 | oej | 2007-03-13 11:03:03 +0100 (Tue, 13 Mar 2007) | 3 lines
Don't hangup the call on OK or errors on MESSAGE and INFO
inside of a dialog (like video update requests).
........
................
r58866 | russell | 2007-03-13 16:22:33 -0500 (Tue, 13 Mar 2007) | 17 lines
Merge changes from team/russell/sqlite:
* Add new module, cdr_sqlite3_custom which allows logging custom CDRs into a
SQLite3 database. (issue #7149, alerios)
* Add new module, res_config_sqlite, which adds realtime database configuration
support for SQLite version 2. I decided that this was ok since we didn't have
any realtime support for version 3. If someone ports this to version 3, then
version 2 support can be removed or marked deprecated.
(issue #7790, rbarun_proformatique)
* Mark cdr_sqlite as deprecated in favor of cdr_sqlite3_custom.
Also, note that there were other modules on the bug tracker that did not make
the cut because they provided some duplicated functionality. Those are:
* cdr_sqlite3 (issue #6754, moy)
* cdr_sqlite3 (issue #8694, bsd)
................
r58871 | russell | 2007-03-13 18:11:30 -0500 (Tue, 13 Mar 2007) | 9 lines
Merged revisions 58870 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58870 | russell | 2007-03-13 18:11:08 -0500 (Tue, 13 Mar 2007) | 1 line
fix the reference to the SLA documentation
........
................
r58873 | russell | 2007-03-13 18:20:41 -0500 (Tue, 13 Mar 2007) | 12 lines
Merged revisions 58872 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58872 | russell | 2007-03-13 18:19:51 -0500 (Tue, 13 Mar 2007) | 4 lines
Ensure that the blinky lights show that the trunk stopped ringing when the
trunk hangs up before a station has answered it.
(issue #9234, reported by francesco_r)
........
................
r58881 | tilghman | 2007-03-13 20:56:03 -0500 (Tue, 13 Mar 2007) | 11 lines
Merged revisions 58880 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58880 | tilghman | 2007-03-13 20:47:08 -0500 (Tue, 13 Mar 2007) | 3 lines
Issue 9162 - pbx_substitute_variables_helper assumes the buffer is initialized
to all zeroes. This fixes a case where it wasn't.
........
................
r58895 | russell | 2007-03-14 11:34:03 -0500 (Wed, 14 Mar 2007) | 16 lines
Merged revisions 58894 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58894 | russell | 2007-03-14 11:33:01 -0500 (Wed, 14 Mar 2007) | 8 lines
By default, don't attempt to do any CallerID handling at all with SLA because
it is known to not work properly in some situations. However, add an option to
enable it for those that would like to use it anyway.
The short story behind this is that to properly handle CallerID with SLA, we
need the ability to change the CallerID on an existing call, and we are not
ready to handle that.
........
................
r58898 | russell | 2007-03-14 11:40:52 -0500 (Wed, 14 Mar 2007) | 19 lines
Merged revisions 58897 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r58897 | russell | 2007-03-14 11:40:22 -0500 (Wed, 14 Mar 2007) | 11 lines
Merged revisions 58896 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r58896 | russell | 2007-03-14 11:38:48 -0500 (Wed, 14 Mar 2007) | 3 lines
Add a note to the security file that the Asterisk CLI and log files may contain
sensitive information, and that people should keep this in mind.
........
................
................
r58900 | oej | 2007-03-14 11:59:35 -0500 (Wed, 14 Mar 2007) | 18 lines
Merged revisions 58848 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r58848 | oej | 2007-03-13 12:49:35 +0100 (Tue, 13 Mar 2007) | 10 lines
Merged revisions 58847 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r58847 | oej | 2007-03-13 12:45:52 +0100 (Tue, 13 Mar 2007) | 2 lines
Issue #9229 - No port in request URI on register to non default SIP ports (neelakantan)
........
................
................
r58901 | oej | 2007-03-14 12:01:37 -0500 (Wed, 14 Mar 2007) | 3 lines
Correct reference to Radius library
THanks Philippe - Greetings from Lisboa, Portugal
................
r58904 | russell | 2007-03-14 12:42:52 -0500 (Wed, 14 Mar 2007) | 10 lines
Merged revisions 58902 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58902 | russell | 2007-03-14 12:04:38 -0500 (Wed, 14 Mar 2007) | 2 lines
Add a more basic example setup to the examples section
........
................
r58907 | russell | 2007-03-14 14:19:00 -0500 (Wed, 14 Mar 2007) | 12 lines
Merged revisions 58906 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58906 | russell | 2007-03-14 14:18:08 -0500 (Wed, 14 Mar 2007) | 4 lines
Some people like to put "limitonpeer" instead of "limitonpeers" in their
configuration. While we're at it, support "limitonpeerz" and
"limitonpeerssssss". (inspired by issue #9172)
........
................
r58924 | file | 2007-03-15 13:21:03 -0500 (Thu, 15 Mar 2007) | 10 lines
Merged revisions 58923 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58923 | file | 2007-03-15 15:13:21 -0300 (Thu, 15 Mar 2007) | 2 lines
Don't assume that the pvt structure will still exist after calling schedule_delivery as it may not. (issue #9278 reported by fmachado)
........
................
r58932 | russell | 2007-03-15 17:29:45 -0500 (Thu, 15 Mar 2007) | 21 lines
Merged revisions 58931 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58931 | russell | 2007-03-15 17:25:12 -0500 (Thu, 15 Mar 2007) | 13 lines
Merge changes from svn/asterisk/team/russell/LaTeX_docs.
* Convert most of the doc directory into a single LaTeX formatted document
so that we can generate a PDF, HTML, or other formats from this
information.
* Add a CLI command to dump the application documentation into LaTeX format
which will only be include if the configure script is run with
--enable-dev-mode.
* The PDF turned out to be close to 1 MB, so it is not included. However, you
can simply run "make asterisk.pdf" to generate it yourself. We may include
it in release tarballs or have automatically generated ones on the web site,
but that has yet to be decided.
........
................
r58934 | tilghman | 2007-03-15 17:33:46 -0500 (Thu, 15 Mar 2007) | 10 lines
Merged revisions 58933 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58933 | tilghman | 2007-03-15 17:32:33 -0500 (Thu, 15 Mar 2007) | 2 lines
Function works fine, but the documentation is backwards.
........
................
r58936 | russell | 2007-03-15 17:36:34 -0500 (Thu, 15 Mar 2007) | 10 lines
Merged revisions 58935 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58935 | russell | 2007-03-15 17:35:52 -0500 (Thu, 15 Mar 2007) | 2 lines
have prep_tarball attempt to build asterisk.pdf
........
................
r58938 | russell | 2007-03-15 17:52:27 -0500 (Thu, 15 Mar 2007) | 10 lines
Merged revisions 58937 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58937 | russell | 2007-03-15 17:51:29 -0500 (Thu, 15 Mar 2007) | 2 lines
Add Asterisk version information to the generated PDF
........
................
r58940 | tilghman | 2007-03-15 18:12:33 -0500 (Thu, 15 Mar 2007) | 9 lines
Blocked revisions 58939 via svnmerge
........
r58939 | tilghman | 2007-03-15 18:11:33 -0500 (Thu, 15 Mar 2007) | 2 lines
Expand deprecation warnings from simply warning on use to the builtin documentation.
........
................
r58942 | russell | 2007-03-15 18:24:30 -0500 (Thu, 15 Mar 2007) | 9 lines
Merged revisions 58941 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58941 | russell | 2007-03-15 18:24:09 -0500 (Thu, 15 Mar 2007) | 1 line
add a link to the rubber homepage
........
................
Added:
team/russell/gmenuselect/cdr/cdr_sqlite3_custom.c
- copied unchanged from r58942, trunk/cdr/cdr_sqlite3_custom.c
team/russell/gmenuselect/configs/cdr_sqlite3_custom.conf
- copied unchanged from r58942, trunk/configs/cdr_sqlite3_custom.conf
team/russell/gmenuselect/configs/res_config_sqlite.conf
- copied unchanged from r58942, trunk/configs/res_config_sqlite.conf
team/russell/gmenuselect/doc/ael.tex
- copied unchanged from r58942, trunk/doc/ael.tex
team/russell/gmenuselect/doc/ajam.tex
- copied unchanged from r58942, trunk/doc/ajam.tex
team/russell/gmenuselect/doc/app-sms.tex
- copied unchanged from r58942, trunk/doc/app-sms.tex
team/russell/gmenuselect/doc/ast_appdocs.tex
- copied unchanged from r58942, trunk/doc/ast_appdocs.tex
team/russell/gmenuselect/doc/asterisk-conf.tex
- copied unchanged from r58942, trunk/doc/asterisk-conf.tex
team/russell/gmenuselect/doc/asterisk.tex
- copied unchanged from r58942, trunk/doc/asterisk.tex
team/russell/gmenuselect/doc/billing.tex
- copied unchanged from r58942, trunk/doc/billing.tex
team/russell/gmenuselect/doc/cdrdriver.tex
- copied unchanged from r58942, trunk/doc/cdrdriver.tex
team/russell/gmenuselect/doc/chaniax.tex
- copied unchanged from r58942, trunk/doc/chaniax.tex
team/russell/gmenuselect/doc/channelvariables.tex
- copied unchanged from r58942, trunk/doc/channelvariables.tex
team/russell/gmenuselect/doc/cliprompt.tex
- copied unchanged from r58942, trunk/doc/cliprompt.tex
team/russell/gmenuselect/doc/configuration.tex
- copied unchanged from r58942, trunk/doc/configuration.tex
team/russell/gmenuselect/doc/dundi.tex
- copied unchanged from r58942, trunk/doc/dundi.tex
team/russell/gmenuselect/doc/enum.tex
- copied unchanged from r58942, trunk/doc/enum.tex
team/russell/gmenuselect/doc/extensions.tex
- copied unchanged from r58942, trunk/doc/extensions.tex
team/russell/gmenuselect/doc/freetds.tex
- copied unchanged from r58942, trunk/doc/freetds.tex
team/russell/gmenuselect/doc/hardware.tex
- copied unchanged from r58942, trunk/doc/hardware.tex
team/russell/gmenuselect/doc/ices.tex
- copied unchanged from r58942, trunk/doc/ices.tex
team/russell/gmenuselect/doc/imapstorage.tex
- copied unchanged from r58942, trunk/doc/imapstorage.tex
team/russell/gmenuselect/doc/ip-tos.tex
- copied unchanged from r58942, trunk/doc/ip-tos.tex
team/russell/gmenuselect/doc/jitterbuffer.tex
- copied unchanged from r58942, trunk/doc/jitterbuffer.tex
team/russell/gmenuselect/doc/localchannel.tex
- copied unchanged from r58942, trunk/doc/localchannel.tex
team/russell/gmenuselect/doc/manager.tex
- copied unchanged from r58942, trunk/doc/manager.tex
team/russell/gmenuselect/doc/misdn.tex
- copied unchanged from r58942, trunk/doc/misdn.tex
team/russell/gmenuselect/doc/mp3.tex
- copied unchanged from r58942, trunk/doc/mp3.tex
team/russell/gmenuselect/doc/odbcstorage.tex
- copied unchanged from r58942, trunk/doc/odbcstorage.tex
team/russell/gmenuselect/doc/privacy.tex
- copied unchanged from r58942, trunk/doc/privacy.tex
team/russell/gmenuselect/doc/queuelog.tex
- copied unchanged from r58942, trunk/doc/queuelog.tex
team/russell/gmenuselect/doc/queues-with-callback-members.tex
- copied unchanged from r58942, trunk/doc/queues-with-callback-members.tex
team/russell/gmenuselect/doc/realtime.tex
- copied unchanged from r58942, trunk/doc/realtime.tex
team/russell/gmenuselect/doc/res_config_sqlite.txt
- copied unchanged from r58942, trunk/doc/res_config_sqlite.txt
team/russell/gmenuselect/doc/security.tex
- copied unchanged from r58942, trunk/doc/security.tex
team/russell/gmenuselect/res/res_config_sqlite.c
- copied unchanged from r58942, trunk/res/res_config_sqlite.c
Removed:
team/russell/gmenuselect/doc/00README.1st
team/russell/gmenuselect/doc/ael.txt
team/russell/gmenuselect/doc/ajam.txt
team/russell/gmenuselect/doc/app-sms.txt
team/russell/gmenuselect/doc/apps.txt
team/russell/gmenuselect/doc/asterisk-conf.txt
team/russell/gmenuselect/doc/billing.txt
team/russell/gmenuselect/doc/callingpres.txt
team/russell/gmenuselect/doc/cdrdriver.txt
team/russell/gmenuselect/doc/chaniax.txt
team/russell/gmenuselect/doc/channels.txt
team/russell/gmenuselect/doc/channelvariables.txt
team/russell/gmenuselect/doc/cliprompt.txt
team/russell/gmenuselect/doc/configuration.txt
team/russell/gmenuselect/doc/cygwin.txt
team/russell/gmenuselect/doc/dundi.txt
team/russell/gmenuselect/doc/enum.txt
team/russell/gmenuselect/doc/extconfig.txt
team/russell/gmenuselect/doc/extensions.txt
team/russell/gmenuselect/doc/freetds.txt
team/russell/gmenuselect/doc/h323.txt
team/russell/gmenuselect/doc/hardware.txt
team/russell/gmenuselect/doc/iax.txt
team/russell/gmenuselect/doc/ices.txt
team/russell/gmenuselect/doc/imapstorage.txt
team/russell/gmenuselect/doc/ip-tos.txt
team/russell/gmenuselect/doc/jitterbuffer.txt
team/russell/gmenuselect/doc/localchannel.txt
team/russell/gmenuselect/doc/manager.txt
team/russell/gmenuselect/doc/math.txt
team/russell/gmenuselect/doc/misdn.txt
team/russell/gmenuselect/doc/model.txt
team/russell/gmenuselect/doc/mp3.txt
team/russell/gmenuselect/doc/musiconhold-fpm.txt
team/russell/gmenuselect/doc/mysql.txt
team/russell/gmenuselect/doc/odbcstorage.txt
team/russell/gmenuselect/doc/privacy.txt
team/russell/gmenuselect/doc/queuelog.txt
team/russell/gmenuselect/doc/queues-with-callback-members.txt
team/russell/gmenuselect/doc/radius.txt
team/russell/gmenuselect/doc/realtime.txt
team/russell/gmenuselect/doc/security.txt
team/russell/gmenuselect/doc/sla.pdf
Modified:
team/russell/gmenuselect/ (props changed)
team/russell/gmenuselect/CHANGES
team/russell/gmenuselect/Makefile
team/russell/gmenuselect/UPGRADE.txt
team/russell/gmenuselect/apps/app_meetme.c
team/russell/gmenuselect/apps/app_voicemail.c
team/russell/gmenuselect/build_tools/make_buildopts_h
team/russell/gmenuselect/build_tools/menuselect-deps.in
team/russell/gmenuselect/build_tools/prep_tarball
team/russell/gmenuselect/cdr/cdr_radius.c
team/russell/gmenuselect/cdr/cdr_sqlite.c
team/russell/gmenuselect/channels/chan_h323.c
team/russell/gmenuselect/channels/chan_iax2.c
team/russell/gmenuselect/channels/chan_sip.c
team/russell/gmenuselect/configs/extconfig.conf.sample
team/russell/gmenuselect/configs/sla.conf.sample
team/russell/gmenuselect/configure
team/russell/gmenuselect/configure.ac
team/russell/gmenuselect/doc/PEERING
team/russell/gmenuselect/doc/sla.tex
team/russell/gmenuselect/funcs/func_realtime.c
team/russell/gmenuselect/funcs/func_strings.c
team/russell/gmenuselect/include/asterisk/autoconfig.h.in
team/russell/gmenuselect/main/pbx.c
team/russell/gmenuselect/makeopts.in
Propchange: team/russell/gmenuselect/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/russell/gmenuselect/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/russell/gmenuselect/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 15 18:27:10 2007
@@ -1,1 +1,1 @@
-/trunk:1-58819
+/trunk:1-58943
Modified: team/russell/gmenuselect/CHANGES
URL: http://svn.digium.com/view/asterisk/team/russell/gmenuselect/CHANGES?view=diff&rev=58944&r1=58943&r2=58944
==============================================================================
--- team/russell/gmenuselect/CHANGES (original)
+++ team/russell/gmenuselect/CHANGES Thu Mar 15 18:27:10 2007
@@ -66,6 +66,8 @@
* Added the parkedcallreparking option to features.conf
* SMDI is now enabled in voicemail using the smdienable option.
* Added zap show version CLI command to chan_zap.
+ * Added a new CDR module, cdr_sqlite3_custom.
+ * Added a new realtime configuration module, res_config_sqlite
AMI - The manager (TCP/TLS/HTTP)
--------------------------------
Modified: team/russell/gmenuselect/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/gmenuselect/Makefile?view=diff&rev=58944&r1=58943&r2=58944
==============================================================================
--- team/russell/gmenuselect/Makefile (original)
+++ team/russell/gmenuselect/Makefile Thu Mar 15 18:27:10 2007
@@ -46,6 +46,7 @@
export ASTCONFPATH
export NOISY_BUILD
export MENUSELECT_CFLAGS
+export AST_DEVMODE
export CC
export CXX
export AR
@@ -689,4 +690,24 @@
@echo "Generating input for menuselect ..."
@build_tools/prep_moduledeps > $@
+asterisk.pdf: doc/asterisk.pdf
+
+doc/asterisk.pdf: $(wildcard doc/*.tex)
+ifeq ($(findstring rubber,$(RUBBER)),)
+ @echo "**********************************************"
+ @echo "** You must install the \"rubber\" tool ***"
+ @echo "** to generate the Asterisk reference PDF. ***"
+ @echo "**********************************************"
+else
+ @echo "**********************************************"
+ @echo "** The Asterisk reference PDF will now be ***"
+ @echo "** generated. When complete, it will be ***"
+ @echo "** located at doc/asterisk.pdf. ***"
+ @echo "**********************************************"
+ @cp doc/asterisk.tex doc/asterisk.tex.orig
+ @sed -i -e 's/ASTERISKVERSION/$(ASTERISKVERSION)/' doc/asterisk.tex
+ @cd doc && $(RUBBER) --pdf asterisk.tex
+ @mv doc/asterisk.tex.orig doc/asterisk.tex
+endif
+
.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
Modified: team/russell/gmenuselect/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/russell/gmenuselect/UPGRADE.txt?view=diff&rev=58944&r1=58943&r2=58944
==============================================================================
--- team/russell/gmenuselect/UPGRADE.txt (original)
+++ team/russell/gmenuselect/UPGRADE.txt Thu Mar 15 18:27:10 2007
@@ -36,3 +36,9 @@
performs mostly a 'ChanExists' sort of function.
* SetCallerPres() has been replaced with the CALLERPRES() dialplan function
and is now deprecated.
+
+CDR:
+
+* The cdr_sqlite module has been marked as deprecated in favor of
+ cdr_sqlite3_custom. It will potentially be removed from the tree
+ after Asterisk 1.6 is released.
Modified: team/russell/gmenuselect/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/russell/gmenuselect/apps/app_meetme.c?view=diff&rev=58944&r1=58943&r2=58944
==============================================================================
--- team/russell/gmenuselect/apps/app_meetme.c (original)
+++ team/russell/gmenuselect/apps/app_meetme.c Thu Mar 15 18:27:10 2007
@@ -496,7 +496,7 @@
/*!
* \brief A structure for data used by the sla thread
*/
-static struct sla {
+static struct {
/*! The SLA thread ID */
pthread_t thread;
ast_cond_t cond;
@@ -506,6 +506,9 @@
AST_LIST_HEAD_NOLOCK(, sla_failed_station) failed_stations;
AST_LIST_HEAD_NOLOCK(, sla_event) event_q;
unsigned int stop:1;
+ /*! Attempt to handle CallerID, even though it is known not to work
+ * properly in some situations. */
+ unsigned int attempt_callerid:1;
} sla = {
.thread = AST_PTHREADT_NULL,
};
@@ -3496,7 +3499,8 @@
return -1;
}
- if (ast_dial_run(dial, ringing_trunk->trunk->chan, 1) != AST_DIAL_RESULT_TRYING) {
+ if (ast_dial_run(dial, sla.attempt_callerid ? ringing_trunk->trunk->chan : NULL, 1)
+ != AST_DIAL_RESULT_TRYING) {
struct sla_failed_station *failed_station;
ast_dial_destroy(dial);
if (!(failed_station = ast_calloc(1, sizeof(*failed_station))))
@@ -3956,7 +3960,7 @@
return NULL;
}
- dial_res = ast_dial_run(dial, trunk_ref->chan, 1);
+ dial_res = ast_dial_run(dial, sla.attempt_callerid ? trunk_ref->chan : NULL, 1);
if (dial_res != AST_DIAL_RESULT_TRYING) {
ast_mutex_lock(args->cond_lock);
ast_cond_signal(args->cond);
@@ -4249,8 +4253,11 @@
AST_LIST_TRAVERSE_SAFE_END
ast_mutex_unlock(&sla.lock);
if (ringing_trunk) {
+ sla_change_trunk_state(ringing_trunk->trunk, SLA_TRUNK_STATE_IDLE, ALL_TRUNK_REFS, NULL);
free(ringing_trunk);
pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "UNANSWERED");
+ /* Queue reprocessing of ringing trunks to make stations stop ringing
+ * that shouldn't be ringing after this trunk stopped. */
sla_queue_event(SLA_EVENT_RINGING_TRUNK);
}
@@ -4635,6 +4642,7 @@
struct ast_config *cfg;
const char *cat = NULL;
int res = 0;
+ const char *val;
ast_mutex_init(&sla.lock);
ast_cond_init(&sla.cond, NULL);
@@ -4642,9 +4650,11 @@
if (!(cfg = ast_config_load(SLA_CONFIG_FILE)))
return 0; /* Treat no config as normal */
+ if ((val = ast_variable_retrieve(cfg, "general", "attemptcallerid")))
+ sla.attempt_callerid = ast_true(val);
+
while ((cat = ast_category_browse(cfg, cat)) && !res) {
const char *type;
- /* Reserve "general" for ... general stuff! */
if (!strcasecmp(cat, "general"))
continue;
if (!(type = ast_variable_retrieve(cfg, cat, "type"))) {
Modified: team/russell/gmenuselect/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/russell/gmenuselect/apps/app_voicemail.c?view=diff&rev=58944&r1=58943&r2=58944
==============================================================================
--- team/russell/gmenuselect/apps/app_voicemail.c (original)
+++ team/russell/gmenuselect/apps/app_voicemail.c Thu Mar 15 18:27:10 2007
@@ -1956,7 +1956,7 @@
fprintf(p, "Subject: New message %d in mailbox %s" ENDL, msgnum + 1, mailbox);
else
fprintf(p, "Subject: [PBX]: New message %d in mailbox %s" ENDL, msgnum + 1, mailbox);
- fprintf(p, "Message-ID: <Asterisk-%d-%d-%s-%d@%s>" ENDL, msgnum, (unsigned int)ast_random(), mailbox, getpid(), host);
+ fprintf(p, "Message-ID: <Asterisk-%d-%d-%s-%d@%s>" ENDL, msgnum + 1, (unsigned int)ast_random(), mailbox, getpid(), host);
if(imap) {
/* additional information needed for IMAP searching */
fprintf(p, "X-Asterisk-VM-Message-Num: %d" ENDL, msgnum + 1);
Modified: team/russell/gmenuselect/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/team/russell/gmenuselect/build_tools/make_buildopts_h?view=diff&rev=58944&r1=58943&r2=58944
==============================================================================
--- team/russell/gmenuselect/build_tools/make_buildopts_h (original)
+++ team/russell/gmenuselect/build_tools/make_buildopts_h Thu Mar 15 18:27:10 2007
@@ -9,5 +9,9 @@
END
TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
for x in ${TMP}; do
- echo "#define ${x} 1"
+ echo "#define ${x} 1"
done
+if grep AST_DEVMODE makeopts | grep -q yes
+then
+ echo "#define AST_DEVMODE 1"
+fi
Modified: team/russell/gmenuselect/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/russell/gmenuselect/build_tools/menuselect-deps.in?view=diff&rev=58944&r1=58943&r2=58944
==============================================================================
--- team/russell/gmenuselect/build_tools/menuselect-deps.in (original)
+++ team/russell/gmenuselect/build_tools/menuselect-deps.in Thu Mar 15 18:27:10 2007
@@ -23,6 +23,7 @@
RADIUS=@PBX_RADIUS@
SPEEX=@PBX_SPEEX@
SQLITE=@PBX_SQLITE@
+SQLITE3=@PBX_SQLITE3@
SSL=@PBX_OPENSSL@
TONEZONE=@PBX_TONEZONE@
UNIXODBC=@PBX_UNIXODBC@
Modified: team/russell/gmenuselect/build_tools/prep_tarball
URL: http://svn.digium.com/view/asterisk/team/russell/gmenuselect/build_tools/prep_tarball?view=diff&rev=58944&r1=58943&r2=58944
==============================================================================
--- team/russell/gmenuselect/build_tools/prep_tarball (original)
+++ team/russell/gmenuselect/build_tools/prep_tarball Thu Mar 15 18:27:10 2007
@@ -6,3 +6,7 @@
# It will be executed from the top-level directory of the project.
make -C sounds all MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-FREEPLAY-WAV WGET=wget DOWNLOAD=wget
+
+cd doc
+rubber asterisk.tex
+cd ..
Modified: team/russell/gmenuselect/cdr/cdr_radius.c
URL: http://svn.digium.com/view/asterisk/team/russell/gmenuselect/cdr/cdr_radius.c?view=diff&rev=58944&r1=58943&r2=58944
==============================================================================
--- team/russell/gmenuselect/cdr/cdr_radius.c (original)
+++ team/russell/gmenuselect/cdr/cdr_radius.c Thu Mar 15 18:27:10 2007
@@ -20,7 +20,7 @@
*
* \brief RADIUS CDR Support
* \author Philippe Sultan
- * \extref FreeRadius http://www.freeradius.org/
+ * \extref The Radius Client Library - http://developer.berlios.de/projects/radiusclient-ng/
*
* \arg See also \ref AstCDR
* \ingroup cdr_drivers
Modified: team/russell/gmenuselect/cdr/cdr_sqlite.c
URL: http://svn.digium.com/view/asterisk/team/russell/gmenuselect/cdr/cdr_sqlite.c?view=diff&rev=58944&r1=58943&r2=58944
==============================================================================
--- team/russell/gmenuselect/cdr/cdr_sqlite.c (original)
+++ team/russell/gmenuselect/cdr/cdr_sqlite.c Thu Mar 15 18:27:10 2007
@@ -30,6 +30,8 @@
*
* Creates the database and table on-the-fly
* \ingroup cdr_drivers
+ *
+ * \note This module has been marked deprecated in favor for cdr_sqlite3_custom
*/
/*** MODULEINFO
@@ -180,6 +182,9 @@
char fn[PATH_MAX];
int res;
+ ast_log(LOG_WARNING, "This module has been marked deprecated in favor of "
+ "using cdr_sqlite3_custom. (May be removed after Asterisk 1.6)\n");
+
/* is the database there? */
snprintf(fn, sizeof(fn), "%s/cdr.db", ast_config_AST_LOG_DIR);
db = sqlite_open(fn, AST_FILE_MODE, &zErr);
Modified: team/russell/gmenuselect/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/russell/gmenuselect/channels/chan_h323.c?view=diff&rev=58944&r1=58943&r2=58944
==============================================================================
--- team/russell/gmenuselect/channels/chan_h323.c (original)
+++ team/russell/gmenuselect/channels/chan_h323.c Thu Mar 15 18:27:10 2007
@@ -29,7 +29,7 @@
*
* \par See also
* \arg Config_h323
- * \extref OpenH323 http://www.openh323.org/
+ * \extref OpenH323 http://www.voxgratia.org/
*
* \ingroup channel_drivers
*/
Modified: team/russell/gmenuselect/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/russell/gmenuselect/channels/chan_iax2.c?view=diff&rev=58944&r1=58943&r2=58944
==============================================================================
--- team/russell/gmenuselect/channels/chan_iax2.c (original)
+++ team/russell/gmenuselect/channels/chan_iax2.c Thu Mar 15 18:27:10 2007
@@ -6500,7 +6500,7 @@
duped_fr = iaxfrdup2(fr);
if (duped_fr)
schedule_delivery(duped_fr, 1, 1, &fr->ts);
- if (iaxs[fr->callno]->last < fr->ts)
+ if (iaxs[fr->callno] && iaxs[fr->callno]->last < fr->ts)
iaxs[fr->callno]->last = fr->ts;
}
} else {
Modified: team/russell/gmenuselect/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/russell/gmenuselect/channels/chan_sip.c?view=diff&rev=58944&r1=58943&r2=58944
==============================================================================
--- team/russell/gmenuselect/channels/chan_sip.c (original)
+++ team/russell/gmenuselect/channels/chan_sip.c Thu Mar 15 18:27:10 2007
@@ -7838,7 +7838,17 @@
/* Fromdomain is what we are registering to, regardless of actual
host name from SRV */
- snprintf(addr, sizeof(addr), "sip:%s", S_OR(p->fromdomain, r->hostname));
+ if (!ast_strlen_zero(p->fromdomain)) {
+ if (r->portno && r->portno != STANDARD_SIP_PORT)
+ snprintf(addr, sizeof(addr), "sip:%s:%d", p->fromdomain, r->portno);
+ else
+ snprintf(addr, sizeof(addr), "sip:%s", p->fromdomain);
+ } else {
+ if (r->portno && r->portno != STANDARD_SIP_PORT)
+ snprintf(addr, sizeof(addr), "sip:%s:%d", r->hostname, r->portno);
+ else
+ snprintf(addr, sizeof(addr), "sip:%s", r->hostname);
+ }
ast_string_field_set(p, uri, addr);
p->branch ^= ast_random();
@@ -9858,6 +9868,10 @@
}
{
char *tmp = ast_strdupa(of);
+ /* We need to be able to handle auth-headers looking like
+ <sip:8164444422;phone-context=+1 at 1.2.3.4:5060;user=phone;tag=SDadkoa01-gK0c3bdb43>
+ */
+ tmp = strsep(&tmp, ";");
if (ast_is_shrinkable_phonenumber(tmp))
ast_shrink_phone_number(tmp);
ast_string_field_set(p, cid_num, tmp);
@@ -12887,9 +12901,10 @@
break;
case 200: /* 200 OK */
p->authtries = 0; /* Reset authentication counter */
- if (sipmethod == SIP_MESSAGE) {
- /* We successfully transmitted a message */
- ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
+ if (sipmethod == SIP_MESSAGE || sipmethod == SIP_INFO) {
+ /* We successfully transmitted a message
+ or a video update request in INFO */
+ /* Nothing happens here - the message is inside a dialog */
} else if (sipmethod == SIP_INVITE) {
handle_response_invite(p, resp, rest, req, seqno);
} else if (sipmethod == SIP_NOTIFY) {
@@ -13022,7 +13037,8 @@
if ((option_verbose > 2) && (resp != 487))
ast_verbose(VERBOSE_PREFIX_3 "Got SIP response %d \"%s\" back from %s\n", resp, rest, ast_inet_ntoa(p->sa.sin_addr));
- stop_media_flows(p); /* Immediately stop RTP, VRTP and UDPTL as applicable */
+ if (sipmethod == SIP_INVITE)
+ stop_media_flows(p); /* Immediately stop RTP, VRTP and UDPTL as applicable */
/* XXX Locking issues?? XXX */
switch(resp) {
@@ -13066,14 +13082,15 @@
break;
default:
/* Send hangup */
- if (owner)
+ if (owner && sipmethod != SIP_MESSAGE && sipmethod != SIP_INFO)
ast_queue_hangup(p->owner);
break;
}
/* ACK on invite */
if (sipmethod == SIP_INVITE)
transmit_request(p, SIP_ACK, seqno, XMIT_UNRELIABLE, FALSE);
- sip_alreadygone(p);
+ if (sipmethod != SIP_MESSAGE && sipmethod != SIP_INFO)
+ sip_alreadygone(p);
if (!p->owner)
ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
} else if ((resp >= 100) && (resp < 200)) {
@@ -13129,10 +13146,10 @@
}
} else if (sipmethod == SIP_BYE)
ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
- else if (sipmethod == SIP_MESSAGE)
- /* We successfully transmitted a message */
- /* XXX Why destroy this pvt after message transfer? Bad */
- ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
+ else if (sipmethod == SIP_MESSAGE || sipmethod == SIP_INFO)
+ /* We successfully transmitted a message or
+ a video update request in INFO */
+ ;
else if (sipmethod == SIP_BYE)
/* Ok, we're ready to go */
ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
@@ -17014,7 +17031,7 @@
compactheaders = ast_true(v->value);
} else if (!strcasecmp(v->name, "notifymimetype")) {
ast_copy_string(default_notifymime, v->value, sizeof(default_notifymime));
- } else if (!strcasecmp(v->name, "limitonpeers")) {
+ } else if (!strncasecmp(v->name, "limitonpeer", 11)) {
global_limitonpeers = ast_true(v->value);
} else if (!strcasecmp(v->name, "directrtpsetup")) {
global_directrtpsetup = ast_true(v->value);
Modified: team/russell/gmenuselect/configs/extconfig.conf.sample
URL: http://svn.digium.com/view/asterisk/team/russell/gmenuselect/configs/extconfig.conf.sample?view=diff&rev=58944&r1=58943&r2=58944
==============================================================================
--- team/russell/gmenuselect/configs/extconfig.conf.sample (original)
+++ team/russell/gmenuselect/configs/extconfig.conf.sample Thu Mar 15 18:27:10 2007
@@ -18,6 +18,7 @@
;uncomment to load queues.conf via the odbc engine.
;
;queues.conf => odbc,asterisk,ast_config
+;extensions.conf => sqlite,asterisk,ast_config
;
; The following files CANNOT be loaded from Realtime storage:
; asterisk.conf
@@ -42,6 +43,12 @@
;example => odbc,asterisk,alttable
;example2 => ldap,"dc=oxymium,dc=net",example2
;
+; "odbc" is shown in the examples below, but is not the only valid realtime
+; engine. There is:
+; odbc ... res_config_odbc
+; sqlite ... res_config_sqlite
+; pgsql ... res_config_pgsql
+;
;iaxusers => odbc,asterisk
;iaxpeers => odbc,asterisk
;sipusers => odbc,asterisk
Modified: team/russell/gmenuselect/configs/sla.conf.sample
URL: http://svn.digium.com/view/asterisk/team/russell/gmenuselect/configs/sla.conf.sample?view=diff&rev=58944&r1=58943&r2=58944
==============================================================================
--- team/russell/gmenuselect/configs/sla.conf.sample (original)
+++ team/russell/gmenuselect/configs/sla.conf.sample Thu Mar 15 18:27:10 2007
@@ -1,13 +1,17 @@
;
; Configuration for Shared Line Appearances (SLA).
;
-; See doc/sla.txt for more information.
+; See doc/sla.pdf for more information.
;
; ---- General Options ----------------
[general]
-; There are none!
+;attemptcallerid=no ; Attempt CallerID handling. The default value for this
+ ; is "no" because CallerID handling with an SLA setup is
+ ; known to not work properly in some situations. However,
+ ; feel free to enable it if you would like. If you do, and
+ ; you find problems, please do not report them.
; -------------------------------------
Modified: team/russell/gmenuselect/configure
URL: http://svn.digium.com/view/asterisk/team/russell/gmenuselect/configure?view=diff&rev=58944&r1=58943&r2=58944
==============================================================================
--- team/russell/gmenuselect/configure (original)
+++ team/russell/gmenuselect/configure Thu Mar 15 18:27:10 2007
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 57557 .
+# From configure.ac Revision: 58866 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.60.
#
@@ -692,6 +692,7 @@
DOT
STRIP
WGET
+RUBBER
FETCH
DOWNLOAD
acx_pthread_config
@@ -819,6 +820,10 @@
SQLITE_INCLUDE
SQLITE_DIR
PBX_SQLITE
+SQLITE3_LIB
+SQLITE3_INCLUDE
+SQLITE3_DIR
+PBX_SQLITE3
SUPPSERV_LIB
SUPPSERV_INCLUDE
SUPPSERV_DIR
@@ -1520,6 +1525,7 @@
--with-radius=PATH use Radius Client files in PATH
--with-speex=PATH use Speex files in PATH
--with-sqlite=PATH use SQLite files in PATH
+ --with-sqlite3=PATH use SQLite files in PATH
--with-suppserv=PATH use mISDN Supplemental Services files in PATH
--with-ssl=PATH use OpenSSL files in PATH
--with-tds=PATH use FreeTDS files in PATH
@@ -7427,6 +7433,47 @@
fi
+# Extract the first word of "rubber", so it can be a program name with args.
+set dummy rubber; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_RUBBER+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $RUBBER in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_RUBBER="$RUBBER" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_RUBBER="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_RUBBER" && ac_cv_path_RUBBER=":"
+ ;;
+esac
+fi
+RUBBER=$ac_cv_path_RUBBER
+if test -n "$RUBBER"; then
+ { echo "$as_me:$LINENO: result: $RUBBER" >&5
+echo "${ECHO_T}$RUBBER" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
if test "${WGET}" != ":" ; then
DOWNLOAD=${WGET}
else
@@ -8814,6 +8861,34 @@
fi
PBX_SQLITE=0
+
+
+
+
+
+
+SQLITE3_DESCRIP="SQLite"
+SQLITE3_OPTION="sqlite3"
+
+# Check whether --with-sqlite3 was given.
+if test "${with_sqlite3+set}" = set; then
+ withval=$with_sqlite3;
+case ${withval} in
+ n|no)
+ USE_SQLITE3=no
+ ;;
+ y|ye|yes)
+ ac_mandatory_list="${ac_mandatory_list} SQLITE3"
+ ;;
+ *)
+ SQLITE3_DIR="${withval}"
+ ac_mandatory_list="${ac_mandatory_list} SQLITE3"
+ ;;
+esac
+
+fi
+
+PBX_SQLITE3=0
@@ -31999,6 +32074,461 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_SQLITE_VERSION
+_ACEOF
+
+ fi
+ fi
+fi
+
+
+
+if test "x${PBX_SQLITE3}" != "x1" -a "${USE_SQLITE3}" != "no"; then
+ pbxlibdir=""
+ if test "x${SQLITE3_DIR}" != "x"; then
+ if test -d ${SQLITE3_DIR}/lib; then
+ pbxlibdir="-L${SQLITE3_DIR}/lib"
+ else
+ pbxlibdir="-L${SQLITE3_DIR}"
+ fi
+ fi
+ pbxfuncname="sqlite3_open"
+ if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
+ AST_SQLITE3_FOUND=yes
+ else
+ as_ac_Lib=`echo "ac_cv_lib_sqlite3_${pbxfuncname}" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lsqlite3" >&5
+echo $ECHO_N "checking for ${pbxfuncname} in -lsqlite3... $ECHO_C" >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsqlite3 ${pbxlibdir} $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ${pbxfuncname} ();
+int
+main ()
+{
+return ${pbxfuncname} ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
[... 829 lines stripped ...]
More information about the asterisk-commits
mailing list