[asterisk-commits] russell: branch group/sip-tcptls r89680 - in /team/group/sip-tcptls: ./ apps/...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Nov 27 11:45:53 CST 2007
Author: russell
Date: Tue Nov 27 11:45:52 2007
New Revision: 89680
URL: http://svn.digium.com/view/asterisk?view=rev&rev=89680
Log:
resolve, reset
Added:
team/group/sip-tcptls/include/asterisk/mod_format.h
- copied unchanged from r89637, trunk/include/asterisk/mod_format.h
Modified:
team/group/sip-tcptls/ (props changed)
team/group/sip-tcptls/CHANGES
team/group/sip-tcptls/Makefile
team/group/sip-tcptls/UPGRADE.txt
team/group/sip-tcptls/apps/app_adsiprog.c
team/group/sip-tcptls/apps/app_alarmreceiver.c
team/group/sip-tcptls/apps/app_amd.c
team/group/sip-tcptls/apps/app_authenticate.c
team/group/sip-tcptls/apps/app_cdr.c
team/group/sip-tcptls/apps/app_chanisavail.c
team/group/sip-tcptls/apps/app_channelredirect.c
team/group/sip-tcptls/apps/app_chanspy.c
team/group/sip-tcptls/apps/app_controlplayback.c
team/group/sip-tcptls/apps/app_db.c
team/group/sip-tcptls/apps/app_dial.c
team/group/sip-tcptls/apps/app_dictate.c
team/group/sip-tcptls/apps/app_directed_pickup.c
team/group/sip-tcptls/apps/app_directory.c
team/group/sip-tcptls/apps/app_disa.c
team/group/sip-tcptls/apps/app_dumpchan.c
team/group/sip-tcptls/apps/app_echo.c
team/group/sip-tcptls/apps/app_exec.c
team/group/sip-tcptls/apps/app_externalivr.c
team/group/sip-tcptls/apps/app_festival.c
team/group/sip-tcptls/apps/app_flash.c
team/group/sip-tcptls/apps/app_followme.c
team/group/sip-tcptls/apps/app_getcpeid.c
team/group/sip-tcptls/apps/app_ices.c
team/group/sip-tcptls/apps/app_image.c
team/group/sip-tcptls/apps/app_macro.c
team/group/sip-tcptls/apps/app_meetme.c
team/group/sip-tcptls/apps/app_milliwatt.c
team/group/sip-tcptls/apps/app_minivm.c
team/group/sip-tcptls/apps/app_mixmonitor.c
team/group/sip-tcptls/apps/app_morsecode.c
team/group/sip-tcptls/apps/app_mp3.c
team/group/sip-tcptls/apps/app_nbscat.c
team/group/sip-tcptls/apps/app_osplookup.c
team/group/sip-tcptls/apps/app_page.c
team/group/sip-tcptls/apps/app_parkandannounce.c
team/group/sip-tcptls/apps/app_playback.c
team/group/sip-tcptls/apps/app_privacy.c
team/group/sip-tcptls/apps/app_queue.c
team/group/sip-tcptls/apps/app_read.c
team/group/sip-tcptls/apps/app_readexten.c
team/group/sip-tcptls/apps/app_readfile.c
team/group/sip-tcptls/apps/app_record.c
team/group/sip-tcptls/apps/app_rpt.c
team/group/sip-tcptls/apps/app_sayunixtime.c
team/group/sip-tcptls/apps/app_senddtmf.c
team/group/sip-tcptls/apps/app_sendtext.c
team/group/sip-tcptls/apps/app_sms.c
team/group/sip-tcptls/apps/app_stack.c
team/group/sip-tcptls/apps/app_system.c
team/group/sip-tcptls/apps/app_talkdetect.c
team/group/sip-tcptls/apps/app_test.c
team/group/sip-tcptls/apps/app_transfer.c
team/group/sip-tcptls/apps/app_url.c
team/group/sip-tcptls/apps/app_userevent.c
team/group/sip-tcptls/apps/app_verbose.c
team/group/sip-tcptls/apps/app_voicemail.c
team/group/sip-tcptls/apps/app_waitforring.c
team/group/sip-tcptls/apps/app_waitforsilence.c
team/group/sip-tcptls/apps/app_while.c
team/group/sip-tcptls/apps/app_zapbarge.c
team/group/sip-tcptls/apps/app_zapras.c
team/group/sip-tcptls/apps/app_zapscan.c
team/group/sip-tcptls/cdr/cdr_adaptive_odbc.c
team/group/sip-tcptls/cdr/cdr_csv.c
team/group/sip-tcptls/cdr/cdr_odbc.c
team/group/sip-tcptls/cdr/cdr_pgsql.c
team/group/sip-tcptls/cdr/cdr_radius.c
team/group/sip-tcptls/cdr/cdr_sqlite3_custom.c
team/group/sip-tcptls/cdr/cdr_tds.c
team/group/sip-tcptls/channels/chan_agent.c
team/group/sip-tcptls/channels/chan_alsa.c
team/group/sip-tcptls/channels/chan_features.c
team/group/sip-tcptls/channels/chan_gtalk.c
team/group/sip-tcptls/channels/chan_h323.c
team/group/sip-tcptls/channels/chan_iax2.c
team/group/sip-tcptls/channels/chan_jingle.c
team/group/sip-tcptls/channels/chan_local.c
team/group/sip-tcptls/channels/chan_mgcp.c
team/group/sip-tcptls/channels/chan_misdn.c
team/group/sip-tcptls/channels/chan_nbs.c
team/group/sip-tcptls/channels/chan_oss.c
team/group/sip-tcptls/channels/chan_phone.c
team/group/sip-tcptls/channels/chan_sip.c
team/group/sip-tcptls/channels/chan_skinny.c
team/group/sip-tcptls/channels/chan_unistim.c
team/group/sip-tcptls/channels/chan_usbradio.c
team/group/sip-tcptls/channels/chan_vpb.cc
team/group/sip-tcptls/channels/chan_zap.c
team/group/sip-tcptls/channels/iax2-provision.c
team/group/sip-tcptls/codecs/codec_a_mu.c
team/group/sip-tcptls/codecs/codec_adpcm.c
team/group/sip-tcptls/codecs/codec_alaw.c
team/group/sip-tcptls/codecs/codec_g722.c
team/group/sip-tcptls/codecs/codec_g726.c
team/group/sip-tcptls/codecs/codec_gsm.c
team/group/sip-tcptls/codecs/codec_ilbc.c
team/group/sip-tcptls/codecs/codec_lpc10.c
team/group/sip-tcptls/codecs/codec_speex.c
team/group/sip-tcptls/codecs/codec_ulaw.c
team/group/sip-tcptls/configs/agents.conf.sample
team/group/sip-tcptls/configs/cdr.conf.sample
team/group/sip-tcptls/configs/extensions.conf.sample
team/group/sip-tcptls/configs/res_odbc.conf.sample
team/group/sip-tcptls/configs/sip.conf.sample
team/group/sip-tcptls/configs/voicemail.conf.sample
team/group/sip-tcptls/configure
team/group/sip-tcptls/configure.ac
team/group/sip-tcptls/doc/CODING-GUIDELINES
team/group/sip-tcptls/doc/osp.txt
team/group/sip-tcptls/formats/format_g723.c
team/group/sip-tcptls/formats/format_g726.c
team/group/sip-tcptls/formats/format_g729.c
team/group/sip-tcptls/formats/format_gsm.c
team/group/sip-tcptls/formats/format_h263.c
team/group/sip-tcptls/formats/format_h264.c
team/group/sip-tcptls/formats/format_ilbc.c
team/group/sip-tcptls/formats/format_jpeg.c
team/group/sip-tcptls/formats/format_ogg_vorbis.c
team/group/sip-tcptls/formats/format_pcm.c
team/group/sip-tcptls/formats/format_sln.c
team/group/sip-tcptls/formats/format_vox.c
team/group/sip-tcptls/formats/format_wav.c
team/group/sip-tcptls/formats/format_wav_gsm.c
team/group/sip-tcptls/funcs/func_blacklist.c
team/group/sip-tcptls/funcs/func_callerid.c
team/group/sip-tcptls/funcs/func_curl.c
team/group/sip-tcptls/funcs/func_cut.c
team/group/sip-tcptls/funcs/func_db.c
team/group/sip-tcptls/funcs/func_enum.c
team/group/sip-tcptls/funcs/func_env.c
team/group/sip-tcptls/funcs/func_global.c
team/group/sip-tcptls/funcs/func_iconv.c
team/group/sip-tcptls/funcs/func_lock.c
team/group/sip-tcptls/funcs/func_md5.c
team/group/sip-tcptls/funcs/func_module.c
team/group/sip-tcptls/funcs/func_odbc.c
team/group/sip-tcptls/funcs/func_rand.c
team/group/sip-tcptls/funcs/func_realtime.c
team/group/sip-tcptls/funcs/func_sha1.c
team/group/sip-tcptls/funcs/func_strings.c
team/group/sip-tcptls/funcs/func_timeout.c
team/group/sip-tcptls/funcs/func_version.c
team/group/sip-tcptls/funcs/func_vmcount.c
team/group/sip-tcptls/include/asterisk.h
team/group/sip-tcptls/include/asterisk/_private.h
team/group/sip-tcptls/include/asterisk/app.h
team/group/sip-tcptls/include/asterisk/audiohook.h
team/group/sip-tcptls/include/asterisk/cdr.h
team/group/sip-tcptls/include/asterisk/channel.h
team/group/sip-tcptls/include/asterisk/doxyref.h
team/group/sip-tcptls/include/asterisk/file.h
team/group/sip-tcptls/include/asterisk/frame.h
team/group/sip-tcptls/include/asterisk/image.h
team/group/sip-tcptls/include/asterisk/module.h
team/group/sip-tcptls/include/asterisk/pbx.h
team/group/sip-tcptls/include/asterisk/res_odbc.h
team/group/sip-tcptls/main/abstract_jb.c
team/group/sip-tcptls/main/acl.c
team/group/sip-tcptls/main/adsistub.c
team/group/sip-tcptls/main/app.c
team/group/sip-tcptls/main/asterisk.c
team/group/sip-tcptls/main/astmm.c
team/group/sip-tcptls/main/audiohook.c
team/group/sip-tcptls/main/autoservice.c
team/group/sip-tcptls/main/callerid.c
team/group/sip-tcptls/main/cdr.c
team/group/sip-tcptls/main/channel.c
team/group/sip-tcptls/main/cli.c
team/group/sip-tcptls/main/config.c
team/group/sip-tcptls/main/cygload.c
team/group/sip-tcptls/main/db.c
team/group/sip-tcptls/main/devicestate.c
team/group/sip-tcptls/main/dial.c
team/group/sip-tcptls/main/dns.c
team/group/sip-tcptls/main/dnsmgr.c
team/group/sip-tcptls/main/dsp.c
team/group/sip-tcptls/main/enum.c
team/group/sip-tcptls/main/file.c
team/group/sip-tcptls/main/frame.c
team/group/sip-tcptls/main/hashtab.c
team/group/sip-tcptls/main/http.c
team/group/sip-tcptls/main/image.c
team/group/sip-tcptls/main/indications.c
team/group/sip-tcptls/main/io.c
team/group/sip-tcptls/main/jitterbuf.c
team/group/sip-tcptls/main/loader.c
team/group/sip-tcptls/main/logger.c
team/group/sip-tcptls/main/manager.c
team/group/sip-tcptls/main/netsock.c
team/group/sip-tcptls/main/pbx.c
team/group/sip-tcptls/main/privacy.c
team/group/sip-tcptls/main/rtp.c
team/group/sip-tcptls/main/say.c
team/group/sip-tcptls/main/sched.c
team/group/sip-tcptls/main/srv.c
team/group/sip-tcptls/main/term.c
team/group/sip-tcptls/main/translate.c
team/group/sip-tcptls/main/udptl.c
team/group/sip-tcptls/main/utils.c
team/group/sip-tcptls/pbx/ael/ael-test/ael-test19/extensions.ael
team/group/sip-tcptls/pbx/ael/ael-test/ael-test3/extensions.ael
team/group/sip-tcptls/pbx/ael/ael-test/ael-test7/extensions.ael
team/group/sip-tcptls/pbx/ael/ael-test/ael-vtest13/extensions.ael
team/group/sip-tcptls/pbx/ael/ael-test/ref.ael-vtest13
team/group/sip-tcptls/pbx/pbx_config.c
team/group/sip-tcptls/pbx/pbx_dundi.c
team/group/sip-tcptls/pbx/pbx_gtkconsole.c
team/group/sip-tcptls/pbx/pbx_loopback.c
team/group/sip-tcptls/pbx/pbx_lua.c
team/group/sip-tcptls/pbx/pbx_realtime.c
team/group/sip-tcptls/pbx/pbx_spool.c
team/group/sip-tcptls/res/ael/pval.c
team/group/sip-tcptls/res/res_adsi.c
team/group/sip-tcptls/res/res_ael_share.c
team/group/sip-tcptls/res/res_agi.c
team/group/sip-tcptls/res/res_config_odbc.c
team/group/sip-tcptls/res/res_config_pgsql.c
team/group/sip-tcptls/res/res_config_sqlite.c
team/group/sip-tcptls/res/res_crypto.c
team/group/sip-tcptls/res/res_features.c
team/group/sip-tcptls/res/res_jabber.c
team/group/sip-tcptls/res/res_monitor.c
team/group/sip-tcptls/res/res_musiconhold.c
team/group/sip-tcptls/res/res_odbc.c
team/group/sip-tcptls/res/res_realtime.c
team/group/sip-tcptls/res/res_smdi.c
team/group/sip-tcptls/res/res_snmp.c
team/group/sip-tcptls/res/res_speech.c
team/group/sip-tcptls/utils/Makefile
team/group/sip-tcptls/utils/ael_main.c
team/group/sip-tcptls/utils/check_expr.c
team/group/sip-tcptls/utils/conf2ael.c
Propchange: team/group/sip-tcptls/
------------------------------------------------------------------------------
automerge = *
Propchange: team/group/sip-tcptls/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/group/sip-tcptls/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/sip-tcptls/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov 27 11:45:52 2007
@@ -1,1 +1,1 @@
-/trunk:1-89484
+/trunk:1-89651
Modified: team/group/sip-tcptls/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/CHANGES?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/CHANGES (original)
+++ team/group/sip-tcptls/CHANGES Tue Nov 27 11:45:52 2007
@@ -52,6 +52,10 @@
* Added 'core show channels count' CLI command.
* Added the ability to set the core debug and verbose values on a per-file basis.
* Added 'queue pause member' and 'queue unpause member' CLI commands
+ * 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
-----------
@@ -86,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
------------
@@ -99,6 +106,7 @@
Skinny changes
-------------
* Added skinny show device, skinny show line, and skinny show settings CLI commands.
+ * Proper codec support in chan_skinny.
DUNDi changes
-------------
@@ -199,6 +207,27 @@
* Added the ability to specify the music on hold class used to play into the
conference when there is only one member and the M option is used.
+Other Dialplan Application Changes
+----------------------------------
+ * Argument support for Gosub application
+ * From the to-do lists: straighten out the app timeout args:
+ Wait() app now really does 0.3 seconds- was truncating arg to an int.
+ WaitExten() same as Wait().
+ Congestion() - Now takes floating pt. argument.
+ Busy() - now takes floating pt. argument.
+ Read() - timeout now can be floating pt.
+ WaitForRing() now takes floating pt timeout arg.
+ SpeechBackground() -- clarified in the docstrings that the timeout is an integer seconds.
+ * Added 's' option to Page application.
+ * Added 'E' and 'V' commands to ExternalIVR.
+ * Added 'o' and 'X' options to Chanspy.
+ * Added a new dialplan application, Bridge, which allows you to bridge the
+ calling channel to any other active channel on the system.
+ * Added the ability to specify a music on hold class to play instead of ringing
+ for the SLATrunk application.
+ * The Read application no longer exits the dialplan on error. Instead, it sets
+ READSTATUS to ERROR, which you can catch and handle separately.
+
Music On Hold Changes
---------------------
* A new option, "digit", has been added for music on hold classes in
@@ -271,37 +300,27 @@
Miscellaneous
-------------
* Added the bindaddr option to gtalk.conf.
- * Argument support for Gosub application
- * Ability to set process limits without restarting Asterisk
- * Proper codec support in chan_skinny.
* Ability to use libcap to set high ToS bits when non-root
on Linux. If configure is unable to find libcap then you
can use --with-cap to specify the path.
- * Added rotatetimestamp option to logger.conf which will use
- the time to name the logger files instead of sequence number.
+ * Added rotatestrategy option to logger.conf, along with two new options:
+ "timestamp" which will use the time to name the logger files instead of
+ sequence number; and "rotate", which rotates the names of the logfiles,
+ similar to the way syslog rotates files.
+ * Added exec_after_rotate option to logger.conf, which allows a system
+ command to be run after rotation. This is primarily useful with
+ rotatestrategry=rotate, to allow a limit on the number of logfiles kept
+ and to ensure that the oldest log file gets deleted.
* Added Masquerade manager event for when a masquerade happens between
two channels.
- * From the to-do lists: straighten out the app timeout args:
- Wait() app now really does 0.3 seconds- was truncating arg to an int.
- WaitExten() same as Wait().
- Congestion() - Now takes floating pt. argument.
- Busy() - now takes floating pt. argument.
- Read() - timeout now can be floating pt.
- WaitForRing() now takes floating pt timeout arg.
- SpeechBackground() -- clarified in the docstrings that the timeout is an integer seconds.
* Added maxfiles option to options section of asterisk.conf which allows you to specify
what Asterisk should set as the maximum number of open files when it loads.
* Added the jittertargetextra configuration option.
* Added G729 passthrough support to chan_phone for Sigma Designs boards.
- * Added 's' option to Page application.
- * Added 'E' and 'V' commands to ExternalIVR.
- * Added 'o' and 'X' options to Chanspy.
* Added a new CDR module, cdr_sqlite3_custom.
* The cdr_manager module has a [mappings] feature, like cdr_custom,
to add fields to the manager event from the CDR variables.
* Added a new realtime configuration module, res_config_sqlite
- * Added a new dialplan application, Bridge, which allows you to bridge the
- calling channel to any other active channel on the system.
* Added support for setting the CoS for VLAN traffic (802.1p). See the sample
configuration files for the IP channel drivers. The new option is "cos".
This information is also documented in doc/qos.tex, or the IP Quality of Service
@@ -321,10 +340,15 @@
It allows you to configure a prefix for auto-monitor recordings.
* Added support for writing and running your dialplan in lua. See
configs/extensions.lua.sample for examples of how to do this.
- * 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.
- * Enhanced "agi debug" to print the channel name as a prefix to the debug
- output to make debugging on busy systems much easier.
- * Added the ability to specify a music on hold class to play instead of ringing
- for the SLATrunk application.
+ * 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/group/sip-tcptls/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/Makefile?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/Makefile (original)
+++ team/group/sip-tcptls/Makefile Tue Nov 27 11:45:52 2007
@@ -304,7 +304,7 @@
@echo " + $(mK) install +"
@echo " +-------------------------------------------+"
-_all: cleantest $(SUBDIRS)
+_all: cleantest makeopts $(SUBDIRS)
makeopts: configure
@echo "****"
Modified: team/group/sip-tcptls/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/UPGRADE.txt?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/UPGRADE.txt (original)
+++ team/group/sip-tcptls/UPGRADE.txt Tue Nov 27 11:45:52 2007
@@ -47,6 +47,9 @@
'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:
* The voicemail configuration values 'maxmessage' and 'minmessage' have
@@ -78,6 +81,9 @@
introduced dialplan functions LOCK(), TRYLOCK(), and UNLOCK(). You may use
these functions in any location where you desire to ensure that only one
channel is executing that path at any one time.
+* Read() now sets a READSTATUS variable on exit. It does NOT automatically
+ return -1 (and hangup) anymore on error. If you want to hangup on error,
+ you need to do so explicitly in your dialplan.
Dialplan Functions:
@@ -103,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/group/sip-tcptls/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_adsiprog.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_adsiprog.c (original)
+++ team/group/sip-tcptls/apps/app_adsiprog.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_alarmreceiver.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_alarmreceiver.c (original)
+++ team/group/sip-tcptls/apps/app_alarmreceiver.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_amd.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_amd.c (original)
+++ team/group/sip-tcptls/apps/app_amd.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_authenticate.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_authenticate.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_authenticate.c (original)
+++ team/group/sip-tcptls/apps/app_authenticate.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_cdr.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_cdr.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_cdr.c (original)
+++ team/group/sip-tcptls/apps/app_cdr.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_chanisavail.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_chanisavail.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_chanisavail.c (original)
+++ team/group/sip-tcptls/apps/app_chanisavail.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_channelredirect.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_channelredirect.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_channelredirect.c (original)
+++ team/group/sip-tcptls/apps/app_channelredirect.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_chanspy.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_chanspy.c (original)
+++ team/group/sip-tcptls/apps/app_chanspy.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_controlplayback.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_controlplayback.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_controlplayback.c (original)
+++ team/group/sip-tcptls/apps/app_controlplayback.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_db.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_db.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_db.c (original)
+++ team/group/sip-tcptls/apps/app_db.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_dial.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_dial.c (original)
+++ team/group/sip-tcptls/apps/app_dial.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_dictate.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_dictate.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_dictate.c (original)
+++ team/group/sip-tcptls/apps/app_dictate.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_directed_pickup.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_directed_pickup.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_directed_pickup.c (original)
+++ team/group/sip-tcptls/apps/app_directed_pickup.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_directory.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_directory.c (original)
+++ team/group/sip-tcptls/apps/app_directory.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_disa.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_disa.c (original)
+++ team/group/sip-tcptls/apps/app_disa.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_dumpchan.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_dumpchan.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_dumpchan.c (original)
+++ team/group/sip-tcptls/apps/app_dumpchan.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_echo.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_echo.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_echo.c (original)
+++ team/group/sip-tcptls/apps/app_echo.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_exec.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_exec.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_exec.c (original)
+++ team/group/sip-tcptls/apps/app_exec.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_externalivr.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_externalivr.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_externalivr.c (original)
+++ team/group/sip-tcptls/apps/app_externalivr.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_festival.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_festival.c (original)
+++ team/group/sip-tcptls/apps/app_festival.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_flash.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_flash.c (original)
+++ team/group/sip-tcptls/apps/app_flash.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_followme.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_followme.c (original)
+++ team/group/sip-tcptls/apps/app_followme.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_getcpeid.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_getcpeid.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_getcpeid.c (original)
+++ team/group/sip-tcptls/apps/app_getcpeid.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_ices.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_ices.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_ices.c (original)
+++ team/group/sip-tcptls/apps/app_ices.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_image.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_image.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_image.c (original)
+++ team/group/sip-tcptls/apps/app_image.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_macro.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
--- team/group/sip-tcptls/apps/app_macro.c (original)
+++ team/group/sip-tcptls/apps/app_macro.c Tue Nov 27 11:45:52 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/group/sip-tcptls/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/apps/app_meetme.c?view=diff&rev=89680&r1=89679&r2=89680
==============================================================================
[... 8576 lines stripped ...]
More information about the asterisk-commits
mailing list