[asterisk-commits] jpeeler: branch group/issue3450 r183102 - in /team/group/issue3450: ./ agi/ a...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Mar 19 00:41:21 CDT 2009 

Author: jpeeler
Date: Thu Mar 19 00:41:03 2009
New Revision: 183102

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=183102
Log:
Bring this branch back up to date. Conflicts in files other than chan_dahdi.c
were just overwritten with the new copy since no work has been done elsewhere.

Added:
    team/group/issue3450/apps/app_confbridge.c
      - copied unchanged from r183057, trunk/apps/app_confbridge.c
    team/group/issue3450/apps/app_originate.c
      - copied unchanged from r183057, trunk/apps/app_originate.c
    team/group/issue3450/apps/app_playtones.c
      - copied unchanged from r183057, trunk/apps/app_playtones.c
    team/group/issue3450/bridges/   (props changed)
      - copied from r183057, trunk/bridges/
    team/group/issue3450/bridges/Makefile
      - copied unchanged from r183057, trunk/bridges/Makefile
    team/group/issue3450/bridges/bridge_builtin_features.c
      - copied unchanged from r183057, trunk/bridges/bridge_builtin_features.c
    team/group/issue3450/bridges/bridge_multiplexed.c
      - copied unchanged from r183057, trunk/bridges/bridge_multiplexed.c
    team/group/issue3450/bridges/bridge_simple.c
      - copied unchanged from r183057, trunk/bridges/bridge_simple.c
    team/group/issue3450/bridges/bridge_softmix.c
      - copied unchanged from r183057, trunk/bridges/bridge_softmix.c
    team/group/issue3450/channels/chan_bridge.c
      - copied unchanged from r183057, trunk/channels/chan_bridge.c
    team/group/issue3450/channels/h323/ast_ptlib.h
      - copied unchanged from r183057, trunk/channels/h323/ast_ptlib.h
    team/group/issue3450/configs/cli_permissions.conf.sample
      - copied unchanged from r183057, trunk/configs/cli_permissions.conf.sample
    team/group/issue3450/contrib/editors/
      - copied from r183057, trunk/contrib/editors/
    team/group/issue3450/contrib/editors/ael.vim
      - copied unchanged from r183057, trunk/contrib/editors/ael.vim
    team/group/issue3450/contrib/editors/asterisk.vim
      - copied unchanged from r183057, trunk/contrib/editors/asterisk.vim
    team/group/issue3450/contrib/editors/asteriskvm.vim
      - copied unchanged from r183057, trunk/contrib/editors/asteriskvm.vim
    team/group/issue3450/contrib/scripts/sip_nat_settings
      - copied unchanged from r183057, trunk/contrib/scripts/sip_nat_settings
    team/group/issue3450/default.exports
      - copied unchanged from r183057, trunk/default.exports
    team/group/issue3450/doc/api-1.6.2-changes.txt
      - copied unchanged from r183057, trunk/doc/api-1.6.2-changes.txt
    team/group/issue3450/doc/database_transactions.txt
      - copied unchanged from r183057, trunk/doc/database_transactions.txt
    team/group/issue3450/doc/google-soc2009-ideas.txt
      - copied unchanged from r183057, trunk/doc/google-soc2009-ideas.txt
    team/group/issue3450/doc/timing.txt
      - copied unchanged from r183057, trunk/doc/timing.txt
    team/group/issue3450/formats/format_siren14.c
      - copied unchanged from r183057, trunk/formats/format_siren14.c
    team/group/issue3450/formats/format_siren7.c
      - copied unchanged from r183057, trunk/formats/format_siren7.c
    team/group/issue3450/funcs/func_aes.c
      - copied unchanged from r183057, trunk/funcs/func_aes.c
    team/group/issue3450/funcs/func_audiohookinherit.c
      - copied unchanged from r183057, trunk/funcs/func_audiohookinherit.c
    team/group/issue3450/funcs/func_sprintf.c
      - copied unchanged from r183057, trunk/funcs/func_sprintf.c
    team/group/issue3450/include/asterisk/bridging.h
      - copied unchanged from r183057, trunk/include/asterisk/bridging.h
    team/group/issue3450/include/asterisk/bridging_features.h
      - copied unchanged from r183057, trunk/include/asterisk/bridging_features.h
    team/group/issue3450/include/asterisk/bridging_technology.h
      - copied unchanged from r183057, trunk/include/asterisk/bridging_technology.h
    team/group/issue3450/include/asterisk/heap.h
      - copied unchanged from r183057, trunk/include/asterisk/heap.h
    team/group/issue3450/include/asterisk/optional_api.h
      - copied unchanged from r183057, trunk/include/asterisk/optional_api.h
    team/group/issue3450/main/asterisk.exports
      - copied unchanged from r183057, trunk/main/asterisk.exports
    team/group/issue3450/main/bridging.c
      - copied unchanged from r183057, trunk/main/bridging.c
    team/group/issue3450/main/heap.c
      - copied unchanged from r183057, trunk/main/heap.c
    team/group/issue3450/main/strings.c
      - copied unchanged from r183057, trunk/main/strings.c
    team/group/issue3450/res/res_adsi.exports
      - copied unchanged from r183057, trunk/res/res_adsi.exports
    team/group/issue3450/res/res_ael_share.exports
      - copied unchanged from r183057, trunk/res/res_ael_share.exports
    team/group/issue3450/res/res_agi.exports
      - copied unchanged from r183057, trunk/res/res_agi.exports
    team/group/issue3450/res/res_features.exports
      - copied unchanged from r183057, trunk/res/res_features.exports
    team/group/issue3450/res/res_jabber.exports
      - copied unchanged from r183057, trunk/res/res_jabber.exports
    team/group/issue3450/res/res_monitor.exports
      - copied unchanged from r183057, trunk/res/res_monitor.exports
    team/group/issue3450/res/res_odbc.exports
      - copied unchanged from r183057, trunk/res/res_odbc.exports
    team/group/issue3450/res/res_smdi.exports
      - copied unchanged from r183057, trunk/res/res_smdi.exports
    team/group/issue3450/res/res_speech.exports
      - copied unchanged from r183057, trunk/res/res_speech.exports
    team/group/issue3450/tests/test_heap.c
      - copied unchanged from r183057, trunk/tests/test_heap.c
    team/group/issue3450/tests/test_sched.c
      - copied unchanged from r183057, trunk/tests/test_sched.c
