[asterisk-commits] file: branch group/netsock2 r114048 - in /team/group/netsock2: ./ apps/ build...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Apr 10 15:24:29 CDT 2008


Author: file
Date: Thu Apr 10 15:24:27 2008
New Revision: 114048

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114048
Log:
Bring branch up to date for Simon.

Added:
    team/group/netsock2/UPGRADE-1.2.txt
      - copied unchanged from r114042, trunk/UPGRADE-1.2.txt
    team/group/netsock2/UPGRADE-1.4.txt
      - copied unchanged from r114042, trunk/UPGRADE-1.4.txt
    team/group/netsock2/build_tools/cflags-devmode.xml
      - copied unchanged from r114042, trunk/build_tools/cflags-devmode.xml
    team/group/netsock2/build_tools/make_version_h
      - copied unchanged from r114042, trunk/build_tools/make_version_h
    team/group/netsock2/configs/cli.conf.sample
      - copied unchanged from r114042, trunk/configs/cli.conf.sample
    team/group/netsock2/configs/dbsep.conf.sample
      - copied unchanged from r114042, trunk/configs/dbsep.conf.sample
    team/group/netsock2/configs/dsp.conf.sample
      - copied unchanged from r114042, trunk/configs/dsp.conf.sample
    team/group/netsock2/configs/res_ldap.conf.sample
      - copied unchanged from r114042, trunk/configs/res_ldap.conf.sample
    team/group/netsock2/contrib/scripts/astcli
      - copied unchanged from r114042, trunk/contrib/scripts/astcli
    team/group/netsock2/contrib/scripts/asterisk.ldap-schema
      - copied unchanged from r114042, trunk/contrib/scripts/asterisk.ldap-schema
    team/group/netsock2/contrib/scripts/asterisk.ldif
      - copied unchanged from r114042, trunk/contrib/scripts/asterisk.ldif
    team/group/netsock2/contrib/scripts/dbsep.cgi
      - copied unchanged from r114042, trunk/contrib/scripts/dbsep.cgi
    team/group/netsock2/contrib/scripts/get_ilbc_source.sh
      - copied unchanged from r114042, trunk/contrib/scripts/get_ilbc_source.sh
    team/group/netsock2/doc/janitor-projects.txt
      - copied unchanged from r114042, trunk/doc/janitor-projects.txt
    team/group/netsock2/doc/ldap.txt
      - copied unchanged from r114042, trunk/doc/ldap.txt
    team/group/netsock2/doc/siptls.txt
      - copied unchanged from r114042, trunk/doc/siptls.txt
    team/group/netsock2/funcs/func_config.c
      - copied unchanged from r114042, trunk/funcs/func_config.c
    team/group/netsock2/include/asterisk/ast_version.h
      - copied unchanged from r114042, trunk/include/asterisk/ast_version.h
    team/group/netsock2/include/asterisk/tcptls.h
      - copied unchanged from r114042, trunk/include/asterisk/tcptls.h
    team/group/netsock2/main/features.c
      - copied unchanged from r114042, trunk/main/features.c
    team/group/netsock2/main/tcptls.c
      - copied unchanged from r114042, trunk/main/tcptls.c
    team/group/netsock2/pbx/ael/ael-test/ael-ntest23/
      - copied from r114042, trunk/pbx/ael/ael-test/ael-ntest23/
    team/group/netsock2/pbx/ael/ael-test/ael-ntest23/extensions.ael
      - copied unchanged from r114042, trunk/pbx/ael/ael-test/ael-ntest23/extensions.ael
    team/group/netsock2/pbx/ael/ael-test/ael-ntest23/qq.ael
      - copied unchanged from r114042, trunk/pbx/ael/ael-test/ael-ntest23/qq.ael
    team/group/netsock2/pbx/ael/ael-test/ael-ntest23/t1/
      - copied from r114042, trunk/pbx/ael/ael-test/ael-ntest23/t1/
    team/group/netsock2/pbx/ael/ael-test/ael-ntest23/t1/a.ael
      - copied unchanged from r114042, trunk/pbx/ael/ael-test/ael-ntest23/t1/a.ael
    team/group/netsock2/pbx/ael/ael-test/ael-ntest23/t1/b.ael
      - copied unchanged from r114042, trunk/pbx/ael/ael-test/ael-ntest23/t1/b.ael
    team/group/netsock2/pbx/ael/ael-test/ael-ntest23/t1/c.ael
      - copied unchanged from r114042, trunk/pbx/ael/ael-test/ael-ntest23/t1/c.ael
    team/group/netsock2/pbx/ael/ael-test/ael-ntest23/t2/
      - copied from r114042, trunk/pbx/ael/ael-test/ael-ntest23/t2/
    team/group/netsock2/pbx/ael/ael-test/ael-ntest23/t2/d.ael
      - copied unchanged from r114042, trunk/pbx/ael/ael-test/ael-ntest23/t2/d.ael
    team/group/netsock2/pbx/ael/ael-test/ael-ntest23/t2/e.ael
      - copied unchanged from r114042, trunk/pbx/ael/ael-test/ael-ntest23/t2/e.ael
    team/group/netsock2/pbx/ael/ael-test/ael-ntest23/t2/f.ael
      - copied unchanged from r114042, trunk/pbx/ael/ael-test/ael-ntest23/t2/f.ael
    team/group/netsock2/pbx/ael/ael-test/ael-ntest23/t3/
      - copied from r114042, trunk/pbx/ael/ael-test/ael-ntest23/t3/
    team/group/netsock2/pbx/ael/ael-test/ael-ntest23/t3/g.ael
      - copied unchanged from r114042, trunk/pbx/ael/ael-test/ael-ntest23/t3/g.ael
    team/group/netsock2/pbx/ael/ael-test/ael-ntest23/t3/h.ael
      - copied unchanged from r114042, trunk/pbx/ael/ael-test/ael-ntest23/t3/h.ael
    team/group/netsock2/pbx/ael/ael-test/ael-ntest23/t3/i.ael
      - copied unchanged from r114042, trunk/pbx/ael/ael-test/ael-ntest23/t3/i.ael
    team/group/netsock2/pbx/ael/ael-test/ael-ntest23/t3/j.ael
      - copied unchanged from r114042, trunk/pbx/ael/ael-test/ael-ntest23/t3/j.ael
    team/group/netsock2/pbx/ael/ael-test/ref.ael-ntest23
      - copied unchanged from r114042, trunk/pbx/ael/ael-test/ref.ael-ntest23
    team/group/netsock2/phoneprov/polycom_line.xml
      - copied unchanged from r114042, trunk/phoneprov/polycom_line.xml
    team/group/netsock2/res/res_config_curl.c
      - copied unchanged from r114042, trunk/res/res_config_curl.c
    team/group/netsock2/res/res_config_ldap.c
      - copied unchanged from r114042, trunk/res/res_config_ldap.c
    team/group/netsock2/res/res_http_post.c
      - copied unchanged from r114042, trunk/res/res_http_post.c
