[asterisk-commits] russell: branch russell/chan_console r95312 - in /team/russell/chan_console: ...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Dec 28 19:39:06 CST 2007
Author: russell
Date: Fri Dec 28 19:39:03 2007
New Revision: 95312
URL: http://svn.digium.com/view/asterisk?view=rev&rev=95312
Log:
resolve conflicts, sync with trunk, reset automerge
Added:
team/russell/chan_console/apps/app_pickupchan.c
- copied unchanged from r95288, trunk/apps/app_pickupchan.c
team/russell/chan_console/apps/app_waituntil.c
- copied unchanged from r95288, trunk/apps/app_waituntil.c
team/russell/chan_console/channels/chan_unistim.c
- copied unchanged from r95288, trunk/channels/chan_unistim.c
team/russell/chan_console/channels/console_gui.c
- copied unchanged from r95288, trunk/channels/console_gui.c
team/russell/chan_console/channels/console_video.c
- copied unchanged from r95288, trunk/channels/console_video.c
team/russell/chan_console/channels/console_video.h
- copied unchanged from r95288, trunk/channels/console_video.h
team/russell/chan_console/channels/vcodecs.c
- copied unchanged from r95288, trunk/channels/vcodecs.c
team/russell/chan_console/configs/cdr_sqlite3_custom.conf.sample
- copied unchanged from r95288, trunk/configs/cdr_sqlite3_custom.conf.sample
team/russell/chan_console/configs/extensions.lua.sample
- copied unchanged from r95288, trunk/configs/extensions.lua.sample
team/russell/chan_console/configs/queuerules.conf.sample
- copied unchanged from r95288, trunk/configs/queuerules.conf.sample
team/russell/chan_console/configs/unistim.conf.sample
- copied unchanged from r95288, trunk/configs/unistim.conf.sample
team/russell/chan_console/configs/usbradio.conf.sample
- copied unchanged from r95288, trunk/configs/usbradio.conf.sample
team/russell/chan_console/contrib/utils/eagi_proxy.c
- copied unchanged from r95288, trunk/contrib/utils/eagi_proxy.c
team/russell/chan_console/doc/manager_1_1.txt
- copied unchanged from r95288, trunk/doc/manager_1_1.txt
team/russell/chan_console/doc/unistim.txt
- copied unchanged from r95288, trunk/doc/unistim.txt
team/russell/chan_console/doc/valgrind.txt
- copied unchanged from r95288, trunk/doc/valgrind.txt
team/russell/chan_console/funcs/func_dialgroup.c
- copied unchanged from r95288, trunk/funcs/func_dialgroup.c
team/russell/chan_console/funcs/func_dialplan.c
- copied unchanged from r95288, trunk/funcs/func_dialplan.c
team/russell/chan_console/funcs/func_sysinfo.c
- copied unchanged from r95288, trunk/funcs/func_sysinfo.c
team/russell/chan_console/images/kpad2.jpg
- copied unchanged from r95288, trunk/images/kpad2.jpg
team/russell/chan_console/include/asterisk/_private.h
- copied unchanged from r95288, trunk/include/asterisk/_private.h
team/russell/chan_console/include/asterisk/global_datastores.h
- copied unchanged from r95288, trunk/include/asterisk/global_datastores.h
team/russell/chan_console/include/asterisk/hashtab.h
- copied unchanged from r95288, trunk/include/asterisk/hashtab.h
team/russell/chan_console/include/asterisk/mod_format.h
- copied unchanged from r95288, trunk/include/asterisk/mod_format.h
team/russell/chan_console/include/asterisk/network.h
- copied unchanged from r95288, trunk/include/asterisk/network.h
team/russell/chan_console/main/cygload.c
- copied unchanged from r95288, trunk/main/cygload.c
team/russell/chan_console/main/global_datastores.c
- copied unchanged from r95288, trunk/main/global_datastores.c
team/russell/chan_console/main/hashtab.c
- copied unchanged from r95288, trunk/main/hashtab.c
team/russell/chan_console/pbx/pbx_lua.c
- copied unchanged from r95288, trunk/pbx/pbx_lua.c
team/russell/chan_console/utils/astcanary.c
- copied unchanged from r95288, trunk/utils/astcanary.c
team/russell/chan_console/utils/build-extensions-conf.lua
- copied unchanged from r95288, trunk/utils/build-extensions-conf.lua
team/russell/chan_console/utils/hashtest.c
- copied unchanged from r95288, trunk/utils/hashtest.c
Removed:
team/russell/chan_console/build_tools/prep_moduledeps
team/russell/chan_console/channels/gentone-ulaw.c
team/russell/chan_console/configs/cdr_sqlite3_custom.conf
team/russell/chan_console/configs/privacy.conf.sample
Modified:
team/russell/chan_console/ (props changed)
team/russell/chan_console/.cleancount
team/russell/chan_console/CHANGES
team/russell/chan_console/CREDITS
team/russell/chan_console/Makefile
team/russell/chan_console/Makefile.moddir_rules
team/russell/chan_console/Makefile.rules
team/russell/chan_console/UPGRADE.txt
team/russell/chan_console/acinclude.m4
team/russell/chan_console/agi/ (props changed)
team/russell/chan_console/agi/Makefile
team/russell/chan_console/agi/eagi-test.c
team/russell/chan_console/apps/ (props changed)
team/russell/chan_console/apps/Makefile
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_readexten.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/embed_modules.xml
team/russell/chan_console/build_tools/make_buildopts_h
team/russell/chan_console/build_tools/make_defaults_h
team/russell/chan_console/build_tools/make_version
team/russell/chan_console/build_tools/make_version_h
team/russell/chan_console/build_tools/menuselect-deps.in
team/russell/chan_console/build_tools/prep_tarball
team/russell/chan_console/build_tools/strip_nonapi
team/russell/chan_console/cdr/ (props changed)
team/russell/chan_console/cdr/Makefile
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/ (props changed)
team/russell/chan_console/channels/DialTone.h
team/russell/chan_console/channels/Makefile
team/russell/chan_console/channels/busy.h
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_usbradio.c
team/russell/chan_console/channels/chan_vpb.cc
team/russell/chan_console/channels/chan_zap.c
team/russell/chan_console/channels/gentone.c
team/russell/chan_console/channels/h323/ast_h323.cxx
team/russell/chan_console/channels/iax2-parser.c
team/russell/chan_console/channels/iax2-provision.c
team/russell/chan_console/channels/iax2.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_lib.h
team/russell/chan_console/channels/misdn/isdn_lib_intern.h
team/russell/chan_console/channels/misdn/isdn_msg_parser.c
team/russell/chan_console/channels/misdn/portinfo.c
team/russell/chan_console/channels/misdn_config.c
team/russell/chan_console/channels/ringtone.h
team/russell/chan_console/codecs/ (props changed)
team/russell/chan_console/codecs/Makefile
team/russell/chan_console/codecs/codec_a_mu.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_ilbc.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/g722/ (props changed)
team/russell/chan_console/codecs/g722/Makefile
team/russell/chan_console/codecs/gsm/ (props changed)
team/russell/chan_console/codecs/ilbc/ (props changed)
team/russell/chan_console/codecs/ilbc/Makefile
team/russell/chan_console/codecs/ilbc/iLBC_define.h
team/russell/chan_console/codecs/lpc10/ (props changed)
team/russell/chan_console/codecs/lpc10/Makefile
team/russell/chan_console/configs/agents.conf.sample
team/russell/chan_console/configs/cdr.conf.sample
team/russell/chan_console/configs/cdr_adaptive_odbc.conf.sample
team/russell/chan_console/configs/dundi.conf.sample
team/russell/chan_console/configs/extconfig.conf.sample
team/russell/chan_console/configs/extensions.ael.sample
team/russell/chan_console/configs/extensions.conf.sample
team/russell/chan_console/configs/features.conf.sample
team/russell/chan_console/configs/h323.conf.sample
team/russell/chan_console/configs/http.conf.sample
team/russell/chan_console/configs/iax.conf.sample
team/russell/chan_console/configs/iaxprov.conf.sample
team/russell/chan_console/configs/manager.conf.sample
team/russell/chan_console/configs/mgcp.conf.sample
team/russell/chan_console/configs/misdn.conf.sample
team/russell/chan_console/configs/musiconhold.conf.sample
team/russell/chan_console/configs/oss.conf.sample
team/russell/chan_console/configs/queues.conf.sample
team/russell/chan_console/configs/res_odbc.conf.sample
team/russell/chan_console/configs/sip.conf.sample
team/russell/chan_console/configs/skinny.conf.sample
team/russell/chan_console/configs/users.conf.sample
team/russell/chan_console/configs/voicemail.conf.sample
team/russell/chan_console/configs/zapata.conf.sample
team/russell/chan_console/configure
team/russell/chan_console/configure.ac
team/russell/chan_console/doc/CODING-GUIDELINES
team/russell/chan_console/doc/asterisk-mib.txt
team/russell/chan_console/doc/asterisk.8
team/russell/chan_console/doc/asterisk.sgml
team/russell/chan_console/doc/osp.txt
team/russell/chan_console/doc/tex/Makefile
team/russell/chan_console/doc/tex/channelvariables.tex
team/russell/chan_console/doc/tex/imapstorage.tex
team/russell/chan_console/doc/tex/localchannel.tex
team/russell/chan_console/doc/tex/qos.tex
team/russell/chan_console/doc/tex/queues-with-callback-members.tex
team/russell/chan_console/formats/ (props changed)
team/russell/chan_console/formats/Makefile
team/russell/chan_console/formats/format_g723.c
team/russell/chan_console/formats/format_g726.c
team/russell/chan_console/formats/format_g729.c
team/russell/chan_console/formats/format_gsm.c
team/russell/chan_console/formats/format_h263.c
team/russell/chan_console/formats/format_h264.c
team/russell/chan_console/formats/format_ilbc.c
team/russell/chan_console/formats/format_jpeg.c
team/russell/chan_console/formats/format_ogg_vorbis.c
team/russell/chan_console/formats/format_pcm.c
team/russell/chan_console/formats/format_sln.c
team/russell/chan_console/formats/format_vox.c
team/russell/chan_console/formats/format_wav.c
team/russell/chan_console/formats/format_wav_gsm.c
team/russell/chan_console/funcs/ (props changed)
team/russell/chan_console/funcs/Makefile
team/russell/chan_console/funcs/func_base64.c
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_db.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_extstate.c
team/russell/chan_console/funcs/func_global.c
team/russell/chan_console/funcs/func_groupcount.c
team/russell/chan_console/funcs/func_iconv.c
team/russell/chan_console/funcs/func_lock.c
team/russell/chan_console/funcs/func_logic.c
team/russell/chan_console/funcs/func_math.c
team/russell/chan_console/funcs/func_md5.c
team/russell/chan_console/funcs/func_module.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_sha1.c
team/russell/chan_console/funcs/func_shell.c
team/russell/chan_console/funcs/func_strings.c
team/russell/chan_console/funcs/func_timeout.c
team/russell/chan_console/funcs/func_uri.c
team/russell/chan_console/funcs/func_version.c
team/russell/chan_console/funcs/func_vmcount.c
team/russell/chan_console/funcs/func_volume.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/aes.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/astdb.h
team/russell/chan_console/include/asterisk/astmm.h
team/russell/chan_console/include/asterisk/astobj.h
team/russell/chan_console/include/asterisk/astobj2.h
team/russell/chan_console/include/asterisk/audiohook.h
team/russell/chan_console/include/asterisk/autoconfig.h.in
team/russell/chan_console/include/asterisk/callerid.h
team/russell/chan_console/include/asterisk/causes.h
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/compat.h
team/russell/chan_console/include/asterisk/config.h
team/russell/chan_console/include/asterisk/devicestate.h
team/russell/chan_console/include/asterisk/dnsmgr.h
team/russell/chan_console/include/asterisk/doxyref.h
team/russell/chan_console/include/asterisk/dsp.h
team/russell/chan_console/include/asterisk/endian.h
team/russell/chan_console/include/asterisk/event.h
team/russell/chan_console/include/asterisk/extconf.h
team/russell/chan_console/include/asterisk/file.h
team/russell/chan_console/include/asterisk/frame.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/md5.h
team/russell/chan_console/include/asterisk/module.h
team/russell/chan_console/include/asterisk/netsock.h
team/russell/chan_console/include/asterisk/paths.h
team/russell/chan_console/include/asterisk/pbx.h
team/russell/chan_console/include/asterisk/plc.h
team/russell/chan_console/include/asterisk/pval.h
team/russell/chan_console/include/asterisk/res_odbc.h
team/russell/chan_console/include/asterisk/rtp.h
team/russell/chan_console/include/asterisk/sha1.h
team/russell/chan_console/include/asterisk/slinfactory.h
team/russell/chan_console/include/asterisk/srv.h
team/russell/chan_console/include/asterisk/stringfields.h
team/russell/chan_console/include/asterisk/strings.h
team/russell/chan_console/include/asterisk/tdd.h
team/russell/chan_console/include/asterisk/term.h
team/russell/chan_console/include/asterisk/threadstorage.h
team/russell/chan_console/include/asterisk/time.h
team/russell/chan_console/include/asterisk/transcap.h
team/russell/chan_console/include/asterisk/translate.h
team/russell/chan_console/include/asterisk/udptl.h
team/russell/chan_console/include/asterisk/ulaw.h
team/russell/chan_console/include/asterisk/unaligned.h
team/russell/chan_console/include/asterisk/utils.h
team/russell/chan_console/include/asterisk/zapata.h
team/russell/chan_console/include/jitterbuf.h
team/russell/chan_console/main/ (props changed)
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/adsistub.c
team/russell/chan_console/main/alaw.c
team/russell/chan_console/main/app.c
team/russell/chan_console/main/ast_expr2.fl
team/russell/chan_console/main/ast_expr2f.c
team/russell/chan_console/main/asterisk.c
team/russell/chan_console/main/astmm.c
team/russell/chan_console/main/astobj2.c
team/russell/chan_console/main/audiohook.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/chanvars.c
team/russell/chan_console/main/cli.c
team/russell/chan_console/main/config.c
team/russell/chan_console/main/cryptostub.c
team/russell/chan_console/main/db.c
team/russell/chan_console/main/db1-ast/ (props changed)
team/russell/chan_console/main/db1-ast/Makefile
team/russell/chan_console/main/devicestate.c
team/russell/chan_console/main/dial.c
team/russell/chan_console/main/dlfcn.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/editline/ (props changed)
team/russell/chan_console/main/editline/Makefile.in
team/russell/chan_console/main/editline/np/vis.c
team/russell/chan_console/main/editline/sys.h
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/fixedjitterbuf.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/io.c
team/russell/chan_console/main/jitterbuf.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/md5.c
team/russell/chan_console/main/minimime/ (props changed)
team/russell/chan_console/main/minimime/mm.h
team/russell/chan_console/main/netsock.c
team/russell/chan_console/main/pbx.c
team/russell/chan_console/main/plc.c
team/russell/chan_console/main/privacy.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/strcompat.c
team/russell/chan_console/main/tdd.c
team/russell/chan_console/main/term.c
team/russell/chan_console/main/threadstorage.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/makeopts.in
team/russell/chan_console/pbx/ (props changed)
team/russell/chan_console/pbx/Makefile
team/russell/chan_console/pbx/ael/ael-test/ael-test19/extensions.ael
team/russell/chan_console/pbx/ael/ael-test/ael-test3/extensions.ael
team/russell/chan_console/pbx/ael/ael-test/ael-test7/extensions.ael
team/russell/chan_console/pbx/ael/ael-test/ael-vtest13/extensions.ael
team/russell/chan_console/pbx/ael/ael-test/ref.ael-ntest10
team/russell/chan_console/pbx/ael/ael-test/ref.ael-ntest12
team/russell/chan_console/pbx/ael/ael-test/ref.ael-ntest22
team/russell/chan_console/pbx/ael/ael-test/ref.ael-ntest9
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-test18
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-test20
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-test8
team/russell/chan_console/pbx/ael/ael-test/ref.ael-vtest13
team/russell/chan_console/pbx/dundi-parser.c
team/russell/chan_console/pbx/dundi-parser.h
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_loopback.c
team/russell/chan_console/pbx/pbx_realtime.c
team/russell/chan_console/pbx/pbx_spool.c
team/russell/chan_console/res/ (props changed)
team/russell/chan_console/res/Makefile
team/russell/chan_console/res/ael/ael.flex
team/russell/chan_console/res/ael/ael.tab.c
team/russell/chan_console/res/ael/ael.tab.h
team/russell/chan_console/res/ael/ael.y
team/russell/chan_console/res/ael/ael_lex.c
team/russell/chan_console/res/ael/pval.c
team/russell/chan_console/res/res_adsi.c
team/russell/chan_console/res/res_ael_share.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_limit.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/ (props changed)
team/russell/chan_console/utils/Makefile
team/russell/chan_console/utils/ael_main.c
team/russell/chan_console/utils/astman.c
team/russell/chan_console/utils/check_expr.c
team/russell/chan_console/utils/clicompat.c
team/russell/chan_console/utils/conf2ael.c
team/russell/chan_console/utils/extconf.c
team/russell/chan_console/utils/hashtest2.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/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Dec 28 19:39:03 2007
@@ -1,1 +1,1 @@
-/trunk:1-87117
+/trunk:1-95311
Modified: team/russell/chan_console/.cleancount
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/.cleancount?view=diff&rev=95312&r1=95311&r2=95312
==============================================================================
--- team/russell/chan_console/.cleancount (original)
+++ team/russell/chan_console/.cleancount Fri Dec 28 19:39:03 2007
@@ -1,1 +1,1 @@
-32
+33
Modified: team/russell/chan_console/CHANGES
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/CHANGES?view=diff&rev=95312&r1=95311&r2=95312
==============================================================================
--- team/russell/chan_console/CHANGES (original)
+++ team/russell/chan_console/CHANGES Fri Dec 28 19:39:03 2007
@@ -4,11 +4,17 @@
AMI - The manager (TCP/TLS/HTTP)
--------------------------------
+ * Manager has undergone a lot of changes, all of them documented
+ in doc/manager_1_1.txt
+ * Manager version has changed to 1.1
+ * Added a new action 'CoreShowChannels' to list currently defined channels
+ and some information about them.
+ * Added a new action 'SIPshowregistry' to list SIP registrations.
* Added TLS support for the manager interface and HTTP server
* Added the URI redirect option for the built-in HTTP server
* The output of CallerID in Manager events is now more consistent.
CallerIDNum is used for number and CallerIDName for name.
- * enable https support for builtin web server.
+ * Enable https support for builtin web server.
See configs/http.conf.sample for details.
* Added a new action, GetConfigJSON, which can return the contents of an
Asterisk configuration file in JSON format. This is intended to help
@@ -22,6 +28,13 @@
* Added a "ListAllVoicemailUsers" action that allows you to get a list of all
the voicemail users setup.
* Added 'DBDel' and 'DBDelTree' manager commands.
+ * cdr_manager now reports events via the "cdr" level, separating it from
+ the very verbose "call" level.
+ * Manager users are now stored in memory. If you change the manager account
+ list (delete or add accounts) you need to reload manager.
+ * Added Masquerade manager event for when a masquerade happens between
+ two channels.
+ * Added "manager reload" command for the CLI
Dialplan functions
------------------
@@ -44,13 +57,19 @@
of devices or the name associated with a hint.
* Added EXTENSION_STATE() dialplan function which allows retrieving the state
of any extension.
+ * Added SYSINFO() dialplan function which allows retrieval of system information
CLI Changes
-----------
+ * New CLI command "core show hint" (usage: core show hint <exten>)
* 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.
* 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
-----------
@@ -67,8 +86,9 @@
since they where replaced by "mohsuggest" and "mohinterpret" in version 1.4
* The "localmask" setting was removed in version 1.2 and the reminder about it
being removed is now also removed.
- * A new option "busy-level" for setting a level of calls where asterisk reports
- a device as busy, to separate it from call-limit
+ * A new option "busylevel" for setting a level of calls where asterisk reports
+ a device as busy, to separate it from call-limit. This value is also added
+ to the SIP_PEER dialplan function.
* A new realtime family called "sipregs" is now supported to store SIP registration
data. If this family is defined, "sippeers" will be used for configuration and
"sipregs" for registrations. If it's not defined, "sippeers" will be used for
@@ -84,8 +104,16 @@
* 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).
+ * New settings for timer T1 and timer B on a global level or per device. This makes it
+ possible to force timeout faster on non-responsive SIP servers. These settings are
+ considered advanced, so don't use them unless you have a problem.
+ * Added a dial string option to be able to set the To: header in an INVITE to any
+ SIP uri.
IAX2 changes
------------
@@ -94,10 +122,68 @@
* Added support for OSP. The token is set and retrieved through the CHANNEL()
dialplan function.
+XMPP Google Talk/Jingle changes
+-------------------------------
+ * Added the bindaddr option to gtalk.conf.
+
Skinny changes
-------------
* Added skinny show device, skinny show line, and skinny show settings CLI commands.
-
+ * Proper codec support in chan_skinny.
+ * Added settings for IP and Ethernet QoS requests
+
+MGCP changes
+------------
+ * Added separate settings for media QoS in mgcp.conf
+
+OSS Channel changes
+-------------------
+ * Added experimental support for video send&receive.
+ Requires SDL and ffmpeg/avcodec, plus Video4Linux or X11
+ to act as video source.
+
+Phone channel changes (chan_phone)
+----------------------------------
+ * Added G729 passthrough support to chan_phone for Sigma Designs boards.
+
+H.323 channel Changes
+---------------------
+ * H323 remote hold notification support added (by NOTIFY message
+ and/or H.450 supplementary service)
+
+Local channel changes
+---------------------
+ * 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.
+ * Added jitterbuffer support for chan_local. This allows you to use the
+ generic jitterbuffer on incoming calls going to Asterisk applications.
+ For example, this would allow you to use a jitterbuffer for an incoming
+ SIP call to Voicemail by putting a Local channel in the middle. This
+ feature is enabled by using the 'j' option in the Dial string to the Local
+ channel in conjunction with the existing 'n' option for local channels.
+
+Zaptel channel driver (chan_zap) Changes
+----------------------------------------
+ * SS7 support in chan_zap (via libss7 library)
+ * In India, some carriers transmit CID via dtmf. Some code has been added
+ that will handle some situations. The cidstart=polarity_IN choice has been added for
+ those carriers that transmit CID via dtmf after a polarity change.
+ * CID matching information is now shown when doing 'dialplan show'.
+ * Added zap show version CLI command to chan_zap.
+ * Added setvar support to zapata.conf channel entries.
+ * Added two new options: mwimonitor and mwimonitornotify. These options allow
+ you to enable MWI monitoring on FXO lines. When the MWI state changes,
+ the script specified in the mwimonitornotify option is executed. An internal
+ event indicating the new state of the mailbox is also generated, so that
+ the normal MWI facilities in Asterisk work as usual.
+
+A new channel driver: Unistim
+-----------------------------
+ * 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.
+
DUNDi changes
-------------
* Added the ability to specify arguments to the Dial application when using
@@ -147,6 +233,8 @@
Queue changes
-------------
+ * Added the general option 'shared_lastcall' so that member's wrapuptime may be
+ used across multiple queues.
* Added QUEUE_VARIABLES function to set queue variables added setqueuevar and
setqueueentryvar options for each queue, see queues.conf.sample for details.
* Added keepstats option to queues.conf which will keep queue
@@ -165,6 +253,11 @@
* Added additional information to EXITWITHTIMEOUT and EXITWITHKEY events in the
queue log.
* Added ability for non-realtime queues to have realtime members
+ * Added the "linear" strategy to queues.
+ * Added the "wrandom" strategy to queues.
+ * Added new channel variable QUEUE_MIN_PENALTY
+ * QUEUE_MAX_PENALTY and QUEUE_MIN_PENALTY may be adjusted in mid-call by defining
+ rules in queuerules.conf. See configs/queuerules.conf.sample for details
MeetMe Changes
--------------
@@ -184,6 +277,43 @@
the schedule start time, or to allow the caller to join the conference early.
Also included is optional support for limiting the number of callers per
RealTime conference.
+ * Added the S() and L() options to the MeetMe application. These are pretty
+ much identical to the S() and L() options to Dial(). They let you set
+ timeouts for the conference, as well as have warning sounds played to
+ let the caller know how much time is left, and when it is running out.
+ * Added the ability to do "meetme concise" with the "meetme" CLI command.
+ This extends the concise capabilities of this CLI command to include
+ listing all conferences, instead of an addition to the other sub commands
+ for the "meetme" command.
+ * 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.
+ * Added 'm' option to Directory, which lists out names, 8 at a time, instead
+ of asking for verification of each name, one at a time.
[... 86545 lines stripped ...]
More information about the asterisk-commits
mailing list