[svn-commits] russell: branch russell/chan_refcount r89707 - in /team/russell/chan_refcount...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Nov 27 14:07:52 CST 2007
Author: russell
Date: Tue Nov 27 14:07:50 2007
New Revision: 89707
URL: http://svn.digium.com/view/asterisk?view=rev&rev=89707
Log:
get up to date with trunk
Added:
team/russell/chan_refcount/include/asterisk/mod_format.h
- copied unchanged from r89637, trunk/include/asterisk/mod_format.h
Modified:
team/russell/chan_refcount/ (props changed)
team/russell/chan_refcount/CHANGES
team/russell/chan_refcount/Makefile
team/russell/chan_refcount/UPGRADE.txt
team/russell/chan_refcount/apps/app_adsiprog.c
team/russell/chan_refcount/apps/app_alarmreceiver.c
team/russell/chan_refcount/apps/app_amd.c
team/russell/chan_refcount/apps/app_authenticate.c
team/russell/chan_refcount/apps/app_cdr.c
team/russell/chan_refcount/apps/app_chanisavail.c
team/russell/chan_refcount/apps/app_channelredirect.c
team/russell/chan_refcount/apps/app_chanspy.c
team/russell/chan_refcount/apps/app_controlplayback.c
team/russell/chan_refcount/apps/app_db.c
team/russell/chan_refcount/apps/app_dial.c
team/russell/chan_refcount/apps/app_dictate.c
team/russell/chan_refcount/apps/app_directed_pickup.c
team/russell/chan_refcount/apps/app_directory.c
team/russell/chan_refcount/apps/app_disa.c
team/russell/chan_refcount/apps/app_dumpchan.c
team/russell/chan_refcount/apps/app_echo.c
team/russell/chan_refcount/apps/app_exec.c
team/russell/chan_refcount/apps/app_externalivr.c
team/russell/chan_refcount/apps/app_festival.c
team/russell/chan_refcount/apps/app_flash.c
team/russell/chan_refcount/apps/app_followme.c
team/russell/chan_refcount/apps/app_getcpeid.c
team/russell/chan_refcount/apps/app_ices.c
team/russell/chan_refcount/apps/app_image.c
team/russell/chan_refcount/apps/app_macro.c
team/russell/chan_refcount/apps/app_meetme.c
team/russell/chan_refcount/apps/app_milliwatt.c
team/russell/chan_refcount/apps/app_minivm.c
team/russell/chan_refcount/apps/app_mixmonitor.c
team/russell/chan_refcount/apps/app_morsecode.c
team/russell/chan_refcount/apps/app_mp3.c
team/russell/chan_refcount/apps/app_nbscat.c
team/russell/chan_refcount/apps/app_osplookup.c
team/russell/chan_refcount/apps/app_page.c
team/russell/chan_refcount/apps/app_parkandannounce.c
team/russell/chan_refcount/apps/app_playback.c
team/russell/chan_refcount/apps/app_privacy.c
team/russell/chan_refcount/apps/app_queue.c
team/russell/chan_refcount/apps/app_read.c
team/russell/chan_refcount/apps/app_readexten.c
team/russell/chan_refcount/apps/app_readfile.c
team/russell/chan_refcount/apps/app_record.c
team/russell/chan_refcount/apps/app_rpt.c
team/russell/chan_refcount/apps/app_sayunixtime.c
team/russell/chan_refcount/apps/app_senddtmf.c
team/russell/chan_refcount/apps/app_sendtext.c
team/russell/chan_refcount/apps/app_sms.c
team/russell/chan_refcount/apps/app_stack.c
team/russell/chan_refcount/apps/app_system.c
team/russell/chan_refcount/apps/app_talkdetect.c
team/russell/chan_refcount/apps/app_test.c
team/russell/chan_refcount/apps/app_transfer.c
team/russell/chan_refcount/apps/app_url.c
team/russell/chan_refcount/apps/app_userevent.c
team/russell/chan_refcount/apps/app_verbose.c
team/russell/chan_refcount/apps/app_voicemail.c
team/russell/chan_refcount/apps/app_waitforring.c
team/russell/chan_refcount/apps/app_waitforsilence.c
team/russell/chan_refcount/apps/app_while.c
team/russell/chan_refcount/apps/app_zapbarge.c
team/russell/chan_refcount/apps/app_zapras.c
team/russell/chan_refcount/apps/app_zapscan.c
team/russell/chan_refcount/cdr/cdr_adaptive_odbc.c
team/russell/chan_refcount/cdr/cdr_csv.c
team/russell/chan_refcount/cdr/cdr_odbc.c
team/russell/chan_refcount/cdr/cdr_pgsql.c
team/russell/chan_refcount/cdr/cdr_radius.c
team/russell/chan_refcount/cdr/cdr_sqlite3_custom.c
team/russell/chan_refcount/cdr/cdr_tds.c
team/russell/chan_refcount/channels/chan_agent.c
team/russell/chan_refcount/channels/chan_alsa.c
team/russell/chan_refcount/channels/chan_features.c
team/russell/chan_refcount/channels/chan_gtalk.c
team/russell/chan_refcount/channels/chan_h323.c
team/russell/chan_refcount/channels/chan_iax2.c
team/russell/chan_refcount/channels/chan_jingle.c
team/russell/chan_refcount/channels/chan_local.c
team/russell/chan_refcount/channels/chan_mgcp.c
team/russell/chan_refcount/channels/chan_misdn.c
team/russell/chan_refcount/channels/chan_nbs.c
team/russell/chan_refcount/channels/chan_oss.c
team/russell/chan_refcount/channels/chan_phone.c
team/russell/chan_refcount/channels/chan_sip.c
team/russell/chan_refcount/channels/chan_skinny.c
team/russell/chan_refcount/channels/chan_usbradio.c
team/russell/chan_refcount/channels/chan_vpb.cc
team/russell/chan_refcount/channels/chan_zap.c
team/russell/chan_refcount/channels/iax2-provision.c
team/russell/chan_refcount/codecs/codec_a_mu.c
team/russell/chan_refcount/codecs/codec_adpcm.c
team/russell/chan_refcount/codecs/codec_alaw.c
team/russell/chan_refcount/codecs/codec_g722.c
team/russell/chan_refcount/codecs/codec_g726.c
team/russell/chan_refcount/codecs/codec_gsm.c
team/russell/chan_refcount/codecs/codec_ilbc.c
team/russell/chan_refcount/codecs/codec_lpc10.c
team/russell/chan_refcount/codecs/codec_speex.c
team/russell/chan_refcount/codecs/codec_ulaw.c
team/russell/chan_refcount/configs/agents.conf.sample
team/russell/chan_refcount/configs/cdr.conf.sample
team/russell/chan_refcount/configs/extensions.conf.sample
team/russell/chan_refcount/configs/res_odbc.conf.sample
team/russell/chan_refcount/configs/sip.conf.sample
team/russell/chan_refcount/configs/voicemail.conf.sample
team/russell/chan_refcount/configure
team/russell/chan_refcount/configure.ac
team/russell/chan_refcount/doc/CODING-GUIDELINES
team/russell/chan_refcount/doc/osp.txt
team/russell/chan_refcount/formats/format_g723.c
team/russell/chan_refcount/formats/format_g726.c
team/russell/chan_refcount/formats/format_g729.c
team/russell/chan_refcount/formats/format_gsm.c
team/russell/chan_refcount/formats/format_h263.c
team/russell/chan_refcount/formats/format_h264.c
team/russell/chan_refcount/formats/format_ilbc.c
team/russell/chan_refcount/formats/format_jpeg.c
team/russell/chan_refcount/formats/format_ogg_vorbis.c
team/russell/chan_refcount/formats/format_pcm.c
team/russell/chan_refcount/formats/format_sln.c
team/russell/chan_refcount/formats/format_vox.c
team/russell/chan_refcount/formats/format_wav.c
team/russell/chan_refcount/formats/format_wav_gsm.c
team/russell/chan_refcount/funcs/func_blacklist.c
team/russell/chan_refcount/funcs/func_callerid.c
team/russell/chan_refcount/funcs/func_curl.c
team/russell/chan_refcount/funcs/func_cut.c
team/russell/chan_refcount/funcs/func_db.c
team/russell/chan_refcount/funcs/func_enum.c
team/russell/chan_refcount/funcs/func_env.c
team/russell/chan_refcount/funcs/func_global.c
team/russell/chan_refcount/funcs/func_iconv.c
team/russell/chan_refcount/funcs/func_lock.c
team/russell/chan_refcount/funcs/func_md5.c
team/russell/chan_refcount/funcs/func_module.c
team/russell/chan_refcount/funcs/func_odbc.c
team/russell/chan_refcount/funcs/func_rand.c
team/russell/chan_refcount/funcs/func_realtime.c
team/russell/chan_refcount/funcs/func_sha1.c
team/russell/chan_refcount/funcs/func_strings.c
team/russell/chan_refcount/funcs/func_timeout.c
team/russell/chan_refcount/funcs/func_version.c
team/russell/chan_refcount/funcs/func_vmcount.c
team/russell/chan_refcount/include/asterisk.h
team/russell/chan_refcount/include/asterisk/app.h
team/russell/chan_refcount/include/asterisk/audiohook.h
team/russell/chan_refcount/include/asterisk/cdr.h
team/russell/chan_refcount/include/asterisk/channel.h
team/russell/chan_refcount/include/asterisk/doxyref.h
team/russell/chan_refcount/include/asterisk/file.h
team/russell/chan_refcount/include/asterisk/frame.h
team/russell/chan_refcount/include/asterisk/image.h
team/russell/chan_refcount/include/asterisk/module.h
team/russell/chan_refcount/include/asterisk/pbx.h
team/russell/chan_refcount/include/asterisk/res_odbc.h
team/russell/chan_refcount/main/abstract_jb.c
team/russell/chan_refcount/main/acl.c
team/russell/chan_refcount/main/adsistub.c
team/russell/chan_refcount/main/app.c
team/russell/chan_refcount/main/asterisk.c
team/russell/chan_refcount/main/astmm.c
team/russell/chan_refcount/main/audiohook.c
team/russell/chan_refcount/main/autoservice.c
team/russell/chan_refcount/main/callerid.c
team/russell/chan_refcount/main/cdr.c
team/russell/chan_refcount/main/channel.c
team/russell/chan_refcount/main/cli.c
team/russell/chan_refcount/main/config.c
team/russell/chan_refcount/main/db.c
team/russell/chan_refcount/main/devicestate.c
team/russell/chan_refcount/main/dial.c
team/russell/chan_refcount/main/dns.c
team/russell/chan_refcount/main/dnsmgr.c
team/russell/chan_refcount/main/dsp.c
team/russell/chan_refcount/main/enum.c
team/russell/chan_refcount/main/file.c
team/russell/chan_refcount/main/frame.c
team/russell/chan_refcount/main/http.c
team/russell/chan_refcount/main/image.c
team/russell/chan_refcount/main/indications.c
team/russell/chan_refcount/main/io.c
team/russell/chan_refcount/main/jitterbuf.c
team/russell/chan_refcount/main/loader.c
team/russell/chan_refcount/main/logger.c
team/russell/chan_refcount/main/manager.c
team/russell/chan_refcount/main/netsock.c
team/russell/chan_refcount/main/pbx.c
team/russell/chan_refcount/main/privacy.c
team/russell/chan_refcount/main/rtp.c
team/russell/chan_refcount/main/say.c
team/russell/chan_refcount/main/sched.c
team/russell/chan_refcount/main/srv.c
team/russell/chan_refcount/main/term.c
team/russell/chan_refcount/main/translate.c
team/russell/chan_refcount/main/udptl.c
team/russell/chan_refcount/main/utils.c
team/russell/chan_refcount/pbx/ael/ael-test/ael-test19/extensions.ael
team/russell/chan_refcount/pbx/ael/ael-test/ael-test3/extensions.ael
team/russell/chan_refcount/pbx/ael/ael-test/ael-test7/extensions.ael
team/russell/chan_refcount/pbx/ael/ael-test/ael-vtest13/extensions.ael
team/russell/chan_refcount/pbx/ael/ael-test/ref.ael-vtest13
team/russell/chan_refcount/pbx/pbx_config.c
team/russell/chan_refcount/pbx/pbx_dundi.c
team/russell/chan_refcount/pbx/pbx_gtkconsole.c
team/russell/chan_refcount/pbx/pbx_loopback.c
team/russell/chan_refcount/pbx/pbx_realtime.c
team/russell/chan_refcount/pbx/pbx_spool.c
team/russell/chan_refcount/res/ael/pval.c
team/russell/chan_refcount/res/res_adsi.c
team/russell/chan_refcount/res/res_ael_share.c
team/russell/chan_refcount/res/res_agi.c
team/russell/chan_refcount/res/res_config_odbc.c
team/russell/chan_refcount/res/res_config_pgsql.c
team/russell/chan_refcount/res/res_config_sqlite.c
team/russell/chan_refcount/res/res_crypto.c
team/russell/chan_refcount/res/res_features.c
team/russell/chan_refcount/res/res_jabber.c
team/russell/chan_refcount/res/res_monitor.c
team/russell/chan_refcount/res/res_musiconhold.c
team/russell/chan_refcount/res/res_odbc.c
team/russell/chan_refcount/res/res_realtime.c
team/russell/chan_refcount/res/res_smdi.c
team/russell/chan_refcount/res/res_snmp.c
team/russell/chan_refcount/res/res_speech.c
team/russell/chan_refcount/utils/Makefile
team/russell/chan_refcount/utils/ael_main.c
team/russell/chan_refcount/utils/check_expr.c
team/russell/chan_refcount/utils/conf2ael.c
Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
automerge = *
Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov 27 14:07:50 2007
@@ -1,1 +1,1 @@
-/trunk:1-89503
+/trunk:1-89652
Modified: team/russell/chan_refcount/CHANGES
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/CHANGES?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/CHANGES (original)
+++ team/russell/chan_refcount/CHANGES Tue Nov 27 14:07:50 2007
@@ -55,6 +55,7 @@
* Ability to set process limits ("ulimit") without restarting Asterisk
* Enhanced "agi debug" to print the channel name as a prefix to the debug
output to make debugging on busy systems much easier.
+ * New CLI commands "dialplan set extenpatternmatching true/false"
SIP changes
-----------
@@ -89,8 +90,11 @@
* SIP now adds a header to the CANCEL if the call was answered by another phone
in the same dial command, or if the new c option in dial() is used.
* The new default is that 100 Trying is not sent on REGISTER attempts as the RFC specifically
- states it is not needed. For phones, however, that do require it the registertrying option
+ states it is not needed. For phones, however, that do require it the "registertrying" option
has been added so it can be enabled.
+ * A new option called "callcounter" (global/peer/user level) enables call counters needed
+ for better status reports needed for queues and SIP subscriptions. (Call-Limit was previously
+ used to enable this functionality).
IAX2 changes
------------
@@ -339,3 +343,12 @@
* Added a new channel driver, chan_unistim. See doc/unistim.txt and
configs/unistim.conf.sample for details. This new channel driver allows
you to use Nortel i2002, i2004, and i2050 phones with Asterisk.
+ * 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
+ matcher is still under development. A config file option, in extensions.conf,
+ in the [general] section, called "extenpatternmatchingnew", is by default
+ set to false; setting that to true will force the use of the new algorithm.
+ Also, the cli commands "dialplan set extenpatternmatchingnew true/false" can
+ be used to switch the algorithms at run time.
+
Modified: team/russell/chan_refcount/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/Makefile?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/Makefile (original)
+++ team/russell/chan_refcount/Makefile Tue Nov 27 14:07:50 2007
@@ -304,7 +304,7 @@
@echo " + $(mK) install +"
@echo " +-------------------------------------------+"
-_all: cleantest $(SUBDIRS)
+_all: cleantest makeopts $(SUBDIRS)
makeopts: configure
@echo "****"
Modified: team/russell/chan_refcount/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/UPGRADE.txt?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/UPGRADE.txt (original)
+++ team/russell/chan_refcount/UPGRADE.txt Tue Nov 27 14:07:50 2007
@@ -46,6 +46,9 @@
* The logger.conf option 'rotatetimestamp' has been deprecated in favor of
'rotatestrategy'. This new option supports a 'rotate' strategy that more
closely mimics the system logger in terms of file rotation.
+
+* The concise versions of various CLI commands are now deprecated. We recommend
+ using the manager interface (AMI) for application integration with Asterisk.
Voicemail:
@@ -106,14 +109,18 @@
Channel Drivers:
-* chan_sip.c: a small upgrade to support the "Record" button on the SNOM360,
+* SIP: a small upgrade to support the "Record" button on the SNOM360,
which sends a sip INFO message with a "Record: on" or "Record: off"
- header. If asterisk is set up (via features.conf) to accept "One Touch Monitor"
+ header. If Asterisk is set up (via features.conf) to accept "One Touch Monitor"
requests (by default, via '*1'), then the user-configured dialpad sequence
is generated, and recording can be started and stopped via this button. The
file names and formats are all controlled via the normal mechanisms. If the
user has not configured the automon feature, the normal "415 Unsupported media type"
is returned, and nothing is done.
+* SIP: The "call-limit" option is marked as deprecated. It still works in this version of
+ Asterisk, but will be removed in the following version. Please use the groupcount functions
+ in the dialplan to enforce call limits. The "limitonpeer" configuration option is
+ now renamed to "counteronpeer".
* chan_local.c: the comma delimiter inside the channel name has been changed to a
semicolon, in order to make the Local channel driver compatible with the comma
Modified: team/russell/chan_refcount/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_adsiprog.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_adsiprog.c (original)
+++ team/russell/chan_refcount/apps/app_adsiprog.c Tue Nov 27 14:07:50 2007
@@ -42,7 +42,6 @@
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/adsi.h"
-#include "asterisk/options.h"
#include "asterisk/utils.h"
#include "asterisk/lock.h"
Modified: team/russell/chan_refcount/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_alarmreceiver.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_alarmreceiver.c (original)
+++ team/russell/chan_refcount/apps/app_alarmreceiver.c Tue Nov 27 14:07:50 2007
@@ -44,7 +44,6 @@
#include "asterisk/module.h"
#include "asterisk/translate.h"
#include "asterisk/ulaw.h"
-#include "asterisk/options.h"
#include "asterisk/app.h"
#include "asterisk/dsp.h"
#include "asterisk/config.h"
Modified: team/russell/chan_refcount/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_amd.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_amd.c (original)
+++ team/russell/chan_refcount/apps/app_amd.c Tue Nov 27 14:07:50 2007
@@ -33,7 +33,6 @@
#include "asterisk/module.h"
#include "asterisk/lock.h"
-#include "asterisk/options.h"
#include "asterisk/channel.h"
#include "asterisk/dsp.h"
#include "asterisk/pbx.h"
Modified: team/russell/chan_refcount/apps/app_authenticate.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_authenticate.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_authenticate.c (original)
+++ team/russell/chan_refcount/apps/app_authenticate.c Tue Nov 27 14:07:50 2007
@@ -37,7 +37,6 @@
#include "asterisk/app.h"
#include "asterisk/astdb.h"
#include "asterisk/utils.h"
-#include "asterisk/options.h"
enum {
OPT_ACCOUNT = (1 << 0),
Modified: team/russell/chan_refcount/apps/app_cdr.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_cdr.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_cdr.c (original)
+++ team/russell/chan_refcount/apps/app_cdr.c Tue Nov 27 14:07:50 2007
@@ -31,7 +31,6 @@
#include "asterisk/channel.h"
#include "asterisk/module.h"
-#include "asterisk/pbx.h"
static char *nocdr_descrip =
" NoCDR(): This application will tell Asterisk not to maintain a CDR for the\n"
Modified: team/russell/chan_refcount/apps/app_chanisavail.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_chanisavail.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_chanisavail.c (original)
+++ team/russell/chan_refcount/apps/app_chanisavail.c Tue Nov 27 14:07:50 2007
@@ -40,7 +40,6 @@
#include "asterisk/module.h"
#include "asterisk/app.h"
#include "asterisk/devicestate.h"
-#include "asterisk/options.h"
static char *app = "ChanIsAvail";
Modified: team/russell/chan_refcount/apps/app_channelredirect.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_channelredirect.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_channelredirect.c (original)
+++ team/russell/chan_refcount/apps/app_channelredirect.c Tue Nov 27 14:07:50 2007
@@ -34,7 +34,6 @@
#include "asterisk/lock.h"
#include "asterisk/app.h"
#include "asterisk/features.h"
-#include "asterisk/options.h"
static char *app = "ChannelRedirect";
static char *synopsis = "Redirects given channel to a dialplan target.";
Modified: team/russell/chan_refcount/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_chanspy.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_chanspy.c (original)
+++ team/russell/chan_refcount/apps/app_chanspy.c Tue Nov 27 14:07:50 2007
@@ -38,7 +38,6 @@
#include "asterisk/channel.h"
#include "asterisk/audiohook.h"
#include "asterisk/features.h"
-#include "asterisk/options.h"
#include "asterisk/app.h"
#include "asterisk/utils.h"
#include "asterisk/say.h"
Modified: team/russell/chan_refcount/apps/app_controlplayback.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_controlplayback.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_controlplayback.c (original)
+++ team/russell/chan_refcount/apps/app_controlplayback.c Tue Nov 27 14:07:50 2007
@@ -29,15 +29,9 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/app.h"
#include "asterisk/module.h"
-#include "asterisk/translate.h"
-#include "asterisk/utils.h"
-#include "asterisk/options.h"
static const char *app = "ControlPlayback";
Modified: team/russell/chan_refcount/apps/app_db.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_db.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_db.c (original)
+++ team/russell/chan_refcount/apps/app_db.c Tue Nov 27 14:07:50 2007
@@ -32,7 +32,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk/options.h"
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
Modified: team/russell/chan_refcount/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_dial.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_dial.c (original)
+++ team/russell/chan_refcount/apps/app_dial.c Tue Nov 27 14:07:50 2007
@@ -39,7 +39,6 @@
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/module.h"
#include "asterisk/translate.h"
#include "asterisk/say.h"
@@ -51,6 +50,7 @@
#include "asterisk/app.h"
#include "asterisk/causes.h"
#include "asterisk/rtp.h"
+#include "asterisk/cdr.h"
#include "asterisk/manager.h"
#include "asterisk/privacy.h"
#include "asterisk/stringfields.h"
@@ -821,7 +821,26 @@
}
}
-
+ if (peer && !ast_cdr_log_unanswered()) {
+ /* suppress the CDR's that didn't win */
+ struct chanlist *o;
+ for (o = outgoing; o; o = o->next) {
+ struct ast_channel *c = o->chan;
+ if (c && c != peer && c->cdr) {
+ ast_set_flag(c->cdr, AST_CDR_FLAG_POST_DISABLED);
+ }
+ }
+ } else if (!peer && !ast_cdr_log_unanswered()) {
+ /* suppress the CDR's that didn't win */
+ struct chanlist *o;
+ for (o = outgoing; o; o = o->next) {
+ struct ast_channel *c = o->chan;
+ if (c && c->cdr) {
+ ast_set_flag(c->cdr, AST_CDR_FLAG_POST_DISABLED);
+ }
+ }
+ }
+
#ifdef HAVE_EPOLL
for (epollo = outgoing; epollo; epollo = epollo->next)
ast_poll_channel_del(in, epollo->chan);
@@ -1954,8 +1973,11 @@
res |= ast_unregister_application(rapp);
if ((con = ast_context_find("app_dial_gosub_virtual_context")))
+ {
ast_context_remove_extension2(con, "s", 1, NULL);
-
+ ast_context_destroy(con, "app_dial"); /* leave nothing behind */
+ }
+
return res;
}
Modified: team/russell/chan_refcount/apps/app_dictate.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_dictate.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_dictate.c (original)
+++ team/russell/chan_refcount/apps/app_dictate.c Tue Nov 27 14:07:50 2007
@@ -35,11 +35,9 @@
#include "asterisk/paths.h" /* use ast_config_AST_SPOOL_DIR */
#include "asterisk/file.h"
-#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/say.h"
-#include "asterisk/lock.h"
#include "asterisk/app.h"
static char *app = "Dictate";
Modified: team/russell/chan_refcount/apps/app_directed_pickup.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_directed_pickup.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_directed_pickup.c (original)
+++ team/russell/chan_refcount/apps/app_directed_pickup.c Tue Nov 27 14:07:50 2007
@@ -35,7 +35,6 @@
#include "asterisk/module.h"
#include "asterisk/lock.h"
#include "asterisk/app.h"
-#include "asterisk/options.h"
#include "asterisk/features.h"
#define PICKUPMARK "PICKUPMARK"
Modified: team/russell/chan_refcount/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_directory.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_directory.c (original)
+++ team/russell/chan_refcount/apps/app_directory.c Tue Nov 27 14:07:50 2007
@@ -32,14 +32,10 @@
#include <ctype.h>
#include "asterisk/paths.h" /* use ast_config_AST_SPOOL_DIR */
-#include "asterisk/lock.h"
#include "asterisk/file.h"
-#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
-#include "asterisk/config.h"
#include "asterisk/say.h"
-#include "asterisk/utils.h"
#include "asterisk/app.h"
#ifdef ODBC_STORAGE
Modified: team/russell/chan_refcount/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_disa.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_disa.c (original)
+++ team/russell/chan_refcount/apps/app_disa.c Tue Nov 27 14:07:50 2007
@@ -44,7 +44,6 @@
#include "asterisk/ulaw.h"
#include "asterisk/callerid.h"
#include "asterisk/stringfields.h"
-#include "asterisk/options.h"
static char *app = "DISA";
Modified: team/russell/chan_refcount/apps/app_dumpchan.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_dumpchan.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_dumpchan.c (original)
+++ team/russell/chan_refcount/apps/app_dumpchan.c Tue Nov 27 14:07:50 2007
@@ -32,13 +32,9 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk/file.h"
-#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
-#include "asterisk/options.h"
-#include "asterisk/utils.h"
-#include "asterisk/lock.h"
+#include "asterisk/channel.h"
static char *app = "DumpChan";
static char *synopsis = "Dump Info About The Calling Channel";
Modified: team/russell/chan_refcount/apps/app_echo.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_echo.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_echo.c (original)
+++ team/russell/chan_refcount/apps/app_echo.c Tue Nov 27 14:07:50 2007
@@ -29,11 +29,9 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk/lock.h"
#include "asterisk/file.h"
+#include "asterisk/module.h"
#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
static char *app = "Echo";
Modified: team/russell/chan_refcount/apps/app_exec.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_exec.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_exec.c (original)
+++ team/russell/chan_refcount/apps/app_exec.c Tue Nov 27 14:07:50 2007
@@ -31,7 +31,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/file.h"
-#include "asterisk/options.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
Modified: team/russell/chan_refcount/apps/app_externalivr.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_externalivr.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_externalivr.c (original)
+++ team/russell/chan_refcount/apps/app_externalivr.c Tue Nov 27 14:07:50 2007
@@ -45,7 +45,6 @@
#include "asterisk/linkedlists.h"
#include "asterisk/app.h"
#include "asterisk/utils.h"
-#include "asterisk/options.h"
static const char *app = "ExternalIVR";
Modified: team/russell/chan_refcount/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_festival.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_festival.c (original)
+++ team/russell/chan_refcount/apps/app_festival.c Tue Nov 27 14:07:50 2007
@@ -47,7 +47,6 @@
#include "asterisk/config.h"
#include "asterisk/utils.h"
#include "asterisk/lock.h"
-#include "asterisk/options.h"
#include "asterisk/app.h"
#define FESTIVAL_CONFIG "festival.conf"
Modified: team/russell/chan_refcount/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_flash.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_flash.c (original)
+++ team/russell/chan_refcount/apps/app_flash.c Tue Nov 27 14:07:50 2007
@@ -42,7 +42,6 @@
#include "asterisk/module.h"
#include "asterisk/translate.h"
#include "asterisk/image.h"
-#include "asterisk/options.h"
static char *app = "Flash";
Modified: team/russell/chan_refcount/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_followme.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_followme.c (original)
+++ team/russell/chan_refcount/apps/app_followme.c Tue Nov 27 14:07:50 2007
@@ -39,7 +39,6 @@
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/module.h"
#include "asterisk/translate.h"
#include "asterisk/say.h"
Modified: team/russell/chan_refcount/apps/app_getcpeid.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_getcpeid.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_getcpeid.c (original)
+++ team/russell/chan_refcount/apps/app_getcpeid.c Tue Nov 27 14:07:50 2007
@@ -35,7 +35,6 @@
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/adsi.h"
-#include "asterisk/options.h"
static char *app = "GetCPEID";
Modified: team/russell/chan_refcount/apps/app_ices.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_ices.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_ices.c (original)
+++ team/russell/chan_refcount/apps/app_ices.c Tue Nov 27 14:07:50 2007
@@ -43,7 +43,6 @@
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/translate.h"
-#include "asterisk/options.h"
#define ICES "/usr/bin/ices"
#define LOCAL_ICES "/usr/local/bin/ices"
Modified: team/russell/chan_refcount/apps/app_image.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_image.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_image.c (original)
+++ team/russell/chan_refcount/apps/app_image.c Tue Nov 27 14:07:50 2007
@@ -29,15 +29,9 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
-#include "asterisk/translate.h"
#include "asterisk/image.h"
-#include "asterisk/app.h"
-#include "asterisk/options.h"
static char *app = "SendImage";
Modified: team/russell/chan_refcount/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_macro.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_macro.c (original)
+++ team/russell/chan_refcount/apps/app_macro.c Tue Nov 27 14:07:50 2007
@@ -33,7 +33,6 @@
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
-#include "asterisk/options.h"
#include "asterisk/config.h"
#include "asterisk/utils.h"
#include "asterisk/lock.h"
Modified: team/russell/chan_refcount/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_meetme.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_meetme.c (original)
+++ team/russell/chan_refcount/apps/app_meetme.c Tue Nov 27 14:07:50 2007
@@ -49,7 +49,6 @@
#include "asterisk/dsp.h"
#include "asterisk/musiconhold.h"
#include "asterisk/manager.h"
-#include "asterisk/options.h"
#include "asterisk/cli.h"
#include "asterisk/say.h"
#include "asterisk/utils.h"
@@ -964,7 +963,7 @@
case CLI_INIT:
e->command = "meetme";
e->usage =
- "Usage: meetme concise|(un)lock|(un)mute|kick|list [concise] <confno> <usernumber>\n"
+ "Usage: meetme (un)lock|(un)mute|kick|list [concise] <confno> <usernumber>\n"
" Executes a command for the conference or on a conferee\n";
return NULL;
case CLI_GENERATE:
@@ -5192,6 +5191,9 @@
pthread_join(sla.thread, NULL);
}
+ /* Drop any created contexts from the dialplan */
+ ast_context_destroy(NULL, sla_registrar);
+
ast_mutex_destroy(&sla.lock);
ast_cond_destroy(&sla.cond);
}
Modified: team/russell/chan_refcount/apps/app_milliwatt.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_milliwatt.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_milliwatt.c (original)
+++ team/russell/chan_refcount/apps/app_milliwatt.c Tue Nov 27 14:07:50 2007
@@ -29,12 +29,8 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
+#include "asterisk/module.h"
#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/utils.h"
static char *app = "Milliwatt";
Modified: team/russell/chan_refcount/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_minivm.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_minivm.c (original)
+++ team/russell/chan_refcount/apps/app_minivm.c Tue Nov 27 14:07:50 2007
@@ -160,7 +160,6 @@
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/config.h"
#include "asterisk/say.h"
#include "asterisk/module.h"
Modified: team/russell/chan_refcount/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_mixmonitor.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_mixmonitor.c (original)
+++ team/russell/chan_refcount/apps/app_mixmonitor.c Tue Nov 27 14:07:50 2007
@@ -39,16 +39,12 @@
#include "asterisk/paths.h" /* use ast_config_AST_MONITOR_DIR */
#include "asterisk/file.h"
-#include "asterisk/channel.h"
#include "asterisk/audiohook.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
-#include "asterisk/lock.h"
#include "asterisk/cli.h"
-#include "asterisk/options.h"
#include "asterisk/app.h"
-#include "asterisk/linkedlists.h"
-#include "asterisk/utils.h"
+#include "asterisk/channel.h"
#define get_volfactor(x) x ? ((x > 0) ? (1 << x) : ((1 << abs(x)) * -1)) : 0
@@ -195,14 +191,14 @@
if (option_verbose > 1)
ast_verbose(VERBOSE_PREFIX_2 "End MixMonitor Recording %s\n", mixmonitor->name);
+ if (fs)
+ ast_closestream(fs);
+
if (mixmonitor->post_process) {
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_2 "Executing [%s]\n", mixmonitor->post_process);
ast_safe_system(mixmonitor->post_process);
}
-
- if (fs)
- ast_closestream(fs);
ast_free(mixmonitor);
Modified: team/russell/chan_refcount/apps/app_morsecode.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_morsecode.c?view=diff&rev=89707&r1=89706&r2=89707
==============================================================================
--- team/russell/chan_refcount/apps/app_morsecode.c (original)
+++ team/russell/chan_refcount/apps/app_morsecode.c Tue Nov 27 14:07:50 2007
@@ -29,7 +29,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/file.h"
-#include "asterisk/options.h"
#include "asterisk/channel.h"
[... 7303 lines stripped ...]
More information about the svn-commits
mailing list