Removed:
    team/group/netsock2/codecs/ilbc/FrameClassify.c
    team/group/netsock2/codecs/ilbc/FrameClassify.h
    team/group/netsock2/codecs/ilbc/LPCdecode.c
    team/group/netsock2/codecs/ilbc/LPCdecode.h
    team/group/netsock2/codecs/ilbc/LPCencode.c
    team/group/netsock2/codecs/ilbc/LPCencode.h
    team/group/netsock2/codecs/ilbc/StateConstructW.c
    team/group/netsock2/codecs/ilbc/StateConstructW.h
    team/group/netsock2/codecs/ilbc/StateSearchW.c
    team/group/netsock2/codecs/ilbc/StateSearchW.h
    team/group/netsock2/codecs/ilbc/anaFilter.c
    team/group/netsock2/codecs/ilbc/anaFilter.h
    team/group/netsock2/codecs/ilbc/constants.c
    team/group/netsock2/codecs/ilbc/constants.h
    team/group/netsock2/codecs/ilbc/createCB.c
    team/group/netsock2/codecs/ilbc/createCB.h
    team/group/netsock2/codecs/ilbc/doCPLC.c
    team/group/netsock2/codecs/ilbc/doCPLC.h
    team/group/netsock2/codecs/ilbc/enhancer.c
    team/group/netsock2/codecs/ilbc/enhancer.h
    team/group/netsock2/codecs/ilbc/filter.c
    team/group/netsock2/codecs/ilbc/filter.h
    team/group/netsock2/codecs/ilbc/gainquant.c
    team/group/netsock2/codecs/ilbc/gainquant.h
    team/group/netsock2/codecs/ilbc/getCBvec.c
    team/group/netsock2/codecs/ilbc/getCBvec.h
    team/group/netsock2/codecs/ilbc/helpfun.c
    team/group/netsock2/codecs/ilbc/helpfun.h
    team/group/netsock2/codecs/ilbc/hpInput.c
    team/group/netsock2/codecs/ilbc/hpInput.h
    team/group/netsock2/codecs/ilbc/hpOutput.c
    team/group/netsock2/codecs/ilbc/hpOutput.h
    team/group/netsock2/codecs/ilbc/iCBConstruct.c
    team/group/netsock2/codecs/ilbc/iCBConstruct.h
    team/group/netsock2/codecs/ilbc/iCBSearch.c
    team/group/netsock2/codecs/ilbc/iCBSearch.h
    team/group/netsock2/codecs/ilbc/iLBC_decode.c
    team/group/netsock2/codecs/ilbc/iLBC_decode.h
    team/group/netsock2/codecs/ilbc/iLBC_define.h
    team/group/netsock2/codecs/ilbc/iLBC_encode.c
    team/group/netsock2/codecs/ilbc/iLBC_encode.h
    team/group/netsock2/codecs/ilbc/libilbc.vcproj
    team/group/netsock2/codecs/ilbc/lsf.c
    team/group/netsock2/codecs/ilbc/lsf.h
    team/group/netsock2/codecs/ilbc/packing.c
    team/group/netsock2/codecs/ilbc/packing.h
    team/group/netsock2/codecs/ilbc/syntFilter.c
    team/group/netsock2/codecs/ilbc/syntFilter.h
    team/group/netsock2/main/minimime/
    team/group/netsock2/res/res_features.c