Removed:
    team/group/issue3450/build_tools/strip_nonapi
    team/group/issue3450/channels/chan_features.c
    team/group/issue3450/res/res_indications.c
Modified:
    team/group/issue3450/   (props changed)
    team/group/issue3450/.cleancount
    team/group/issue3450/CHANGES
    team/group/issue3450/CREDITS
    team/group/issue3450/Makefile
    team/group/issue3450/Makefile.moddir_rules
    team/group/issue3450/Makefile.rules
    team/group/issue3450/README
    team/group/issue3450/UPGRADE-1.2.txt
    team/group/issue3450/UPGRADE-1.4.txt
    team/group/issue3450/UPGRADE-1.6.txt
    team/group/issue3450/UPGRADE.txt
    team/group/issue3450/agi/Makefile
    team/group/issue3450/apps/app_chanisavail.c
    team/group/issue3450/apps/app_channelredirect.c
    team/group/issue3450/apps/app_chanspy.c
    team/group/issue3450/apps/app_dial.c
    team/group/issue3450/apps/app_dictate.c
    team/group/issue3450/apps/app_directed_pickup.c
    team/group/issue3450/apps/app_directory.c
    team/group/issue3450/apps/app_disa.c
    team/group/issue3450/apps/app_dumpchan.c
    team/group/issue3450/apps/app_externalivr.c
    team/group/issue3450/apps/app_fax.c
    team/group/issue3450/apps/app_followme.c
    team/group/issue3450/apps/app_jack.c
    team/group/issue3450/apps/app_macro.c
    team/group/issue3450/apps/app_meetme.c
    team/group/issue3450/apps/app_milliwatt.c
    team/group/issue3450/apps/app_minivm.c
    team/group/issue3450/apps/app_mixmonitor.c
    team/group/issue3450/apps/app_mp3.c
    team/group/issue3450/apps/app_nbscat.c
    team/group/issue3450/apps/app_osplookup.c
    team/group/issue3450/apps/app_page.c
    team/group/issue3450/apps/app_parkandannounce.c
    team/group/issue3450/apps/app_playback.c
    team/group/issue3450/apps/app_queue.c
    team/group/issue3450/apps/app_read.c
    team/group/issue3450/apps/app_readexten.c
    team/group/issue3450/apps/app_record.c
    team/group/issue3450/apps/app_rpt.c
    team/group/issue3450/apps/app_sms.c
    team/group/issue3450/apps/app_speech_utils.c
    team/group/issue3450/apps/app_stack.c
    team/group/issue3450/apps/app_system.c
    team/group/issue3450/apps/app_userevent.c
    team/group/issue3450/apps/app_voicemail.c
    team/group/issue3450/apps/app_waitforsilence.c
    team/group/issue3450/autoconf/ast_check_gnu_make.m4
    team/group/issue3450/autoconf/ast_check_openh323.m4
    team/group/issue3450/autoconf/ast_check_pwlib.m4
    team/group/issue3450/autoconf/ast_ext_lib.m4
    team/group/issue3450/autoconf/ast_func_fork.m4
    team/group/issue3450/autoconf/ast_gcc_attribute.m4
    team/group/issue3450/autoconf/ast_prog_sed.m4
    team/group/issue3450/build_tools/cflags-devmode.xml
    team/group/issue3450/build_tools/cflags.xml
    team/group/issue3450/build_tools/make_version
    team/group/issue3450/build_tools/menuselect-deps.in
    team/group/issue3450/cdr/Makefile
    team/group/issue3450/cdr/cdr_adaptive_odbc.c
    team/group/issue3450/cdr/cdr_csv.c
    team/group/issue3450/cdr/cdr_custom.c
    team/group/issue3450/cdr/cdr_manager.c
    team/group/issue3450/cdr/cdr_odbc.c
    team/group/issue3450/cdr/cdr_pgsql.c
    team/group/issue3450/cdr/cdr_radius.c
    team/group/issue3450/cdr/cdr_sqlite.c
    team/group/issue3450/cdr/cdr_sqlite3_custom.c
    team/group/issue3450/cdr/cdr_tds.c
    team/group/issue3450/channels/chan_agent.c
    team/group/issue3450/channels/chan_alsa.c
    team/group/issue3450/channels/chan_dahdi.c
    team/group/issue3450/channels/chan_gtalk.c
    team/group/issue3450/channels/chan_h323.c
    team/group/issue3450/channels/chan_iax2.c
    team/group/issue3450/channels/chan_local.c
    team/group/issue3450/channels/chan_misdn.c
    team/group/issue3450/channels/chan_oss.c
    team/group/issue3450/channels/chan_phone.c
    team/group/issue3450/channels/chan_sip.c
    team/group/issue3450/channels/chan_skinny.c
    team/group/issue3450/channels/chan_unistim.c
    team/group/issue3450/channels/chan_usbradio.c
    team/group/issue3450/channels/chan_vpb.cc
    team/group/issue3450/channels/h323/README
    team/group/issue3450/channels/h323/ast_h323.cxx
    team/group/issue3450/channels/h323/ast_h323.h
    team/group/issue3450/channels/h323/caps_h323.cxx
    team/group/issue3450/channels/h323/caps_h323.h
    team/group/issue3450/channels/h323/chan_h323.h
    team/group/issue3450/channels/h323/cisco-h225.cxx
    team/group/issue3450/channels/h323/cisco-h225.h
    team/group/issue3450/channels/h323/compat_h323.cxx
    team/group/issue3450/channels/h323/compat_h323.h
    team/group/issue3450/channels/iax2-parser.c
    team/group/issue3450/channels/iax2-parser.h
    team/group/issue3450/channels/iax2-provision.c
    team/group/issue3450/channels/iax2.h
    team/group/issue3450/channels/misdn/ie.c
    team/group/issue3450/channels/misdn/isdn_lib.c
    team/group/issue3450/channels/misdn_config.c
    team/group/issue3450/channels/xpmr/xpmr.c
    team/group/issue3450/codecs/codec_dahdi.c
    team/group/issue3450/configs/ais.conf.sample
    team/group/issue3450/configs/chan_dahdi.conf.sample
    team/group/issue3450/configs/extconfig.conf.sample
    team/group/issue3450/configs/extensions.conf.sample
    team/group/issue3450/configs/features.conf.sample
    team/group/issue3450/configs/func_odbc.conf.sample
    team/group/issue3450/configs/iax.conf.sample
    team/group/issue3450/configs/indications.conf.sample
    team/group/issue3450/configs/phoneprov.conf.sample
    team/group/issue3450/configs/queues.conf.sample
    team/group/issue3450/configs/res_ldap.conf.sample
    team/group/issue3450/configs/res_odbc.conf.sample
    team/group/issue3450/configs/res_snmp.conf.sample
    team/group/issue3450/configs/sip.conf.sample
    team/group/issue3450/configs/skinny.conf.sample
    team/group/issue3450/configs/voicemail.conf.sample
    team/group/issue3450/configure
    team/group/issue3450/configure.ac
    team/group/issue3450/contrib/asterisk-ng-doxygen
    team/group/issue3450/contrib/i18n.testsuite.conf
    team/group/issue3450/contrib/init.d/rc.archlinux.asterisk
    team/group/issue3450/contrib/init.d/rc.debian.asterisk
    team/group/issue3450/contrib/scripts/autosupport
    team/group/issue3450/contrib/scripts/autosupport.8
    team/group/issue3450/contrib/scripts/realtime_pgsql.sql
    team/group/issue3450/contrib/scripts/safe_asterisk
    team/group/issue3450/contrib/scripts/sip-friends.sql
    team/group/issue3450/doc/CODING-GUIDELINES
    team/group/issue3450/doc/appdocsxml.dtd
    team/group/issue3450/doc/distributed_devstate.txt
    team/group/issue3450/doc/janitor-projects.txt
    team/group/issue3450/doc/manager_1_1.txt
    team/group/issue3450/doc/realtimetext.txt   (props changed)
    team/group/issue3450/doc/sip-retransmit.txt   (props changed)
    team/group/issue3450/doc/tex/Makefile
    team/group/issue3450/doc/tex/cdrdriver.tex
    team/group/issue3450/doc/tex/channelvariables.tex
    team/group/issue3450/doc/tex/extensions.tex
    team/group/issue3450/doc/tex/misdn.tex
    team/group/issue3450/doc/tex/odbcstorage.tex
    team/group/issue3450/doc/tex/phoneprov.tex   (props changed)
    team/group/issue3450/doc/tex/qos.tex
    team/group/issue3450/doc/unistim.txt
    team/group/issue3450/formats/format_ilbc.c
    team/group/issue3450/formats/format_pcm.c
    team/group/issue3450/funcs/Makefile
    team/group/issue3450/funcs/func_callerid.c
    team/group/issue3450/funcs/func_channel.c
    team/group/issue3450/funcs/func_curl.c
    team/group/issue3450/funcs/func_cut.c
    team/group/issue3450/funcs/func_dialgroup.c
    team/group/issue3450/funcs/func_env.c
    team/group/issue3450/funcs/func_logic.c
    team/group/issue3450/funcs/func_odbc.c
    team/group/issue3450/funcs/func_realtime.c
    team/group/issue3450/funcs/func_strings.c
    team/group/issue3450/funcs/func_timeout.c
    team/group/issue3450/include/asterisk.h
    team/group/issue3450/include/asterisk/_private.h
    team/group/issue3450/include/asterisk/agi.h
    team/group/issue3450/include/asterisk/app.h
    team/group/issue3450/include/asterisk/astmm.h
    team/group/issue3450/include/asterisk/astobj2.h
    team/group/issue3450/include/asterisk/audiohook.h
    team/group/issue3450/include/asterisk/autoconfig.h.in
    team/group/issue3450/include/asterisk/callerid.h
    team/group/issue3450/include/asterisk/causes.h
    team/group/issue3450/include/asterisk/cdr.h
    team/group/issue3450/include/asterisk/channel.h
    team/group/issue3450/include/asterisk/cli.h
    team/group/issue3450/include/asterisk/compat.h
    team/group/issue3450/include/asterisk/compiler.h
    team/group/issue3450/include/asterisk/config.h
    team/group/issue3450/include/asterisk/datastore.h
    team/group/issue3450/include/asterisk/devicestate.h
    team/group/issue3450/include/asterisk/dlinkedlists.h
    team/group/issue3450/include/asterisk/dnsmgr.h
    team/group/issue3450/include/asterisk/doxyref.h
    team/group/issue3450/include/asterisk/dsp.h
    team/group/issue3450/include/asterisk/dundi.h
    team/group/issue3450/include/asterisk/enum.h
    team/group/issue3450/include/asterisk/event.h
    team/group/issue3450/include/asterisk/extconf.h
    team/group/issue3450/include/asterisk/features.h
    team/group/issue3450/include/asterisk/file.h
    team/group/issue3450/include/asterisk/frame.h
    team/group/issue3450/include/asterisk/global_datastores.h
    team/group/issue3450/include/asterisk/hashtab.h
    team/group/issue3450/include/asterisk/http.h
    team/group/issue3450/include/asterisk/indications.h
    team/group/issue3450/include/asterisk/io.h
    team/group/issue3450/include/asterisk/linkedlists.h
    team/group/issue3450/include/asterisk/lock.h
    team/group/issue3450/include/asterisk/logger.h
    team/group/issue3450/include/asterisk/manager.h
    team/group/issue3450/include/asterisk/module.h
    team/group/issue3450/include/asterisk/options.h
    team/group/issue3450/include/asterisk/pbx.h
    team/group/issue3450/include/asterisk/poll-compat.h
    team/group/issue3450/include/asterisk/pval.h
    team/group/issue3450/include/asterisk/res_odbc.h
    team/group/issue3450/include/asterisk/rtp.h
    team/group/issue3450/include/asterisk/say.h
    team/group/issue3450/include/asterisk/sched.h
    team/group/issue3450/include/asterisk/slinfactory.h
    team/group/issue3450/include/asterisk/stringfields.h
    team/group/issue3450/include/asterisk/strings.h
    team/group/issue3450/include/asterisk/taskprocessor.h
    team/group/issue3450/include/asterisk/tcptls.h
    team/group/issue3450/include/asterisk/threadstorage.h
    team/group/issue3450/include/asterisk/timing.h
    team/group/issue3450/include/asterisk/udptl.h
    team/group/issue3450/include/asterisk/utils.h
    team/group/issue3450/include/jitterbuf.h
    team/group/issue3450/main/Makefile
    team/group/issue3450/main/abstract_jb.c
    team/group/issue3450/main/acl.c
    team/group/issue3450/main/aescrypt.c
    team/group/issue3450/main/alaw.c
    team/group/issue3450/main/app.c
    team/group/issue3450/main/ast_expr2.c
    team/group/issue3450/main/ast_expr2.fl
    team/group/issue3450/main/ast_expr2.h
    team/group/issue3450/main/ast_expr2.y
    team/group/issue3450/main/ast_expr2f.c
    team/group/issue3450/main/asterisk.c
    team/group/issue3450/main/astmm.c
    team/group/issue3450/main/astobj2.c
    team/group/issue3450/main/audiohook.c
    team/group/issue3450/main/autoservice.c
    team/group/issue3450/main/callerid.c
    team/group/issue3450/main/cdr.c
    team/group/issue3450/main/channel.c
    team/group/issue3450/main/cli.c
    team/group/issue3450/main/config.c
    team/group/issue3450/main/db.c
    team/group/issue3450/main/devicestate.c
    team/group/issue3450/main/dns.c
    team/group/issue3450/main/dnsmgr.c
    team/group/issue3450/main/dsp.c
    team/group/issue3450/main/editline/configure
    team/group/issue3450/main/editline/configure.in
    team/group/issue3450/main/editline/np/unvis.c
    team/group/issue3450/main/editline/read.c
    team/group/issue3450/main/editline/sys.h
    team/group/issue3450/main/enum.c
    team/group/issue3450/main/event.c
    team/group/issue3450/main/features.c
    team/group/issue3450/main/file.c
    team/group/issue3450/main/frame.c
    team/group/issue3450/main/global_datastores.c
    team/group/issue3450/main/hashtab.c
    team/group/issue3450/main/http.c
    team/group/issue3450/main/indications.c
    team/group/issue3450/main/io.c
    team/group/issue3450/main/jitterbuf.c
    team/group/issue3450/main/loader.c
    team/group/issue3450/main/logger.c
    team/group/issue3450/main/manager.c
    team/group/issue3450/main/pbx.c
    team/group/issue3450/main/poll.c
    team/group/issue3450/main/rtp.c
    team/group/issue3450/main/say.c
    team/group/issue3450/main/sched.c
    team/group/issue3450/main/slinfactory.c
    team/group/issue3450/main/srv.c
    team/group/issue3450/main/stdtime/localtime.c
    team/group/issue3450/main/taskprocessor.c
    team/group/issue3450/main/tcptls.c
    team/group/issue3450/main/threadstorage.c
    team/group/issue3450/main/timing.c
    team/group/issue3450/main/translate.c
    team/group/issue3450/main/udptl.c
    team/group/issue3450/main/utils.c
    team/group/issue3450/main/xml.c
    team/group/issue3450/main/xmldoc.c
    team/group/issue3450/makeopts.in
    team/group/issue3450/pbx/ael/ael-test/ref.ael-vtest13
    team/group/issue3450/pbx/ael/ael-test/ref.ael-vtest17
    team/group/issue3450/pbx/pbx_ael.c
    team/group/issue3450/pbx/pbx_config.c
    team/group/issue3450/pbx/pbx_dundi.c
    team/group/issue3450/pbx/pbx_realtime.c
    team/group/issue3450/pbx/pbx_spool.c
    team/group/issue3450/phoneprov/polycom_line.xml   (props changed)
    team/group/issue3450/res/Makefile
    team/group/issue3450/res/ael/ael.flex
    team/group/issue3450/res/ael/ael.tab.c
    team/group/issue3450/res/ael/ael.y
    team/group/issue3450/res/ael/ael_lex.c
    team/group/issue3450/res/ael/pval.c
    team/group/issue3450/res/res_agi.c
    team/group/issue3450/res/res_ais.c
    team/group/issue3450/res/res_clialiases.c
    team/group/issue3450/res/res_clioriginate.c
    team/group/issue3450/res/res_config_curl.c
    team/group/issue3450/res/res_config_ldap.c
    team/group/issue3450/res/res_config_odbc.c
    team/group/issue3450/res/res_config_pgsql.c
    team/group/issue3450/res/res_config_sqlite.c
    team/group/issue3450/res/res_convert.c
    team/group/issue3450/res/res_crypto.c
    team/group/issue3450/res/res_curl.c
    team/group/issue3450/res/res_http_post.c   (contents, props changed)
    team/group/issue3450/res/res_jabber.c
    team/group/issue3450/res/res_monitor.c
    team/group/issue3450/res/res_musiconhold.c
    team/group/issue3450/res/res_odbc.c
    team/group/issue3450/res/res_phoneprov.c   (contents, props changed)
    team/group/issue3450/res/res_realtime.c
    team/group/issue3450/res/res_snmp.c
    team/group/issue3450/res/res_timing_dahdi.c
    team/group/issue3450/res/res_timing_pthread.c
    team/group/issue3450/res/res_timing_timerfd.c
    team/group/issue3450/res/snmp/agent.c
    team/group/issue3450/sounds/Makefile
    team/group/issue3450/sounds/sounds.xml
    team/group/issue3450/utils/   (props changed)
    team/group/issue3450/utils/Makefile
    team/group/issue3450/utils/ael_main.c
    team/group/issue3450/utils/astcanary.c
    team/group/issue3450/utils/astman.c
    team/group/issue3450/utils/check_expr.c
    team/group/issue3450/utils/conf2ael.c
    team/group/issue3450/utils/expr2.testinput
    team/group/issue3450/utils/extconf.c
    team/group/issue3450/utils/frame.c
    team/group/issue3450/utils/hashtest.c
    team/group/issue3450/utils/hashtest2.c
    team/group/issue3450/utils/refcounter.c
    team/group/issue3450/utils/smsq.c

