[asterisk-commits] russell: branch russell/chan_console r81420 - in /team/russell/chan_console: ...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Aug 31 23:00:39 CDT 2007
Author: russell
Date: Fri Aug 31 23:00:34 2007
New Revision: 81420
URL: http://svn.digium.com/view/asterisk?view=rev&rev=81420
Log:
resolve conflicts, get up to date, enable automerge
Added:
team/russell/chan_console/apps/app_readexten.c
- copied unchanged from r81419, trunk/apps/app_readexten.c
team/russell/chan_console/funcs/func_lock.c
- copied unchanged from r81419, trunk/funcs/func_lock.c
team/russell/chan_console/funcs/func_volume.c
- copied unchanged from r81419, trunk/funcs/func_volume.c
team/russell/chan_console/include/asterisk/astobj2.h
- copied unchanged from r81419, trunk/include/asterisk/astobj2.h
team/russell/chan_console/include/asterisk/audiohook.h
- copied unchanged from r81419, trunk/include/asterisk/audiohook.h
team/russell/chan_console/include/asterisk/extconf.h
- copied unchanged from r81419, trunk/include/asterisk/extconf.h
team/russell/chan_console/include/asterisk/pval.h
- copied unchanged from r81419, trunk/include/asterisk/pval.h
team/russell/chan_console/main/astobj2.c
- copied unchanged from r81419, trunk/main/astobj2.c
team/russell/chan_console/main/audiohook.c
- copied unchanged from r81419, trunk/main/audiohook.c
team/russell/chan_console/pbx/ael/ael-test/ael-vtest21/
- copied from r81419, trunk/pbx/ael/ael-test/ael-vtest21/
team/russell/chan_console/pbx/ael/ael-test/ael-vtest21/extensions.ael
- copied unchanged from r81419, trunk/pbx/ael/ael-test/ael-vtest21/extensions.ael
team/russell/chan_console/pbx/ael/ael-test/ref.ael-vtest21
- copied unchanged from r81419, trunk/pbx/ael/ael-test/ref.ael-vtest21
team/russell/chan_console/res/ael/
- copied from r81419, trunk/res/ael/
team/russell/chan_console/res/ael/ael.flex
- copied unchanged from r81419, trunk/res/ael/ael.flex
team/russell/chan_console/res/ael/ael.tab.c
- copied unchanged from r81419, trunk/res/ael/ael.tab.c
team/russell/chan_console/res/ael/ael.tab.h
- copied unchanged from r81419, trunk/res/ael/ael.tab.h
team/russell/chan_console/res/ael/ael.y
- copied unchanged from r81419, trunk/res/ael/ael.y
team/russell/chan_console/res/ael/ael_lex.c
- copied unchanged from r81419, trunk/res/ael/ael_lex.c
team/russell/chan_console/res/ael/pval.c
- copied unchanged from r81419, trunk/res/ael/pval.c
team/russell/chan_console/res/res_ael_share.c
- copied unchanged from r81419, trunk/res/res_ael_share.c
team/russell/chan_console/utils/conf2ael.c
- copied unchanged from r81419, trunk/utils/conf2ael.c
team/russell/chan_console/utils/extconf.c
- copied unchanged from r81419, trunk/utils/extconf.c
Removed:
team/russell/chan_console/configs/modem.conf.sample
team/russell/chan_console/include/asterisk/chanspy.h
team/russell/chan_console/pbx/ael/ael.flex
team/russell/chan_console/pbx/ael/ael.tab.c
team/russell/chan_console/pbx/ael/ael.tab.h
team/russell/chan_console/pbx/ael/ael.y
team/russell/chan_console/pbx/ael/ael_lex.c
team/russell/chan_console/res/res_eventtest.c
Modified:
team/russell/chan_console/ (props changed)
team/russell/chan_console/CHANGES
team/russell/chan_console/LICENSE
team/russell/chan_console/Makefile
team/russell/chan_console/UPGRADE.txt
team/russell/chan_console/acinclude.m4
team/russell/chan_console/apps/app_adsiprog.c
team/russell/chan_console/apps/app_alarmreceiver.c
team/russell/chan_console/apps/app_amd.c
team/russell/chan_console/apps/app_authenticate.c
team/russell/chan_console/apps/app_cdr.c
team/russell/chan_console/apps/app_chanisavail.c
team/russell/chan_console/apps/app_channelredirect.c
team/russell/chan_console/apps/app_chanspy.c
team/russell/chan_console/apps/app_controlplayback.c
team/russell/chan_console/apps/app_db.c
team/russell/chan_console/apps/app_dial.c
team/russell/chan_console/apps/app_dictate.c
team/russell/chan_console/apps/app_directed_pickup.c
team/russell/chan_console/apps/app_directory.c
team/russell/chan_console/apps/app_disa.c
team/russell/chan_console/apps/app_dumpchan.c
team/russell/chan_console/apps/app_echo.c
team/russell/chan_console/apps/app_exec.c
team/russell/chan_console/apps/app_externalivr.c
team/russell/chan_console/apps/app_festival.c
team/russell/chan_console/apps/app_flash.c
team/russell/chan_console/apps/app_followme.c
team/russell/chan_console/apps/app_forkcdr.c
team/russell/chan_console/apps/app_getcpeid.c
team/russell/chan_console/apps/app_ices.c
team/russell/chan_console/apps/app_image.c
team/russell/chan_console/apps/app_ivrdemo.c
team/russell/chan_console/apps/app_macro.c
team/russell/chan_console/apps/app_meetme.c
team/russell/chan_console/apps/app_milliwatt.c
team/russell/chan_console/apps/app_minivm.c
team/russell/chan_console/apps/app_mixmonitor.c
team/russell/chan_console/apps/app_morsecode.c
team/russell/chan_console/apps/app_mp3.c
team/russell/chan_console/apps/app_nbscat.c
team/russell/chan_console/apps/app_osplookup.c
team/russell/chan_console/apps/app_page.c
team/russell/chan_console/apps/app_parkandannounce.c
team/russell/chan_console/apps/app_playback.c
team/russell/chan_console/apps/app_privacy.c
team/russell/chan_console/apps/app_queue.c
team/russell/chan_console/apps/app_read.c
team/russell/chan_console/apps/app_readfile.c
team/russell/chan_console/apps/app_record.c
team/russell/chan_console/apps/app_rpt.c
team/russell/chan_console/apps/app_sayunixtime.c
team/russell/chan_console/apps/app_senddtmf.c
team/russell/chan_console/apps/app_sendtext.c
team/russell/chan_console/apps/app_setcallerid.c
team/russell/chan_console/apps/app_skel.c
team/russell/chan_console/apps/app_sms.c
team/russell/chan_console/apps/app_softhangup.c
team/russell/chan_console/apps/app_speech_utils.c
team/russell/chan_console/apps/app_stack.c
team/russell/chan_console/apps/app_system.c
team/russell/chan_console/apps/app_talkdetect.c
team/russell/chan_console/apps/app_test.c
team/russell/chan_console/apps/app_transfer.c
team/russell/chan_console/apps/app_url.c
team/russell/chan_console/apps/app_userevent.c
team/russell/chan_console/apps/app_verbose.c
team/russell/chan_console/apps/app_voicemail.c
team/russell/chan_console/apps/app_waitforring.c
team/russell/chan_console/apps/app_waitforsilence.c
team/russell/chan_console/apps/app_while.c
team/russell/chan_console/apps/app_zapateller.c
team/russell/chan_console/apps/app_zapbarge.c
team/russell/chan_console/apps/app_zapras.c
team/russell/chan_console/apps/app_zapscan.c
team/russell/chan_console/build_tools/cflags.xml
team/russell/chan_console/build_tools/make_build_h
team/russell/chan_console/build_tools/make_buildopts_h
team/russell/chan_console/build_tools/make_version
team/russell/chan_console/build_tools/mkpkgconfig
team/russell/chan_console/build_tools/prep_moduledeps
team/russell/chan_console/build_tools/strip_nonapi
team/russell/chan_console/cdr/cdr_adaptive_odbc.c
team/russell/chan_console/cdr/cdr_csv.c
team/russell/chan_console/cdr/cdr_custom.c
team/russell/chan_console/cdr/cdr_manager.c
team/russell/chan_console/cdr/cdr_odbc.c
team/russell/chan_console/cdr/cdr_pgsql.c
team/russell/chan_console/cdr/cdr_radius.c
team/russell/chan_console/cdr/cdr_sqlite.c
team/russell/chan_console/cdr/cdr_sqlite3_custom.c
team/russell/chan_console/cdr/cdr_tds.c
team/russell/chan_console/channels/chan_agent.c
team/russell/chan_console/channels/chan_alsa.c
team/russell/chan_console/channels/chan_features.c
team/russell/chan_console/channels/chan_gtalk.c
team/russell/chan_console/channels/chan_h323.c
team/russell/chan_console/channels/chan_iax2.c
team/russell/chan_console/channels/chan_jingle.c
team/russell/chan_console/channels/chan_local.c
team/russell/chan_console/channels/chan_mgcp.c
team/russell/chan_console/channels/chan_misdn.c
team/russell/chan_console/channels/chan_nbs.c
team/russell/chan_console/channels/chan_oss.c
team/russell/chan_console/channels/chan_phone.c
team/russell/chan_console/channels/chan_sip.c
team/russell/chan_console/channels/chan_skinny.c
team/russell/chan_console/channels/chan_vpb.cc
team/russell/chan_console/channels/chan_zap.c
team/russell/chan_console/channels/h323/ast_h323.cxx
team/russell/chan_console/channels/iax2-parser.c
team/russell/chan_console/channels/iax2-parser.h
team/russell/chan_console/channels/iax2-provision.c
team/russell/chan_console/channels/iax2-provision.h
team/russell/chan_console/channels/misdn/chan_misdn_config.h
team/russell/chan_console/channels/misdn/ie.c
team/russell/chan_console/channels/misdn/isdn_lib.c
team/russell/chan_console/channels/misdn/isdn_msg_parser.c
team/russell/chan_console/channels/misdn_config.c
team/russell/chan_console/codecs/codec_adpcm.c
team/russell/chan_console/codecs/codec_alaw.c
team/russell/chan_console/codecs/codec_g722.c
team/russell/chan_console/codecs/codec_g726.c
team/russell/chan_console/codecs/codec_gsm.c
team/russell/chan_console/codecs/codec_lpc10.c
team/russell/chan_console/codecs/codec_speex.c
team/russell/chan_console/codecs/codec_ulaw.c
team/russell/chan_console/codecs/codec_zap.c
team/russell/chan_console/codecs/slin_ulaw_ex.h
team/russell/chan_console/codecs/ulaw_slin_ex.h
team/russell/chan_console/configs/cdr.conf.sample
team/russell/chan_console/configs/enum.conf.sample
team/russell/chan_console/configs/extensions.ael.sample
team/russell/chan_console/configs/extensions.conf.sample
team/russell/chan_console/configs/indications.conf.sample
team/russell/chan_console/configs/logger.conf.sample
team/russell/chan_console/configs/queues.conf.sample
team/russell/chan_console/configs/say.conf.sample
team/russell/chan_console/configs/sip.conf.sample
team/russell/chan_console/configs/skinny.conf.sample
team/russell/chan_console/configure
team/russell/chan_console/configure.ac
team/russell/chan_console/contrib/scripts/ast_grab_core
team/russell/chan_console/contrib/scripts/vmail.cgi
team/russell/chan_console/doc/asterisk-mib.txt
team/russell/chan_console/doc/jabber.txt
team/russell/chan_console/doc/tex/ael.tex
team/russell/chan_console/doc/tex/app-sms.tex
team/russell/chan_console/doc/tex/asterisk-conf.tex
team/russell/chan_console/doc/tex/asterisk.tex
team/russell/chan_console/doc/tex/billing.tex
team/russell/chan_console/doc/tex/cdrdriver.tex
team/russell/chan_console/doc/tex/channelvariables.tex
team/russell/chan_console/doc/tex/dundi.tex
team/russell/chan_console/doc/tex/enum.tex
team/russell/chan_console/doc/tex/hardware.tex
team/russell/chan_console/doc/tex/imapstorage.tex
team/russell/chan_console/doc/tex/jitterbuffer.tex
team/russell/chan_console/doc/tex/manager.tex
team/russell/chan_console/doc/tex/misdn.tex
team/russell/chan_console/doc/tex/mp3.tex
team/russell/chan_console/doc/tex/odbcstorage.tex
team/russell/chan_console/doc/tex/privacy.tex
team/russell/chan_console/doc/tex/qos.tex
team/russell/chan_console/doc/tex/queuelog.tex
team/russell/chan_console/doc/tex/queues-with-callback-members.tex
team/russell/chan_console/doc/tex/realtime.tex
team/russell/chan_console/funcs/func_blacklist.c
team/russell/chan_console/funcs/func_callerid.c
team/russell/chan_console/funcs/func_cdr.c
team/russell/chan_console/funcs/func_channel.c
team/russell/chan_console/funcs/func_curl.c
team/russell/chan_console/funcs/func_cut.c
team/russell/chan_console/funcs/func_devstate.c
team/russell/chan_console/funcs/func_enum.c
team/russell/chan_console/funcs/func_env.c
team/russell/chan_console/funcs/func_iconv.c
team/russell/chan_console/funcs/func_logic.c
team/russell/chan_console/funcs/func_odbc.c
team/russell/chan_console/funcs/func_rand.c
team/russell/chan_console/funcs/func_realtime.c
team/russell/chan_console/funcs/func_strings.c
team/russell/chan_console/funcs/func_timeout.c
team/russell/chan_console/funcs/func_version.c
team/russell/chan_console/funcs/func_vmcount.c
team/russell/chan_console/include/asterisk.h
team/russell/chan_console/include/asterisk/abstract_jb.h
team/russell/chan_console/include/asterisk/acl.h
team/russell/chan_console/include/asterisk/adsi.h
team/russell/chan_console/include/asterisk/ael_structs.h
team/russell/chan_console/include/asterisk/agi.h
team/russell/chan_console/include/asterisk/alaw.h
team/russell/chan_console/include/asterisk/app.h
team/russell/chan_console/include/asterisk/ast_expr.h
team/russell/chan_console/include/asterisk/autoconfig.h.in
team/russell/chan_console/include/asterisk/cdr.h
team/russell/chan_console/include/asterisk/channel.h
team/russell/chan_console/include/asterisk/cli.h
team/russell/chan_console/include/asterisk/config.h
team/russell/chan_console/include/asterisk/crypto.h
team/russell/chan_console/include/asterisk/devicestate.h
team/russell/chan_console/include/asterisk/dial.h
team/russell/chan_console/include/asterisk/doxyref.h
team/russell/chan_console/include/asterisk/dundi.h
team/russell/chan_console/include/asterisk/enum.h
team/russell/chan_console/include/asterisk/event.h
team/russell/chan_console/include/asterisk/event_defs.h
team/russell/chan_console/include/asterisk/features.h
team/russell/chan_console/include/asterisk/file.h
team/russell/chan_console/include/asterisk/frame.h
team/russell/chan_console/include/asterisk/fskmodem.h
team/russell/chan_console/include/asterisk/image.h
team/russell/chan_console/include/asterisk/io.h
team/russell/chan_console/include/asterisk/jabber.h
team/russell/chan_console/include/asterisk/linkedlists.h
team/russell/chan_console/include/asterisk/localtime.h
team/russell/chan_console/include/asterisk/lock.h
team/russell/chan_console/include/asterisk/logger.h
team/russell/chan_console/include/asterisk/manager.h
team/russell/chan_console/include/asterisk/module.h
team/russell/chan_console/include/asterisk/musiconhold.h
team/russell/chan_console/include/asterisk/options.h
team/russell/chan_console/include/asterisk/pbx.h
team/russell/chan_console/include/asterisk/res_odbc.h
team/russell/chan_console/include/asterisk/say.h
team/russell/chan_console/include/asterisk/sched.h
team/russell/chan_console/include/asterisk/slinfactory.h
team/russell/chan_console/include/asterisk/speech.h
team/russell/chan_console/include/asterisk/strings.h
team/russell/chan_console/include/asterisk/tdd.h
team/russell/chan_console/include/asterisk/threadstorage.h
team/russell/chan_console/include/asterisk/translate.h
team/russell/chan_console/include/asterisk/ulaw.h
team/russell/chan_console/include/asterisk/utils.h
team/russell/chan_console/include/jitterbuf.h
team/russell/chan_console/main/Makefile
team/russell/chan_console/main/abstract_jb.c
team/russell/chan_console/main/acl.c
team/russell/chan_console/main/alaw.c
team/russell/chan_console/main/app.c
team/russell/chan_console/main/asterisk.c
team/russell/chan_console/main/astmm.c
team/russell/chan_console/main/autoservice.c
team/russell/chan_console/main/callerid.c
team/russell/chan_console/main/cdr.c
team/russell/chan_console/main/channel.c
team/russell/chan_console/main/cli.c
team/russell/chan_console/main/config.c
team/russell/chan_console/main/devicestate.c
team/russell/chan_console/main/dial.c
team/russell/chan_console/main/dns.c
team/russell/chan_console/main/dnsmgr.c
team/russell/chan_console/main/dsp.c
team/russell/chan_console/main/enum.c
team/russell/chan_console/main/event.c
team/russell/chan_console/main/file.c
team/russell/chan_console/main/frame.c
team/russell/chan_console/main/fskmodem.c
team/russell/chan_console/main/http.c
team/russell/chan_console/main/image.c
team/russell/chan_console/main/indications.c
team/russell/chan_console/main/loader.c
team/russell/chan_console/main/logger.c
team/russell/chan_console/main/manager.c
team/russell/chan_console/main/minimime/mm.h
team/russell/chan_console/main/minimime/mm_base64.c
team/russell/chan_console/main/minimime/mm_codecs.c
team/russell/chan_console/main/minimime/mm_mem.h
team/russell/chan_console/main/minimime/mm_util.c
team/russell/chan_console/main/pbx.c
team/russell/chan_console/main/rtp.c
team/russell/chan_console/main/say.c
team/russell/chan_console/main/sched.c
team/russell/chan_console/main/sha1.c
team/russell/chan_console/main/slinfactory.c
team/russell/chan_console/main/srv.c
team/russell/chan_console/main/stdtime/localtime.c
team/russell/chan_console/main/tdd.c
team/russell/chan_console/main/translate.c
team/russell/chan_console/main/udptl.c
team/russell/chan_console/main/ulaw.c
team/russell/chan_console/main/utils.c
team/russell/chan_console/pbx/Makefile
team/russell/chan_console/pbx/ael/ael-test/ael-test5/extensions.ael
team/russell/chan_console/pbx/ael/ael-test/ael-test6/extensions.ael
team/russell/chan_console/pbx/ael/ael-test/ref.ael-ntest10
team/russell/chan_console/pbx/ael/ael-test/ref.ael-test1
team/russell/chan_console/pbx/ael/ael-test/ref.ael-test11
team/russell/chan_console/pbx/ael/ael-test/ref.ael-test14
team/russell/chan_console/pbx/ael/ael-test/ref.ael-test15
team/russell/chan_console/pbx/ael/ael-test/ref.ael-test16
team/russell/chan_console/pbx/ael/ael-test/ref.ael-test19
team/russell/chan_console/pbx/ael/ael-test/ref.ael-test2
team/russell/chan_console/pbx/ael/ael-test/ref.ael-test3
team/russell/chan_console/pbx/ael/ael-test/ref.ael-test4
team/russell/chan_console/pbx/ael/ael-test/ref.ael-test5
team/russell/chan_console/pbx/ael/ael-test/ref.ael-test6
team/russell/chan_console/pbx/ael/ael-test/ref.ael-test7
team/russell/chan_console/pbx/ael/ael-test/ref.ael-vtest13
team/russell/chan_console/pbx/ael/ael-test/ref.ael-vtest17
team/russell/chan_console/pbx/pbx_ael.c
team/russell/chan_console/pbx/pbx_config.c
team/russell/chan_console/pbx/pbx_dundi.c
team/russell/chan_console/pbx/pbx_gtkconsole.c
team/russell/chan_console/pbx/pbx_realtime.c
team/russell/chan_console/pbx/pbx_spool.c
team/russell/chan_console/res/Makefile
team/russell/chan_console/res/res_adsi.c
team/russell/chan_console/res/res_agi.c
team/russell/chan_console/res/res_clioriginate.c
team/russell/chan_console/res/res_config_odbc.c
team/russell/chan_console/res/res_config_pgsql.c
team/russell/chan_console/res/res_config_sqlite.c
team/russell/chan_console/res/res_convert.c
team/russell/chan_console/res/res_crypto.c
team/russell/chan_console/res/res_features.c
team/russell/chan_console/res/res_indications.c
team/russell/chan_console/res/res_jabber.c
team/russell/chan_console/res/res_monitor.c
team/russell/chan_console/res/res_musiconhold.c
team/russell/chan_console/res/res_odbc.c
team/russell/chan_console/res/res_realtime.c
team/russell/chan_console/res/res_smdi.c
team/russell/chan_console/res/res_snmp.c
team/russell/chan_console/res/res_speech.c
team/russell/chan_console/res/snmp/agent.c
team/russell/chan_console/sounds/Makefile
team/russell/chan_console/utils/Makefile
team/russell/chan_console/utils/ael_main.c
team/russell/chan_console/utils/check_expr.c
team/russell/chan_console/utils/smsq.c
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Fri Aug 31 23:00:34 2007
@@ -1,1 +1,1 @@
-menuselect https://origsvn.digium.com/svn/menuselect/branches/1.0
+menuselect https://origsvn.digium.com/svn/menuselect/branches/1.0
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 31 23:00:34 2007
@@ -1,1 +1,1 @@
-/trunk:1-75160
+/trunk:1-81419
Modified: team/russell/chan_console/CHANGES
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/CHANGES?view=diff&rev=81420&r1=81419&r2=81420
==============================================================================
--- team/russell/chan_console/CHANGES (original)
+++ team/russell/chan_console/CHANGES Fri Aug 31 23:00:34 2007
@@ -21,6 +21,7 @@
are currently active on the system.
* Added a "ListAllVoicemailUsers" action that allows you to get a list of all
the voicemail users setup.
+ * Added 'DBDel' and 'DBDelTree' manager commands.
Dialplan functions
------------------
@@ -33,14 +34,23 @@
* MailboxExists converted to dialplan function
* A new option to Dial() for telling IP phones not to count the call
as "missed" when dial times out and cancels.
+ * Added LOCK(), TRYLOCK(), and UNLOCK(), which provide a single level dialplan
+ mutex. No deadlocks are possible, as LOCK() only allows a single lock to be
+ held for any given channel. Also, locks are automatically freed when a
+ channel is hung up.
CLI Changes
-----------
* New CLI command "core show settings"
* Added 'core show channels count' CLI command.
+ * Added the ability to set the core debug and verbose values on a per-file basis.
SIP changes
-----------
+ * Improved NAT and STUN support.
+ chan_sip now can use port numbers in bindaddr, externip and externhost
+ options, as well as contact a STUN server to detect its external address
+ for the SIP socket. See sip.conf.sample, 'NAT' section.
* The default SIP useragent= identifier now includes the Asterisk version
* A new option, match_auth_username in sip.conf changes the matching of incoming requests.
If set, and the incoming request carries authentication info,
@@ -115,6 +125,11 @@
* Added support for storage of greetings using an IMAP server
* Added ability to customize forward, reverse, stop, and pause keys for message playback
* SMDI is now enabled in voicemail using the smdienable option.
+ * A "lockmode" option has been added to asterisk.conf to configure the file
+ locking method used for voicemail, and potentially other things in the
+ future. The default is the old behavior, lockfile. However, there is a
+ new method, "flock", that uses a different method for situations where the
+ lockfile will not work, such as on SMB/CIFS mounts.
Queue changes
-------------
@@ -135,6 +150,7 @@
position changes frequently.
* Added additional information to EXITWITHTIMEOUT and EXITWITHKEY events in the
queue log.
+ * Added ability for non-realtime queues to have realtime members
MeetMe Changes
--------------
@@ -176,6 +192,12 @@
by saying "local myvar=someval;" or using Set() in this
fashion: Set(LOCAL(myvar)=someval); ("local" is now
an AEL keyword).
+ * utils/conf2ael introduced. Will convert an extensions.conf
+ file into extensions.ael. Very crude and unfinished, but
+ will be improved as time goes by. Should be useful for a
+ first pass at conversion.
+ * aelparse will now read extensions.conf to see if a referenced
+ macro or context is there before issueing a warning.
Zaptel channel driver (chan_zap) Changes
----------------------------------------
@@ -236,7 +258,6 @@
* 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 'DBDel' and 'DBDelTree' manager commands.
* 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,
@@ -251,3 +272,5 @@
* The device state functionality in the Local channel driver has been updated
to indicate INUSE or NOT_INUSE when a Local channel is being used as opposed
to just UNKNOWN if the extension exists.
+ * When originating a call using AMI or pbx_spool that fails the reason for failure
+ will now be available in the failed extension using the REASON dialplan variable.
Modified: team/russell/chan_console/LICENSE
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/LICENSE?view=diff&rev=81420&r1=81419&r2=81420
==============================================================================
--- team/russell/chan_console/LICENSE (original)
+++ team/russell/chan_console/LICENSE Fri Aug 31 23:00:34 2007
@@ -50,7 +50,8 @@
wish to use these trademarks for purposes other than simple
redistribution of Asterisk source code obtained from Digium, you
should contact our licensing department to determine the necessary
-steps you must take. For more information on this policy, please read
+steps you must take. For more information on this policy, please read:
+
http://www.digium.com/en/company/profile/trademarkpolicy.php
If you have any questions regarding our licensing policy, please
Modified: team/russell/chan_console/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/Makefile?view=diff&rev=81420&r1=81419&r2=81420
==============================================================================
--- team/russell/chan_console/Makefile (original)
+++ team/russell/chan_console/Makefile Fri Aug 31 23:00:34 2007
@@ -59,6 +59,8 @@
export SOLINK
export STRIP
export DOWNLOAD
+export GREP
+export ID
export OSARCH
export CURSES_DIR
export NCURSES_DIR
@@ -73,6 +75,10 @@
ifneq ($(wildcard makeopts),)
include makeopts
endif
+
+# Some build systems, such as the one in openwrt, like to pass custom target
+# CFLAGS in the COPTS variable.
+ASTCFLAGS+=$(COPTS)
#Uncomment this to see all build commands instead of 'quiet' output
#NOISY_BUILD=yes
@@ -281,7 +287,11 @@
@echo " + Asterisk has successfully been built, and +"
@echo " + can be installed by running: +"
@echo " + +"
+ifeq ($(MAKE), gmake)
+ @echo " + $(MAKE) install +"
+else
@echo " + $(MAKE) install +"
+endif
@echo " +-------------------------------------------+"
_all: cleantest $(SUBDIRS)
@@ -490,14 +500,22 @@
@echo " + configuration files (overwriting any +"
@echo " + existing config files), run: +"
@echo " + +"
+ifeq ($(MAKE), gmake)
+ @echo " + $(MAKE) samples +"
+else
@echo " + $(MAKE) samples +"
+endif
@echo " + +"
@echo " +----------------- or ---------------------+"
@echo " + +"
@echo " + You can go ahead and install the asterisk +"
@echo " + program documentation now or later run: +"
@echo " + +"
+ifeq ($(MAKE), gmake)
+ @echo " + $(MAKE) progdocs +"
+else
@echo " + $(MAKE) progdocs +"
+endif
@echo " + +"
@echo " + **Note** This requires that you have +"
@echo " + doxygen installed on your local system +"
@@ -638,9 +656,7 @@
# last clean count we had
cleantest:
- @if ! cmp -s .cleancount .lastclean ; then \
- $(MAKE) clean;\
- fi
+ @cmp -s .cleancount .lastclean || $(MAKE) clean
$(SUBDIRS_UNINSTALL):
@$(MAKE) --no-print-directory -C $(@:-uninstall=) uninstall
@@ -669,7 +685,11 @@
@echo " + directories, and logs, run the following +"
@echo " + command: +"
@echo " + +"
+ifeq ($(MAKE), gmake)
+ @echo " + $(MAKE) uninstall-all +"
+else
@echo " + $(MAKE) uninstall-all +"
+endif
@echo " +-------------------------------------------+"
uninstall-all: _uninstall
@@ -700,6 +720,7 @@
@echo "Generating input for menuselect ..."
@build_tools/prep_moduledeps > $@
-asterisk.pdf: doc/asterisk.pdf
+asterisk.pdf:
+ $(MAKE) -C doc/tex asterisk.pdf
.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) menuselect.makeopts
Modified: team/russell/chan_console/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/UPGRADE.txt?view=diff&rev=81420&r1=81419&r2=81420
==============================================================================
--- team/russell/chan_console/UPGRADE.txt (original)
+++ team/russell/chan_console/UPGRADE.txt Fri Aug 31 23:00:34 2007
@@ -17,6 +17,10 @@
not include it, but really, you should make sure that all execution
paths within your macros end in "return;".
+* The conf2ael program is 'introduced' in this release; it is in a rather
+ crude state, but deemed useful for making a first pass at converting
+ extensions.conf code into AEL. More intelligence will come with time.
+
Core:
* The 'languageprefix' option in asterisk.conf is now deprecated, and
@@ -35,6 +39,20 @@
like sin, cos, tan, log, pow, etc. The ability to call external functions
like CDR(), etc. was also added, without having to use the ${...} notation.
+* The delimiter passed to applications has been changed to the comma (','), as
+ that is what people are used to using within extensions.conf. If you are
+ using realtime extensions, you will need to translate your existing dialplan
+ to use this separator. To use a literal comma, you need merely to escape it
+ with a backslash ('\'). Another possible side effect is that you may need to
+ remove the obscene level of backslashing that was necessary for the dialplan
+ to work correctly in 1.4 and previous versions. This should make writing
+ dialplans less painful in the future, albeit with the pain of a one-time
+ conversion.
+
+* 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.
+
Voicemail:
* The voicemail configuration values 'maxmessage' and 'minmessage' have
@@ -61,6 +79,11 @@
* DISA()'s fifth argument is now an options argument. If you have previously
used 'NOANSWER' in this argument, you'll need to convert that to the new
option 'n'.
+* Macro() is now deprecated. If you need subroutines, you should use the
+ Gosub()/Return() applications. To replace MacroExclusive(), we have
+ 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.
CDR:
@@ -86,3 +109,7 @@
user has not configured the automon feature, the normal "415 Unsupported media type"
is returned, and nothing is done.
+* 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
+ delimiter change in applications.
+
Modified: team/russell/chan_console/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/acinclude.m4?view=diff&rev=81420&r1=81419&r2=81420
==============================================================================
--- team/russell/chan_console/acinclude.m4 (original)
+++ team/russell/chan_console/acinclude.m4 Fri Aug 31 23:00:34 2007
@@ -380,13 +380,22 @@
AC_CHECK_HEADER(${PWLIBDIR}/../openh323/version.h, OPENH323DIR="${PWLIBDIR}/../openh323"; HAS_OPENH323=1, )
if test "${HAS_OPENH323:-unset}" != "unset" ; then
OPENH323DIR="${PWLIBDIR}/../openh323"
- AC_CHECK_HEADER(${OPENH323DIR}/include/h323.h, , OPENH323_INCDIR="${PWLIB_INCDIR}/openh323"; OPENH323_LIBDIR="${PWLIB_LIBDIR}")
+ saved_cppflags="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} -I${PWLIB_INCDIR}/openh323 -I${PWLIB_INCDIR}"
+ AC_CHECK_HEADER(${OPENH323DIR}/include/h323.h, , OPENH323_INCDIR="${PWLIB_INCDIR}/openh323"; OPENH323_LIBDIR="${PWLIB_LIBDIR}", [#include <ptlib.h>])
+ CPPFLAGS="${saved_cppflags}"
else
+ saved_cppflags="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} -I${HOME}/openh323/include -I${PWLIB_INCDIR}"
AC_CHECK_HEADER(${HOME}/openh323/include/h323.h, HAS_OPENH323=1, )
+ CPPFLAGS="${saved_cppflags}"
if test "${HAS_OPENH323:-unset}" != "unset" ; then
OPENH323DIR="${HOME}/openh323"
else
+ saved_cppflags="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} -I/usr/local/include/openh323 -I${PWLIB_INCDIR}"
AC_CHECK_HEADER(/usr/local/include/openh323/h323.h, HAS_OPENH323=1, )
+ CPPFLAGS="${saved_cppflags}"
if test "${HAS_OPENH323:-unset}" != "unset" ; then
OPENH323DIR="/usr/local/share/openh323"
OPENH323_INCDIR="/usr/local/include/openh323"
@@ -396,7 +405,10 @@
OPENH323_LIBDIR="/usr/local/lib"
fi
else
- AC_CHECK_HEADER(/usr/include/openh323/h323.h, HAS_OPENH323=1, )
+ saved_cppflags="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} -I/usr/include/openh323 -I${PWLIB_INCDIR}"
+ AC_CHECK_HEADER(/usr/include/openh323/h323.h, HAS_OPENH323=1, , [#include <ptlib.h>])
+ CPPFLAGS="${saved_cppflags}"
if test "${HAS_OPENH323:-unset}" != "unset" ; then
OPENH323DIR="/usr/share/openh323"
OPENH323_INCDIR="/usr/include/openh323"
Modified: team/russell/chan_console/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/apps/app_adsiprog.c?view=diff&rev=81420&r1=81419&r2=81420
==============================================================================
--- team/russell/chan_console/apps/app_adsiprog.c (original)
+++ team/russell/chan_console/apps/app_adsiprog.c Fri Aug 31 23:00:34 2007
@@ -1448,8 +1448,7 @@
/* Now begin the download attempt */
if (ast_adsi_begin_download(chan, scr->desc, scr->fdn, scr->sec, scr->ver)) {
/* User rejected us for some reason */
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "User rejected download attempt\n");
+ ast_verb(3, "User rejected download attempt\n");
ast_log(LOG_NOTICE, "User rejected download on channel %s\n", chan->name);
ast_free(scr);
return -1;
@@ -1535,8 +1534,7 @@
return -1;
if (ast_adsi_end_download(chan)) {
/* Download failed for some reason */
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Download attempt failed\n");
+ ast_verb(3, "Download attempt failed\n");
ast_log(LOG_NOTICE, "Download failed on %s\n", chan->name);
ast_free(scr);
return -1;
@@ -1548,38 +1546,24 @@
static int adsi_exec(struct ast_channel *chan, void *data)
{
- int res=0;
- struct ast_module_user *u;
-
- u = ast_module_user_add(chan);
+ int res = 0;
if (ast_strlen_zero(data))
data = "asterisk.adsi";
if (!ast_adsi_available(chan)) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "ADSI Unavailable on CPE. Not bothering to try.\n");
+ ast_verb(3, "ADSI Unavailable on CPE. Not bothering to try.\n");
} else {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "ADSI Available on CPE. Attempting Upload.\n");
+ ast_verb(3, "ADSI Available on CPE. Attempting Upload.\n");
res = adsi_prog(chan, data);
}
-
- ast_module_user_remove(u);
return res;
}
static int unload_module(void)
{
- int res;
-
- ast_module_user_hangup_all();
-
- res = ast_unregister_application(app);
-
-
- return res;
+ return ast_unregister_application(app);
}
static int load_module(void)
Modified: team/russell/chan_console/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/apps/app_alarmreceiver.c?view=diff&rev=81420&r1=81419&r2=81420
==============================================================================
--- team/russell/chan_console/apps/app_alarmreceiver.c (original)
+++ team/russell/chan_console/apps/app_alarmreceiver.c Fri Aug 31 23:00:34 2007
@@ -118,8 +118,7 @@
res = ast_db_get(db_family, key, value, sizeof(value) - 1);
if(res){
- if(option_verbose >= 4)
- ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Creating database entry %s and setting to 1\n", key);
+ ast_verb(4, "AlarmReceiver: Creating database entry %s and setting to 1\n", key);
/* Guess we have to create it */
res = ast_db_put(db_family, key, "1");
return;
@@ -210,8 +209,7 @@
break;
}
if (ast_write(chan, &wf)){
- if(option_verbose >= 4)
- ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Failed to write frame on %s\n", chan->name);
+ ast_verb(4, "AlarmReceiver: Failed to write frame on %s\n", chan->name);
ast_log(LOG_WARNING, "AlarmReceiver Failed to write frame on %s\n",chan->name);
res = -1;
ast_frfree(f);
@@ -306,8 +304,8 @@
static int write_metadata( FILE *logfile, char *signalling_type, struct ast_channel *chan)
{
int res = 0;
- time_t t;
- struct tm now;
+ struct timeval t;
+ struct ast_tm now;
char *cl,*cn;
char workstring[80];
char timestamp[80];
@@ -324,12 +322,12 @@
/* Get the current time */
- time(&t);
+ t = ast_tvnow();
ast_localtime(&t, &now, NULL);
/* Format the time */
- strftime(timestamp, sizeof(timestamp), time_stamp_format, &now);
+ ast_strftime(timestamp, sizeof(timestamp), time_stamp_format, &now);
res = fprintf(logfile, "\n\n[metadata]\n\n");
@@ -523,8 +521,7 @@
got_some_digits = 1;
- if (option_verbose >= 2)
- ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Received Event %s\n", event);
+ ast_verb(2, "AlarmReceiver: Received Event %s\n", event);
ast_debug(1, "AlarmReceiver: Received event: %s\n", event);
/* Calculate checksum */
@@ -542,8 +539,7 @@
}
if(i == 16){
- if(option_verbose >= 2)
- ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Bad DTMF character %c, trying again\n", event[j]);
+ ast_verb(2, "AlarmReceiver: Bad DTMF character %c, trying again\n", event[j]);
continue; /* Bad character */
}
@@ -553,8 +549,7 @@
if (checksum) {
database_increment("checksum-errors");
- if (option_verbose >= 2)
- ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Nonzero checksum\n");
+ ast_verb(2, "AlarmReceiver: Nonzero checksum\n");
ast_debug(1, "AlarmReceiver: Nonzero checksum\n");
continue;
}
@@ -564,8 +559,7 @@
if(strncmp(event + 4, "18", 2)){
if(strncmp(event + 4, "98", 2)){
database_increment("format-errors");
- if(option_verbose >= 2)
- ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Wrong message type\n");
+ ast_verb(2, "AlarmReceiver: Wrong message type\n");
ast_debug(1, "AlarmReceiver: Wrong message type\n");
continue;
}
@@ -628,28 +622,22 @@
static int alarmreceiver_exec(struct ast_channel *chan, void *data)
{
int res = 0;
- struct ast_module_user *u;
event_node_t *elp, *efree;
char signalling_type[64] = "";
[... 72193 lines stripped ...]
More information about the asterisk-commits
mailing list