Modified:
    team/group/netsock2/   (props changed)
    team/group/netsock2/.cleancount
    team/group/netsock2/CHANGES
    team/group/netsock2/CREDITS
    team/group/netsock2/Makefile
    team/group/netsock2/Makefile.rules
    team/group/netsock2/README
    team/group/netsock2/UPGRADE.txt
    team/group/netsock2/acinclude.m4
    team/group/netsock2/apps/app_adsiprog.c
    team/group/netsock2/apps/app_alarmreceiver.c
    team/group/netsock2/apps/app_amd.c
    team/group/netsock2/apps/app_authenticate.c
    team/group/netsock2/apps/app_cdr.c
    team/group/netsock2/apps/app_chanisavail.c
    team/group/netsock2/apps/app_channelredirect.c
    team/group/netsock2/apps/app_chanspy.c
    team/group/netsock2/apps/app_controlplayback.c
    team/group/netsock2/apps/app_db.c
    team/group/netsock2/apps/app_dial.c
    team/group/netsock2/apps/app_dictate.c
    team/group/netsock2/apps/app_directed_pickup.c
    team/group/netsock2/apps/app_directory.c
    team/group/netsock2/apps/app_disa.c
    team/group/netsock2/apps/app_dumpchan.c
    team/group/netsock2/apps/app_echo.c
    team/group/netsock2/apps/app_exec.c
    team/group/netsock2/apps/app_externalivr.c
    team/group/netsock2/apps/app_festival.c
    team/group/netsock2/apps/app_followme.c
    team/group/netsock2/apps/app_meetme.c
    team/group/netsock2/apps/app_minivm.c
    team/group/netsock2/apps/app_mixmonitor.c
    team/group/netsock2/apps/app_page.c
    team/group/netsock2/apps/app_playback.c
    team/group/netsock2/apps/app_privacy.c
    team/group/netsock2/apps/app_queue.c
    team/group/netsock2/apps/app_record.c
    team/group/netsock2/apps/app_rpt.c
    team/group/netsock2/apps/app_sms.c
    team/group/netsock2/apps/app_speech_utils.c
    team/group/netsock2/apps/app_talkdetect.c
    team/group/netsock2/apps/app_voicemail.c
    team/group/netsock2/apps/app_waitforsilence.c
    team/group/netsock2/apps/app_zapras.c
    team/group/netsock2/build_tools/cflags.xml
    team/group/netsock2/build_tools/make_buildopts_h
    team/group/netsock2/build_tools/make_defaults_h
    team/group/netsock2/build_tools/make_version
    team/group/netsock2/build_tools/make_version_c
    team/group/netsock2/build_tools/menuselect-deps.in
    team/group/netsock2/build_tools/strip_nonapi
    team/group/netsock2/cdr/cdr_adaptive_odbc.c
    team/group/netsock2/cdr/cdr_csv.c
    team/group/netsock2/cdr/cdr_custom.c
    team/group/netsock2/cdr/cdr_odbc.c
    team/group/netsock2/cdr/cdr_pgsql.c
    team/group/netsock2/cdr/cdr_sqlite3_custom.c
    team/group/netsock2/channels/Makefile
    team/group/netsock2/channels/chan_agent.c
    team/group/netsock2/channels/chan_alsa.c
    team/group/netsock2/channels/chan_console.c
    team/group/netsock2/channels/chan_gtalk.c
    team/group/netsock2/channels/chan_h323.c
    team/group/netsock2/channels/chan_iax2.c
    team/group/netsock2/channels/chan_jingle.c
    team/group/netsock2/channels/chan_local.c
    team/group/netsock2/channels/chan_mgcp.c
    team/group/netsock2/channels/chan_misdn.c
    team/group/netsock2/channels/chan_oss.c
    team/group/netsock2/channels/chan_phone.c
    team/group/netsock2/channels/chan_sip.c
    team/group/netsock2/channels/chan_skinny.c
    team/group/netsock2/channels/chan_unistim.c
    team/group/netsock2/channels/chan_usbradio.c
    team/group/netsock2/channels/chan_vpb.cc
    team/group/netsock2/channels/chan_zap.c
    team/group/netsock2/channels/console_gui.c
    team/group/netsock2/channels/h323/ast_h323.cxx
    team/group/netsock2/channels/iax2-provision.c
    team/group/netsock2/channels/misdn/chan_misdn_config.h
    team/group/netsock2/channels/misdn/ie.c
    team/group/netsock2/channels/misdn/isdn_lib.c
    team/group/netsock2/channels/misdn/isdn_lib.h
    team/group/netsock2/channels/misdn/isdn_msg_parser.c
    team/group/netsock2/channels/misdn/portinfo.c
    team/group/netsock2/channels/misdn_config.c
    team/group/netsock2/codecs/Makefile
    team/group/netsock2/codecs/codec_g722.c
    team/group/netsock2/codecs/codec_ilbc.c
    team/group/netsock2/codecs/codec_speex.c
    team/group/netsock2/codecs/codec_zap.c
    team/group/netsock2/codecs/gsm/Makefile
    team/group/netsock2/codecs/ilbc/   (props changed)
    team/group/netsock2/codecs/log2comp.h
    team/group/netsock2/configs/cdr.conf.sample
    team/group/netsock2/configs/cdr_adaptive_odbc.conf.sample
    team/group/netsock2/configs/console.conf.sample
    team/group/netsock2/configs/extensions.ael.sample
    team/group/netsock2/configs/extensions.conf.sample
    team/group/netsock2/configs/extensions.lua.sample
    team/group/netsock2/configs/features.conf.sample
    team/group/netsock2/configs/manager.conf.sample
    team/group/netsock2/configs/phoneprov.conf.sample
    team/group/netsock2/configs/queues.conf.sample
    team/group/netsock2/configs/res_odbc.conf.sample
    team/group/netsock2/configs/rtp.conf.sample
    team/group/netsock2/configs/sip.conf.sample
    team/group/netsock2/configs/sip_notify.conf.sample
    team/group/netsock2/configs/skinny.conf.sample
    team/group/netsock2/configs/smdi.conf.sample
    team/group/netsock2/configs/voicemail.conf.sample
    team/group/netsock2/configs/vpb.conf.sample
    team/group/netsock2/configs/zapata.conf.sample
    team/group/netsock2/configure
    team/group/netsock2/configure.ac
    team/group/netsock2/contrib/init.d/rc.debian.asterisk
    team/group/netsock2/contrib/init.d/rc.suse.asterisk
    team/group/netsock2/contrib/scripts/astgenkey.8
    team/group/netsock2/contrib/scripts/autosupport
    team/group/netsock2/contrib/scripts/iax-friends.sql
    team/group/netsock2/contrib/scripts/sip-friends.sql
    team/group/netsock2/doc/CODING-GUIDELINES
    team/group/netsock2/doc/externalivr.txt
    team/group/netsock2/doc/manager_1_1.txt
    team/group/netsock2/doc/smdi.txt
    team/group/netsock2/doc/snmp.txt
    team/group/netsock2/doc/tex/channelvariables.tex
    team/group/netsock2/doc/tex/imapstorage.tex
    team/group/netsock2/doc/tex/phoneprov.tex
    team/group/netsock2/doc/tex/realtime.tex
    team/group/netsock2/doc/valgrind.txt
    team/group/netsock2/doc/voicemail_odbc_postgresql.txt
    team/group/netsock2/formats/format_pcm.c
    team/group/netsock2/formats/format_wav.c
    team/group/netsock2/formats/format_wav_gsm.c
    team/group/netsock2/funcs/func_cdr.c
    team/group/netsock2/funcs/func_channel.c
    team/group/netsock2/funcs/func_cut.c
    team/group/netsock2/funcs/func_devstate.c
    team/group/netsock2/funcs/func_enum.c
    team/group/netsock2/funcs/func_global.c
    team/group/netsock2/funcs/func_odbc.c
    team/group/netsock2/funcs/func_realtime.c
    team/group/netsock2/funcs/func_strings.c
    team/group/netsock2/funcs/func_version.c
    team/group/netsock2/include/asterisk/   (props changed)
    team/group/netsock2/include/asterisk/_private.h
    team/group/netsock2/include/asterisk/ael_structs.h
    team/group/netsock2/include/asterisk/aes.h
    team/group/netsock2/include/asterisk/app.h
    team/group/netsock2/include/asterisk/astmm.h
    team/group/netsock2/include/asterisk/astobj.h
    team/group/netsock2/include/asterisk/audiohook.h
    team/group/netsock2/include/asterisk/autoconfig.h.in
    team/group/netsock2/include/asterisk/cdr.h
    team/group/netsock2/include/asterisk/channel.h
    team/group/netsock2/include/asterisk/config.h
    team/group/netsock2/include/asterisk/dial.h
    team/group/netsock2/include/asterisk/dnsmgr.h
    team/group/netsock2/include/asterisk/dsp.h
    team/group/netsock2/include/asterisk/event.h
    team/group/netsock2/include/asterisk/extconf.h
    team/group/netsock2/include/asterisk/features.h
    team/group/netsock2/include/asterisk/frame.h
    team/group/netsock2/include/asterisk/global_datastores.h
    team/group/netsock2/include/asterisk/http.h
    team/group/netsock2/include/asterisk/jabber.h
    team/group/netsock2/include/asterisk/linkedlists.h
    team/group/netsock2/include/asterisk/lock.h
    team/group/netsock2/include/asterisk/manager.h
    team/group/netsock2/include/asterisk/mod_format.h
    team/group/netsock2/include/asterisk/module.h
    team/group/netsock2/include/asterisk/netsock.h
    team/group/netsock2/include/asterisk/options.h
    team/group/netsock2/include/asterisk/pbx.h
    team/group/netsock2/include/asterisk/pval.h
    team/group/netsock2/include/asterisk/res_odbc.h
    team/group/netsock2/include/asterisk/rtp.h
    team/group/netsock2/include/asterisk/sched.h
    team/group/netsock2/include/asterisk/slinfactory.h
    team/group/netsock2/include/asterisk/smdi.h
    team/group/netsock2/include/asterisk/strings.h
    team/group/netsock2/include/asterisk/time.h
    team/group/netsock2/include/asterisk/translate.h
    team/group/netsock2/include/asterisk/udptl.h
    team/group/netsock2/include/asterisk/utils.h
    team/group/netsock2/include/jitterbuf.h
    team/group/netsock2/main/Makefile
    team/group/netsock2/main/abstract_jb.c
    team/group/netsock2/main/acl.c
    team/group/netsock2/main/alaw.c
    team/group/netsock2/main/app.c
    team/group/netsock2/main/ast_expr2.c
    team/group/netsock2/main/ast_expr2.h
    team/group/netsock2/main/ast_expr2.y
    team/group/netsock2/main/ast_expr2f.c
    team/group/netsock2/main/asterisk.c
    team/group/netsock2/main/astmm.c
    team/group/netsock2/main/astobj2.c
    team/group/netsock2/main/audiohook.c
    team/group/netsock2/main/autoservice.c
    team/group/netsock2/main/callerid.c
    team/group/netsock2/main/cdr.c
    team/group/netsock2/main/channel.c
    team/group/netsock2/main/cli.c
    team/group/netsock2/main/config.c
    team/group/netsock2/main/cryptostub.c
    team/group/netsock2/main/dial.c
    team/group/netsock2/main/dlfcn.c
    team/group/netsock2/main/dns.c
    team/group/netsock2/main/dnsmgr.c
    team/group/netsock2/main/dsp.c
    team/group/netsock2/main/editline/Makefile.in
    team/group/netsock2/main/editline/readline.c
    team/group/netsock2/main/enum.c
    team/group/netsock2/main/event.c
    team/group/netsock2/main/file.c
    team/group/netsock2/main/frame.c
    team/group/netsock2/main/fskmodem.c
    team/group/netsock2/main/global_datastores.c
    team/group/netsock2/main/hashtab.c
    team/group/netsock2/main/http.c
    team/group/netsock2/main/image.c
    team/group/netsock2/main/indications.c
    team/group/netsock2/main/jitterbuf.c
    team/group/netsock2/main/loader.c
    team/group/netsock2/main/logger.c
    team/group/netsock2/main/manager.c
    team/group/netsock2/main/netsock.c
    team/group/netsock2/main/pbx.c
    team/group/netsock2/main/poll.c
    team/group/netsock2/main/rtp.c
    team/group/netsock2/main/say.c
    team/group/netsock2/main/slinfactory.c
    team/group/netsock2/main/stdtime/localtime.c
    team/group/netsock2/main/strcompat.c
    team/group/netsock2/main/tdd.c
    team/group/netsock2/main/term.c
    team/group/netsock2/main/translate.c
    team/group/netsock2/main/udptl.c
    team/group/netsock2/main/utils.c
    team/group/netsock2/makeopts.in
    team/group/netsock2/pbx/pbx_ael.c
    team/group/netsock2/pbx/pbx_config.c
    team/group/netsock2/pbx/pbx_dundi.c
    team/group/netsock2/phoneprov/000000000000-directory.xml
    team/group/netsock2/phoneprov/polycom.xml
    team/group/netsock2/res/Makefile
    team/group/netsock2/res/ael/ael.flex
    team/group/netsock2/res/ael/ael.tab.c
    team/group/netsock2/res/ael/ael.tab.h
    team/group/netsock2/res/ael/ael.y
    team/group/netsock2/res/ael/ael_lex.c
    team/group/netsock2/res/ael/pval.c
    team/group/netsock2/res/res_agi.c
    team/group/netsock2/res/res_clioriginate.c
    team/group/netsock2/res/res_config_odbc.c
    team/group/netsock2/res/res_config_pgsql.c
    team/group/netsock2/res/res_config_sqlite.c
    team/group/netsock2/res/res_indications.c
    team/group/netsock2/res/res_jabber.c
    team/group/netsock2/res/res_monitor.c
    team/group/netsock2/res/res_musiconhold.c
    team/group/netsock2/res/res_odbc.c
    team/group/netsock2/res/res_phoneprov.c
    team/group/netsock2/res/res_realtime.c
    team/group/netsock2/res/res_smdi.c
    team/group/netsock2/res/snmp/agent.c
    team/group/netsock2/sounds/Makefile
    team/group/netsock2/sounds/sounds.xml
    team/group/netsock2/utils/Makefile
    team/group/netsock2/utils/ael_main.c
    team/group/netsock2/utils/astcanary.c
    team/group/netsock2/utils/astman.c
    team/group/netsock2/utils/check_expr.c
    team/group/netsock2/utils/conf2ael.c
    team/group/netsock2/utils/extconf.c
    team/group/netsock2/utils/frame.c
    team/group/netsock2/utils/muted.c