Propchange: team/group/issue3450/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/group/issue3450/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 19 00:41:03 2009
@@ -1,1 +1,1 @@
-/trunk:1-154848,154875,154915,154919,154922
+/trunk:1-183068

Modified: team/group/issue3450/.cleancount
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue3450/.cleancount?view=diff&rev=183102&r1=183101&r2=183102
==============================================================================
--- team/group/issue3450/.cleancount (original)
+++ team/group/issue3450/.cleancount Thu Mar 19 00:41:03 2009
@@ -1,1 +1,1 @@
-35
+36

Modified: team/group/issue3450/CHANGES
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue3450/CHANGES?view=diff&rev=183102&r1=183101&r2=183102
==============================================================================
--- team/group/issue3450/CHANGES (original)
+++ team/group/issue3450/CHANGES Thu Mar 19 00:41:03 2009
@@ -1,3 +1,27 @@
+======================================================================
+===
+=== This file documents the new and/or enhanced functionality added in
+=== the Asterisk versions listed below. This file does NOT include
+=== changes in behavior that would not be backwards compatible with
+=== previous versions; for that information see the UPGRADE.txt file
+=== and the other UPGRADE files for older releases.
+===
+======================================================================
+
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 1.6.2 to Asterisk 1.6.3  -------------
+------------------------------------------------------------------------------
+
+Applications
+------------
+ * Added progress option to the app_dial D() option.  When progress DTMF is
+   present, those values are sent immediatly upon receiving a PROGRESS message
+   regardless if the call has been answered or not.
+
+Functions
+---------
+ * The CHANNEL() function now supports the "name" option.
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.1 to Asterisk 1.6.2  -------------
 ------------------------------------------------------------------------------