Propchange: team/group/netsock2/
------------------------------------------------------------------------------
    automerge = *

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

Propchange: team/group/netsock2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/netsock2/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Thu Apr 10 15:24:27 2008
@@ -1,1 +1,1 @@
-menuselect https://origsvn.digium.com/svn/menuselect/branches/1.0
+menuselect https://origsvn.digium.com/svn/menuselect/trunk

Propchange: team/group/netsock2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Apr 10 15:24:27 2008
@@ -23,3 +23,4 @@
 autom4te.cache
 makeopts.embed_rules
 aclocal.m4
+update.log

Propchange: team/group/netsock2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 10 15:24:27 2008
@@ -1,1 +1,1 @@
-/trunk:1-98899
+/trunk:1-114044

Modified: team/group/netsock2/.cleancount
URL: http://svn.digium.com/view/asterisk/team/group/netsock2/.cleancount?view=diff&rev=114048&r1=114047&r2=114048
==============================================================================
--- team/group/netsock2/.cleancount (original)
+++ team/group/netsock2/.cleancount Thu Apr 10 15:24:27 2008
@@ -1,1 +1,1 @@
-33
+35

Modified: team/group/netsock2/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/netsock2/CHANGES?view=diff&rev=114048&r1=114047&r2=114048
==============================================================================
--- team/group/netsock2/CHANGES (original)
+++ team/group/netsock2/CHANGES Thu Apr 10 15:24:27 2008
@@ -1,6 +1,59 @@
 ------------------------------------------------------------------------------
---- Functionality changes since Asterisk 1.4-beta was branched ----------------
--------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 1.6.0 to Asterisk 1.6.1  -------------
+------------------------------------------------------------------------------
+
+Dialplan Functions
+------------------
+ * Added a new dialplan function, AST_CONFIG(), which allows you to access
+   variables from an Asterisk configuration file.
+
+Zaptel channel driver (chan_zap) Changes
+----------------------------------------
+ * Channels can now be configured using named sections in zapata.conf, just
+   like other channel drivers, including the use of templates.
+
+PBX Changes
+-----------
+ * It is now possible to specify a pattern match as a hint. Once a phone subscribes
+   to something that matches the pattern a hint will be created using the contents
+   and variables evaluated.
+
+Application Changes
+-------------------
+ * Directory now permits both first and last names to be matched at the same
+   time.  In addition, the number of digits to enter of the name can be set in
+   the arguments to Directory; previously, you could enter only 3, regardless
+   of how many names are in your company.  For large companies, this should be
+   quite helpful.
+ * Voicemail now permits a mailbox setting to wrap around from first to last
+   messages, if the "messagewrap" option is set to a true value.
+ * Dial has a new option: F(context^extension^pri), which permits a callee to
+   continue in the dialplan, at the specified label, if the caller hangs up.
+
+SIP Changes
+-----------
+ * The ATTENDED_TRANSFER_COMPLETE_SOUND can now be set using setvar to cause a given
+   audio file to be played upon completion of an attended transfer.
+ * Added DNS manager support to registrations for peers referencing peer entries.
+
+IAX Changes
+-----------
+ * Existing DNS manager lookups extended to check for SRV records.
+
+CLI Changes
+-----------
+  * New CLI command, "config reload <file.conf>" which reloads any module that
+     references that particular configuration file.  Also added "config list"
+     which shows which configuration files are in use.
+
+DNS manager changes
+-------------------
+  * Addresses managed by DNS manager now can check to see if there is a DNS
+    SRV record for a given domain and will use that hostname/port if present.
+
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 1.4.X to Asterisk 1.6.0  -------------
+------------------------------------------------------------------------------
 
 AMI - The manager (TCP/TLS/HTTP)
 --------------------------------