@@ -15,12 +39,58 @@
    remote services. For backwards compatibility, "secret" still has the
    same function as before, but now you can configure both a remote secret and a
    local secret for mutual authentication.
+ * Added a new 'faxdetect=yes|no' configuration option to sip.conf.  When this
+   option is enabled, a SIP channel will go to the fax extension (if it exists)
+   after T38 is negotiated.  This option is disabled by default.
+ * If the channel variable  ATTENDED_TRANSFER_COMPLETE_SOUND is set, 
+   the sound will be played to the target of an attended transfer
+ * Added two new configuration options, "qualifygap" and "qualifypeers", which allow
+   finer control over how many peers Asterisk will qualify and the gap between them
+   when all peers need to be qualified at the same time.
+ * Added a new 'ignoresdpversion' option to sip.conf.  When this is enabled
+   (either globally or for a specific peer), chan_sip will treat any SDP data
+   it receives as new data and update the media stream accordingly.  By
+   default, Asterisk will only modify the media stream if the SDP session
+   version received is different from the current SDP session version.  This
+   option is required to interoperate with devices that have non-standard SDP
+   session version implementations (observed with Microsoft OCS).  This option
+   is disabled by default.
+ * The parsing of register => lines in sip.conf has been modified to allow a port
+   to be present in the "user" portion. Please see the sip.conf.sample file for more
+   information
+ * Added support for subscribing to MWI on a remote server and making the status available
+   as a mailbox. Please see the sip.conf.sample file for more information.
+ * Added a function to remove SIP headers added in the dialplan before the
+   first INVITE is generated - SIPRemoveHeader()
+ * Channel variables set with setvar= in a device configuration is now 
+   set both for inbound and outbound calls.
+ * Added support for ITU G.722.1 and G.722.1C (Siren7 and Siren14) media streams.
+
+IAX2 changes
+------------
+  * Added immediate option to iax.conf
+  * Added forceencryption option to iax.conf
+  * Added Encryption and Trunk status to manager command "iaxpeers"
 
 Skinny Changes
 --------------