@@ -39,6 +92,20 @@
      Reporting privilege, instead of only under Call or System.
   * The IAX* commands now require either System or Reporting privilege, to
      mirror the privileges of the SIP* commands.
+  * Added ability to retrieve list of categories in a config file.
+  * Added ability to retrieve the content of a particular category.
+  * Added ability to empty a context.
+  * Created new action to create a new file.
+  * Updated delete action to allow deletion by line number with respect to category.
+  * Added new action insert to add new variable to category at specified line.
+  * Updated action newcat to allow new category to be inserted in file above another
+    existing category.
+  * Added new event "JitterBufStats" in the IAX2 channel
+  * Originate now requires the Originate privilege and, if you want to call out
+    to a subshell, it requires the System privilege, as well.  This was done to
+    enhance manager security.
+  * New command: Atxfer. See doc/manager_1_1.txt for more details or 
+    manager show command Atxfer from the CLI
 
 Dialplan functions
 ------------------
@@ -66,6 +133,10 @@
      the existence of a dialplan target.
   * Added two new dialplan functions, TOUPPER and TOLOWER, which convert a string to
      upper and lower case, respectively.
+  * When bridging, Asterisk sets the BRIDGEPVTCALLID to the channel drivers unique
+     ID for the call (not the Asterisk call ID or unique ID), provided that the
+     channel driver supports this. For SIP, you get the SIP call-ID for the
+     bridged channel which you can store in the CDR with a custom field.
 
 CLI Changes
 -----------
@@ -79,6 +150,11 @@
      output to make debugging on busy systems much easier.
   * New CLI commands "dialplan set extenpatternmatching true/false"
   * New CLI command: "core set chanvar" to set a channel variable from the CLI.
+  * Added an easy way to execute Asterisk CLI commands at startup.  Any commands
+    listed in the startup_commands section of cli.conf will get executed.
+  * Added a CLI command, "devstate change", which allows you to set custom device
+     states from the func_devstate module that provides the DEVICE_STATE() function
+     and handling of the "Custom:" devices.
 
 SIP changes
 -----------
@@ -125,6 +201,14 @@
      SIP uri.
   * Added a new global and per-peer option, qualifyfreq, which allows you to configure
      the qualify frequency.
+  * Added SIP Session Timers support (RFC 4028).  This prevents stuck SIP sessions that
+     were not properly torn down due to network or endpoint failures during an established
+     SIP session.
+  * Added experimental TCP and TLS support for SIP.  See doc/siptls.txt and 
+     configs/sip.conf.sample for more information on how it is used.
+  * Added a new configuration option "authfailureevents" that enables manager events when
+    a peer can't authenticate properly. 
+  * Added DNS manager support to registrations for peers not referencing a peer entry.
 
 IAX2 changes
 ------------
@@ -148,7 +232,7 @@
   * Added separate settings for media QoS in mgcp.conf
 
 Console Channel Driver changes
--------------------
+------------------------------
   * Added experimental support for video send & receive to chan_oss.
     This requires SDL and ffmpeg/avcodec, plus Video4Linux or X11 to act as
     a video source.
@@ -258,6 +342,12 @@
      lockfile will not work, such as on SMB/CIFS mounts.
   * Added the ability to backup deleted messages, to ease recovery in the case
      that a user accidentally deletes a message, and discovers that they need it.
+  * Reworked the SMDI interface in Asterisk.  The new way to access SMDI information
+     is through the new functions, SMDI_MSG_RETRIEVE() and SMDI_MSG().  The file
+     smdi.conf can now be configured with options to map SMDI station IDs to Asterisk
+     voicemail boxes.  The SMDI interface can also poll for MWI changes when some
+     outside entity is modifying the state of the mailbox (such as IMAP storage or
+     a web interface of some kind).
 
 Queue changes
 -------------
@@ -289,6 +379,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.
+  * 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
 
 MeetMe Changes
 --------------
@@ -345,6 +438,14 @@
      direct options to the app.
   * AMD() has a new "maximum word length" option. "show application AMD" from the CLI
      for more details
+  * GotoIfTime() now may branch based on a "false" condition, like other Goto-related applications
+  * The ChannelRedirect application no longer exits the dialplan if the given channel
+     does not exist. It will now set the CHANNELREDIRECT_STATUS variable to SUCCESS upon success
+     or NOCHANNEL if the given channel was not found.
+  * The silencethreshold setting that was previously configurable in multiple
+     applications is now settable globally via dsp.conf.
+  * Added ability to communicate over a TCP socket instead of forking a child process for the 
+    ExternalIVR application.
 
 Music On Hold Changes
 ---------------------
@@ -398,6 +499,8 @@
   * Updated the ParkedCall application to allow you to not specify a parking
      extension.  If you don't specify a parking space to pick up, it will grab
      the first one available.
+  * Added cli command 'features reload' to reload call features from features.conf
+  * Moved into core asterisk binary.
 
 Language Support Changes
 ------------------------
@@ -420,6 +523,31 @@
      rotatestrategry=rotate, to allow a limit on the number of logfiles kept
      and to ensure that the oldest log file gets deleted.
   * Added realtime support for the queue log
+
+Call Detail Records 
+-------------------
+  * The cdr_manager module has a [mappings] feature, like cdr_custom,
+    to add fields to the manager event from the CDR variables.
+  * Added cdr_adaptive_odbc, a new module that adapts to the structure of your
+     backend database CDR table.  Specifically, additional, non-standard
+     columns are supported, merely by setting the corresponding CDR variable in
+     your dialplan.  In addition, you may alias any column to another name (for
+     example, if you want the 'src' CDR variable to be column 'ANI' in the DB,
+     simply "alias src => ANI" in the configuration file).  Records may be
+     posted to more than one backend, simply by specifying multiple categories
+     in the configuration file.  And finally, you may filter which CDRs get
+     posted to each backend, by specifying a filter (which the record must
+     match) for the particular category.  Filters are additive (meaning all
+     rules must match to post that CDR).
+  * The Postgres CDR module now supports some features of the cdr_adaptive_odbc
+     module.  Specifically, you may add additional columns into the table and
+     they will be set, if you set the corresponding CDR variable name.  Also,
+     if you omit columns in your database table, they will be silently skipped
+     (but a record will still be inserted, based on what columns remain).  Note
+     that the other two features from cdr_adaptive_odbc (alias and filter) are
+     not currently supported.
+  * The ResetCDR application now has an 'e' option that re-enables a CDR if it
+     has been disabled using the NoCDR application.
 
 Miscellaneous New Modules
 -------------------------
@@ -448,6 +576,14 @@
      on as the channel's audio.  This is very useful for building custom
      vocoders or doing recording or analysis of the channel's audio in another
      application.
+  * Added a new module, res_config_curl, which permits using a HTTP POST url
+     to retrieve, create, update, and delete realtime information from a remote
+     web server.  Note that this module requires func_curl.so to be loaded for
+     backend functionality.
+  * Added a new module, res_config_ldap, which permits the use of an LDAP
+     server for realtime data access.
+  * Added support for writing and running your dialplan in lua using the pbx_lua
+     module.  See configs/extensions.lua.sample for examples of how to do this.
 
 Miscellaneous 
 -------------
@@ -457,8 +593,6 @@
   * Added maxfiles option to options section of asterisk.conf which allows you to specify
      what Asterisk should set as the maximum number of open files when it loads.
   * Added the jittertargetextra configuration option.
-  * The cdr_manager module has a [mappings] feature, like cdr_custom,
-    to add fields to the manager event from the CDR variables.
   * Added support for setting the CoS for VLAN traffic (802.1p).  See the sample
      configuration files for the IP channel drivers.  The new option is "cos".
      This information is also documented in doc/qos.tex, or the IP Quality of Service
@@ -467,8 +601,6 @@
      will now be available in the failed extension using the REASON dialplan variable.
   * Added support for reading the TOUCH_MONITOR_PREFIX channel variable.
      It allows you to configure a prefix for auto-monitor recordings.
-  * Added support for writing and running your dialplan in lua.  See
-     configs/extensions.lua.sample for examples of how to do this.
   * A new extension pattern matching algorithm, based on a trie, is introduced
      here, that could noticeably speed up mid-sized to large dialplans.
      It is NOT used by default, as duplicating the behaviour of the old pattern
@@ -480,4 +612,12 @@
   * A new option when starting a remote asterisk (rasterisk, asterisk -r) for
      specifying which socket to use to connect to the running Asterisk daemon
      (-s)