- * The configuration file now holds seperate sections for devices and lines.
+ * The configuration file now holds separate sections for devices and lines.
    Please have a look at configs/skinny.conf.sample and change your skinny.conf
    accordingly.
+
+DAHDI Changes
+-------------
+ * chan_dahdi now supports MFC/R2 signaling when Asterisk is compiled with
+   support for LibOpenR2.  http://www.libopenr2.org/
+ * The UK option waitfordialtone has been added for use with BT analog
+   lines.
+ * Added a 'faxbuffers' configuration option to chan_dahdi.conf.  This option
+   is used in conjunction with the 'faxdetect' configuration option.  When
+   'faxbuffers' is used and fax tones are detected, the channel will dynamically
+   switch to the configured faxbuffers policy.  For example, to use 6 buffers
+   and a 'full' buffer policy for a fax transmission, add:
+     faxbuffers=>6,full
+   The faxbuffers configuration will be in affect until the call is torn down.
 
 Dialplan Functions
 ------------------
@@ -37,9 +107,21 @@
    and FIELDQTY dialplan functions, which also manage lists.
  * Added REALTIME_FIELD and REALTIME_HASH, which should aid users in better
    obtaining realtime data from the dialplan.
+ * Added LOCAL_PEEK, which I have no idea how to use, but Leif Madsen wanted it.
+   Russell says it's, like, a scope resolution function for LOCAL variables.
+   Totally.  Hopefully, that means more to you than it does to me.
+ * Added AUDIOHOOK_INHERIT. For information on its use, please see the output
+   of "core show function AUDIOHOOK_INHERIT" from the CLI
+ * Added AES_ENCRYPT. For information on its use, please see the output
+   of "core show function AES_ENCRYPT" from the CLI
+ * Added AES_DECRYPT. For information on its use, please see the output
+   of "core show function AES_DECRYPT" from the CLI
+ * func_odbc now supports database transactions across multiple queries.
 
 Applications
 ------------
+ * DAHDISendCallreroutingFacility parameters are now comma-separated,
+   instead of the old pipe.
  * Scheduled meetme conferences may now have their end times extended by
    using MeetMeAdmin.
  * app_authenticate now gives the ability to select a prompt other than
@@ -47,9 +129,18 @@
  * app_directory now pays attention to the searchcontexts setting in
    voicemail.conf and will look through all contexts, if no context is
    specified in the initial argument.
+ * A new application, Originate, has been introduced, that allows asynchronous
+   call origination from the dialplan.
+ * Voicemail now permits setting the emailsubject and emailbody per mailbox,
+   in addition to the setting in the "general" context.
+ * Added ConfBridge dialplan application which does conference bridges without
+   DAHDI. For information on its use, please see the output of
+   "core show application ConfBridge" from the CLI.
 
 Miscellaneous
 -------------
+ * The Asterisk CLI has a new command, "channel redirect", which is similar in
+   operation to the AMI Redirect action.
  * res_jabber: autoprune has been disabled by default, to avoid misconfiguration 
    that would end up being interpreted as a bug once Asterisk started removing 
    the contacts from a user list.
@@ -62,6 +153,48 @@
    which are interpreted as relative to the astvarlibdir setting in asterisk.conf.
  * All deprecated CLI commands are removed from the sourcecode. They are now handled
    by the new clialiases module. See cli_aliases.conf.sample file.