-
+  * Added logging to 'make update' command.  See update.log
+  * Added strictrtp option to rtp.conf. If enabled this will drop RTP packets that
+     do not come from the remote party.
+  * Added the 'n' option to the SpeechBackground application to tell it to not
+     answer the channel if it has not already been answered.
+  * Added a compiler flag, CHANNEL_TRACE, which permits channel tracing to be
+     turned on, via the CHANNEL(trace) dialplan function.  Could be useful for
+     dialplan debugging.
+  * iLBC source code no longer included (see UPGRADE.txt for details)

Modified: team/group/netsock2/CREDITS
URL: http://svn.digium.com/view/asterisk/team/group/netsock2/CREDITS?view=diff&rev=114048&r1=114047&r2=114048
==============================================================================
--- team/group/netsock2/CREDITS (original)
+++ team/group/netsock2/CREDITS Thu Apr 10 15:24:27 2008
@@ -16,6 +16,9 @@
 nic.at - ENUM support in Asterisk
 
 Paul Bagyenda, Digital Solutions - for initial Voicetronix driver development
+
+John Todd, TalkPlus, Inc.  and JR Richardson, Ntegrated Solutions. - for funding
+    the development of SIP Session Timers support.
 
 === WISHLIST CONTRIBUTERS ===
 Jeremy McNamara - SpeeX support
@@ -53,7 +56,7 @@
 	and sip configs.
 	anthmct(AT)yahoo.com              http://www.asterlink.com
 
-James Golovich - Innumerable contributions
+James Golovich - Innumerable contributions, including SIP TCP and TLS support.
 	You can find him and asterisk-perl at http://asterisk.gnuinter.net
 
 Andre Bierwirth - Extension hints and status
@@ -106,7 +109,9 @@
 	simon(AT)slimey.org
 
 Olle E. Johansson - SIP RFC compliance, documentation and testing, testing,
-	testing; MiniVM - the small voicemail system, many documentation
+	SIP outbound proxy support, Manager 1.1 update, SIP transfer support,
+	SIP presence support, SIP call state updates (dialog-info), 
+	MiniVM - the small voicemail system, many documentation
 	updates/corrections, and many bug fixes.
 	oej(AT)edvina.net, http://edvina.net
 
@@ -172,6 +177,17 @@
 
 Luigi Rizzo - astobj2, console_video, windows build, chan_oss cleanup,
 	and a bunch of infrastructure work (loader, new_cli, ...)
+
+Brett Bryant - digit option for musiconhold selection, ENUMQUERY and ENUMRESULT functions,
+	feature group configuration for features.conf, per-file CLI debug and verbose settings,
+	TCP and TLS support for SIP, and various bug fixes.
+	brettbryant(AT)gmail.com
+
+Sergey Tamkovich - Realtime support for MusicOnHold, store and destroy realtime methods and
+	implementations for odbc, sqlite, and pgsql realtime drivers, attended transfer updates,
+	multiple speeds for ControlPlayback, and multiple bug fixes
+	- See http://voip-info.org/users/view/sergee
+	serg(AT)voipsolutions.ru
 
 === OTHER CONTRIBUTIONS ===
 John Todd - Monkey sounds and associated teletorture prompt

Modified: team/group/netsock2/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/netsock2/Makefile?view=diff&rev=114048&r1=114047&r2=114048
==============================================================================
--- team/group/netsock2/Makefile (original)
+++ team/group/netsock2/Makefile Thu Apr 10 15:24:27 2008
@@ -57,6 +57,7 @@
 export ASTSPOOLDIR
 export ASTVARLIBDIR
 export ASTDATADIR
+export ASTDBDIR
 export ASTLOGDIR
 export ASTLIBDIR
 export ASTMANDIR
@@ -107,7 +108,9 @@
 #Uncomment this to see all build commands instead of 'quiet' output
 #NOISY_BUILD=yes
 
-ASTTOPDIR:=$(CURDIR)
+empty:=
+space:=$(empty) $(empty)
+ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
 
 # Overwite config files on "make samples"
 OVERWRITE=y
@@ -226,7 +229,7 @@
 ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
 
 ifeq ($(AST_DEVMODE),yes)
-  ASTCFLAGS+=-Werror -Wunused -Wundef $(AST_DECLARATION_AFTER_STATEMENT)
+  ASTCFLAGS+=-Werror -Wunused -Wundef $(AST_DECLARATION_AFTER_STATEMENT) -Wmissing-format-attribute -Wformat-security #-Wformat=2
 endif
 
 ifneq ($(findstring BSD,$(OSARCH)),)
@@ -275,9 +278,7 @@
 
 # XXX MALLOC_DEBUG is probably unused, Makefile.moddir_rules adds the
 #	value directly to ASTCFLAGS
-# XXX BUSYDETECT is probably useless, the only similar reference is to
-#	#ifdef BUSYDETECT in main/dsp.c
-ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
+ASTCFLAGS+=$(MALLOC_DEBUG)$(OPTIONS)
 
 MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs tests main res $(LOCAL_MOD_SUBDIRS)
 OTHER_SUBDIRS:=utils agi
@@ -349,7 +350,7 @@
 	@echo "****"
 	@exit 1
 
-menuselect.makeopts: menuselect/menuselect menuselect-tree
+menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts
 	menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
 
 $(MOD_SUBDIRS_EMBED_LDSCRIPT):
@@ -372,7 +373,7 @@
 	@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDFLAGS)

[... 68261 lines stripped ...]



More information about the asterisk-commits mailing list