+ * Times within timespecs are now accurate down to the minute.  This is a change
+   from historical Asterisk, which only provided timespecs rounded to the nearest
+   even (read: evenly divisible by 2) minute mark.
+ * The realtime switch now supports an option flag, 'p', which disables searches for
+   pattern matches.
+ * In addition to a time range and date range, timespecs now accept a 5th optional
+   argument, timezone.  This allows you to perform time checks on alternate
+   timezones, especially if those daylight savings time ranges vary from your
+   machine's native timezone.  See GotoIfTime, ExecIfTime, IFTIME(), and timed
+   includes.
+ * The contrib/scripts/ directory now has a script called sip_nat_settings that will
+   give you the correct output for an asterisk box behind nat. It will give you the
+   externhost and localnet settings.
+ * The Asterisk core now supports ITU G.722.1 and G.722.1C media streams, and
+   can connect calls in passthrough mode, as well as record and play back files.
+ * Successful and unsuccessful call pickup can now be alerted through sounds, by
+   using pickupsound and pickupfailsound in features.conf.
+ * ASTVARRUNDIR is now set to $(localstatedir)/run/asterisk by default. 
+   This means the asterisk pid file will now be in /var/run/asterisk/asterisk.pid on LINUX
+   instead of the /var/run/asterisk.pid where it used to be. This will make
+   installs as non-root easier to manage.
+
+Asterisk Manager Interface
+--------------------------
+ * When using the AMI over HTTP, you can now include a 'SuppressEvents' header (with
+   a non-empty value) in your request. If you do this, any pending AMI events will
+   *not* be included in the response to your request as they would normally, but
+   will be left in the event queue for the next request you make to retrieve. For
+   some applications, this will allow you to guarantee that you will only see
+   events in responses to 'WaitEvent' actions, and can better know when to expect them.
+   To know whether the Asterisk server supports this header or not, your client can
+   inspect the first response back from the server to see if it includes this header:
+
+   Pragma: SuppressEvents
+
+   If this is included, the server supports event suppression.
+
+ * Added 4 new Actions to list skinny device(s) and line(s)
+   SKINNYdevices
+   SKINNYshowdevice
+   SKINNYlines
+   SKINNYshowline
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.0 to Asterisk 1.6.1  -------------
@@ -252,6 +385,9 @@
   * A new configuration option, "timeoutpriority" has been added. Please see the section labeled
     "QUEUE TIMING OPTIONS" in configs/queues.conf.sample for a detailed explanation of the option
     as well as an explanation about timeout options in general
+  * Added a new option - C - for forcing the "answered elsewhere" flag on
+    cancellation of calls in to members of the queue. This is to avoid the
+    call to a member of a queue having the call listed as a "missed call".
 
 Realtime changes
 ----------------
@@ -372,6 +508,12 @@
 
 CLI Changes
 -----------
+  * Added CLI permissions, config file: cli_permissions.conf
+     default is to allow all commands for every local user/group.
+     Also this new feature added three new CLI commands:
+      - cli check permissions {<username>|@<groupname>|<username>@<groupname>} [<command>]
+      - cli reload permissions
+      - cli show permissions
   * New CLI command "core show hint" (usage: core show hint <exten>)
   * New CLI command "core show settings"
   * Added 'core show channels count' CLI command.
@@ -634,6 +776,9 @@
   * Added a new parameter for member definition, called state_interface. This may be
     used so that a member may be called via one interface but have a different interface's
     device state reported.
+  * Added new CLI and Manager commands relating to reloading queues. From the CLI, see
+    "queue reload", "queue reset stats". Also see "manager show command QueueReload" and
+    "manager show command QueueReset."
   * New configuration option: randomperiodicannounce. If a list of periodic announcements is
     specified by the periodic-announce option, then one will be chosen randomly when it is time
     to play a periodic announcment
@@ -650,8 +795,12 @@
     is typically placed.
   * The configuration method for the "joinempty" and "leavewhenempty" options has
     changed to a comma-separated list of methods of determining member availability
-	instead of vague terms such as "yes," "loose," "no," and "strict." These old four
-	values are still accepted for backwards-compatibility, though.
+    instead of vague terms such as "yes," "loose," "no," and "strict." These old four
+    values are still accepted for backwards-compatibility, though.
+  * The average talktime is now calculated on queues. This information is reported via the
+    CLI commands "queue show" and "queues show"; through the AMI events AgentComplete, QueueSummary,
+    and QueueParams; and through the channelvariable QUEUETALKTIME if setinterfacevar=yes is set for
+    the queue.
 
 MeetMe Changes
 --------------
@@ -769,6 +918,13 @@
 Call Features (res_features) Changes
 ------------------------------------
   * Added the parkedcalltransfers option to features.conf
+  * Added parkedcallparking option to control one touch parking w/ parking
+    pickup
+  * Added parkedcallhangup option to control disconnect feature w/ parking
+    pickup
+  * Added parkedcallrecording option to control one-touch record w/ parking
+    pickup
+  * Added BRIDGE_FEATURES variable to set available features for a channel
   * The built-in method for doing attended transfers has been updated to
      include some new options that allow you to have the transferee sent
      back to the person that did the transfer if the transfer is not successful.

Modified: team/group/issue3450/CREDITS
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue3450/CREDITS?view=diff&rev=183102&r1=183101&r2=183102
==============================================================================
--- team/group/issue3450/CREDITS (original)
+++ team/group/issue3450/CREDITS Thu Mar 19 00:41:03 2009
@@ -192,6 +192,11 @@
 	- See http://voip-info.org/users/view/sergee
 	serg(AT)voipsolutions.ru
 
+Klaus Darillon - the SIPremoveHeader function in chan_sip
+
+Moises Silva (moy) - for writing LibOpenR2, and providing support for it in chan_dahdi
+     moises.silva(AT)gmail.com
+
 === OTHER CONTRIBUTIONS ===
 John Todd - Monkey sounds and associated teletorture prompt
 Michael Jerris - bug marshaling

Modified: team/group/issue3450/Makefile
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue3450/Makefile?view=diff&rev=183102&r1=183101&r2=183102
==============================================================================
--- team/group/issue3450/Makefile (original)
+++ team/group/issue3450/Makefile Thu Mar 19 00:41:03 2009
@@ -146,7 +146,7 @@
   ASTSBINDIR=$(sbindir)
   ASTSPOOLDIR=$(localstatedir)/spool/asterisk
   ASTLOGDIR=$(localstatedir)/log/asterisk
-  ASTVARRUNDIR=$(localstatedir)/run
+  ASTVARRUNDIR=$(localstatedir)/run/asterisk
   ASTMANDIR=$(mandir)
 ifneq ($(findstring BSD,$(OSARCH)),)
   ASTVARLIBDIR=$(prefix)/share/asterisk
@@ -237,7 +237,13 @@
 ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
 
 ifeq ($(AST_DEVMODE),yes)
-  ASTCFLAGS+=-Werror -Wunused -Wundef $(AST_DECLARATION_AFTER_STATEMENT) -Wmissing-format-attribute -Wformat-security #-Wformat=2
+  ASTCFLAGS+=-Werror
+  ASTCFLAGS+=-Wunused
+  ASTCFLAGS+=$(AST_DECLARATION_AFTER_STATEMENT)
+  ASTCFLAGS+=$(AST_FORTIFY_SOURCE)
+  ASTCFLAGS+=-Wundef 
+  ASTCFLAGS+=-Wmissing-format-attribute
+  ASTCFLAGS+=-Wformat=2
 endif
 
 ifneq ($(findstring BSD,$(OSARCH)),)
@@ -287,7 +293,7 @@
 #	value directly to ASTCFLAGS
 ASTCFLAGS+=$(MALLOC_DEBUG)$(OPTIONS)
 
-MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs tests main res $(LOCAL_MOD_SUBDIRS)
+MOD_SUBDIRS:=channels pbx apps codecs formats cdr bridges funcs tests main res $(LOCAL_MOD_SUBDIRS)
 OTHER_SUBDIRS:=utils agi
 SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
@@ -720,6 +726,7 @@
 		echo ";rungroup = asterisk ; The group to run as" ; \
 		echo ";lightbackground = yes ; If your terminal is set for a light-colored background" ; \
 		echo "documentation_language = en_US ; Set the Language you want Documentation displayed in. Value is in the same format as locale names" ; \
+		echo ";hideconnect = yes ; Hide messages displayed when a remote console connects and disconnects" ; \
 		echo "" ; \
 		echo "; Changing the following lines may compromise your security." ; \
 		echo ";[files]" ; \
@@ -798,22 +805,28 @@
 config:
 	@if [ "${OSARCH}" = "linux-gnu" ]; then \
 		if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
-			$(INSTALL) -m 755 contrib/init.d/rc.redhat.asterisk $(DESTDIR)/etc/rc.d/init.d/asterisk; \
+			cat contrib/init.d/rc.redhat.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)/etc/rc.d/init.d/asterisk ;\
+			chmod 755 $(DESTDIR)/etc/rc.d/init.d/asterisk;\
 			if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
 		elif [ -f /etc/debian_version ]; then \
-			$(INSTALL) -m 755 contrib/init.d/rc.debian.asterisk $(DESTDIR)/etc/init.d/asterisk; \
+			cat contrib/init.d/rc.debian.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)/etc/init.d/asterisk ;\
+			chmod 755 $(DESTDIR)/etc/init.d/asterisk;\
 			if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk start 50 2 3 4 5 . stop 91 2 3 4 5 .; fi; \
 		elif [ -f /etc/gentoo-release ]; then \
-			$(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk $(DESTDIR)/etc/init.d/asterisk; \

[... 80065 lines stripped ...]

More information about the asterisk-commits mailing list