[svn-commits] oej: branch oej/pinetree-trunk r274905 - in /team/oej/pinetree-trunk: ./ addo...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Jul 9 07:42:12 CDT 2010
Author: oej
Date: Fri Jul 9 07:41:45 2010
New Revision: 274905
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=274905
Log:
resolving conflicts, resetting branch
This does not compile on OS/X, actually that's wrong. It makes GCC go to 99% of CPU
forever and ever...
Added:
team/oej/pinetree-trunk/agi/agi.xml
- copied unchanged from r243986, trunk/agi/agi.xml
team/oej/pinetree-trunk/configs/res_pktccops.conf.sample
- copied unchanged from r243986, trunk/configs/res_pktccops.conf.sample
team/oej/pinetree-trunk/contrib/upstart/asterisk.user.conf
- copied unchanged from r243986, trunk/contrib/upstart/asterisk.user.conf
team/oej/pinetree-trunk/contrib/valgrind.supp
- copied unchanged from r243986, trunk/contrib/valgrind.supp
team/oej/pinetree-trunk/doc/building_queues.txt
- copied unchanged from r243986, trunk/doc/building_queues.txt
team/oej/pinetree-trunk/doc/codec-64bit.txt
- copied unchanged from r243986, trunk/doc/codec-64bit.txt
team/oej/pinetree-trunk/doc/lang/vietnamese.ods
- copied unchanged from r243986, trunk/doc/lang/vietnamese.ods
team/oej/pinetree-trunk/include/asterisk/doxygen/architecture.h
- copied unchanged from r243986, trunk/include/asterisk/doxygen/architecture.h
team/oej/pinetree-trunk/include/asterisk/doxygen/asterisk-git-howto.h
- copied unchanged from r243986, trunk/include/asterisk/doxygen/asterisk-git-howto.h
team/oej/pinetree-trunk/include/asterisk/frame_defs.h
- copied unchanged from r243986, trunk/include/asterisk/frame_defs.h
team/oej/pinetree-trunk/include/asterisk/pktccops.h
- copied unchanged from r243986, trunk/include/asterisk/pktccops.h
team/oej/pinetree-trunk/include/asterisk/test.h
- copied unchanged from r243986, trunk/include/asterisk/test.h
team/oej/pinetree-trunk/main/asterisk.dynamics
- copied unchanged from r243986, trunk/main/asterisk.dynamics
team/oej/pinetree-trunk/main/test.c
- copied unchanged from r243986, trunk/main/test.c
team/oej/pinetree-trunk/res/res_pktccops.c
- copied unchanged from r243986, trunk/res/res_pktccops.c
team/oej/pinetree-trunk/tests/test_amihooks.c
- copied unchanged from r243986, trunk/tests/test_amihooks.c
team/oej/pinetree-trunk/tests/test_ast_format_str_reduce.c
- copied unchanged from r243986, trunk/tests/test_ast_format_str_reduce.c
team/oej/pinetree-trunk/tests/test_utils.c
- copied unchanged from r243986, trunk/tests/test_utils.c
team/oej/pinetree-trunk/utils/utils.xml
- copied unchanged from r243986, trunk/utils/utils.xml
Modified:
team/oej/pinetree-trunk/ (props changed)
team/oej/pinetree-trunk/CHANGES
team/oej/pinetree-trunk/Makefile
team/oej/pinetree-trunk/Makefile.rules
team/oej/pinetree-trunk/README
team/oej/pinetree-trunk/UPGRADE-1.6.txt (props changed)
team/oej/pinetree-trunk/UPGRADE.txt (contents, props changed)
team/oej/pinetree-trunk/addons/Makefile
team/oej/pinetree-trunk/addons/cdr_mysql.c
team/oej/pinetree-trunk/addons/chan_mobile.c
team/oej/pinetree-trunk/addons/chan_ooh323.c
team/oej/pinetree-trunk/addons/chan_ooh323.h
team/oej/pinetree-trunk/addons/format_mp3.c
team/oej/pinetree-trunk/addons/ooh323c/src/context.c
team/oej/pinetree-trunk/addons/ooh323c/src/decode.c
team/oej/pinetree-trunk/addons/ooh323c/src/dlist.c
team/oej/pinetree-trunk/addons/ooh323c/src/encode.c
team/oej/pinetree-trunk/addons/ooh323c/src/errmgmt.c
team/oej/pinetree-trunk/addons/ooh323c/src/eventHandler.c
team/oej/pinetree-trunk/addons/ooh323c/src/eventHandler.h
team/oej/pinetree-trunk/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c
team/oej/pinetree-trunk/addons/ooh323c/src/h323/H323-MESSAGESDec.c
team/oej/pinetree-trunk/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c
team/oej/pinetree-trunk/addons/ooh323c/src/memheap.c
team/oej/pinetree-trunk/addons/ooh323c/src/memheap.h
team/oej/pinetree-trunk/addons/ooh323c/src/ooCalls.c
team/oej/pinetree-trunk/addons/ooh323c/src/ooCalls.h
team/oej/pinetree-trunk/addons/ooh323c/src/ooCapability.c
team/oej/pinetree-trunk/addons/ooh323c/src/ooCapability.h
team/oej/pinetree-trunk/addons/ooh323c/src/ooCmdChannel.c
team/oej/pinetree-trunk/addons/ooh323c/src/ooCmdChannel.h
team/oej/pinetree-trunk/addons/ooh323c/src/ooCommon.h
team/oej/pinetree-trunk/addons/ooh323c/src/ooDateTime.c
team/oej/pinetree-trunk/addons/ooh323c/src/ooDateTime.h
team/oej/pinetree-trunk/addons/ooh323c/src/ooGkClient.c
team/oej/pinetree-trunk/addons/ooh323c/src/ooGkClient.h
team/oej/pinetree-trunk/addons/ooh323c/src/ooLogChan.c
team/oej/pinetree-trunk/addons/ooh323c/src/ooLogChan.h
team/oej/pinetree-trunk/addons/ooh323c/src/ooSocket.c
team/oej/pinetree-trunk/addons/ooh323c/src/ooSocket.h
team/oej/pinetree-trunk/addons/ooh323c/src/ooStackCmds.c
team/oej/pinetree-trunk/addons/ooh323c/src/ooStackCmds.h
team/oej/pinetree-trunk/addons/ooh323c/src/ooTimer.c
team/oej/pinetree-trunk/addons/ooh323c/src/ooUtils.c
team/oej/pinetree-trunk/addons/ooh323c/src/ooasn1.h
team/oej/pinetree-trunk/addons/ooh323c/src/oochannels.c
team/oej/pinetree-trunk/addons/ooh323c/src/oochannels.h
team/oej/pinetree-trunk/addons/ooh323c/src/ooh245.c
team/oej/pinetree-trunk/addons/ooh323c/src/ooh245.h
team/oej/pinetree-trunk/addons/ooh323c/src/ooh323.c
team/oej/pinetree-trunk/addons/ooh323c/src/ooh323.h
team/oej/pinetree-trunk/addons/ooh323c/src/ooh323ep.c
team/oej/pinetree-trunk/addons/ooh323c/src/ooh323ep.h
team/oej/pinetree-trunk/addons/ooh323c/src/ooports.c
team/oej/pinetree-trunk/addons/ooh323c/src/ooq931.c
team/oej/pinetree-trunk/addons/ooh323c/src/ooq931.h
team/oej/pinetree-trunk/addons/ooh323c/src/ootrace.c
team/oej/pinetree-trunk/addons/ooh323c/src/ootrace.h
team/oej/pinetree-trunk/addons/ooh323c/src/ootypes.h
team/oej/pinetree-trunk/addons/ooh323c/src/perutil.c
team/oej/pinetree-trunk/addons/ooh323c/src/printHandler.c
team/oej/pinetree-trunk/addons/ooh323c/src/printHandler.h
team/oej/pinetree-trunk/addons/ooh323c/src/rtctype.c
team/oej/pinetree-trunk/addons/ooh323cDriver.c
team/oej/pinetree-trunk/addons/ooh323cDriver.h
team/oej/pinetree-trunk/addons/res_config_mysql.c
team/oej/pinetree-trunk/agi/Makefile
team/oej/pinetree-trunk/apps/app_alarmreceiver.c
team/oej/pinetree-trunk/apps/app_amd.c
team/oej/pinetree-trunk/apps/app_chanisavail.c
team/oej/pinetree-trunk/apps/app_chanspy.c
team/oej/pinetree-trunk/apps/app_confbridge.c
team/oej/pinetree-trunk/apps/app_controlplayback.c
team/oej/pinetree-trunk/apps/app_dahdibarge.c
team/oej/pinetree-trunk/apps/app_dial.c
team/oej/pinetree-trunk/apps/app_dictate.c
team/oej/pinetree-trunk/apps/app_directed_pickup.c
team/oej/pinetree-trunk/apps/app_directory.c
team/oej/pinetree-trunk/apps/app_disa.c
team/oej/pinetree-trunk/apps/app_echo.c
team/oej/pinetree-trunk/apps/app_externalivr.c
team/oej/pinetree-trunk/apps/app_fax.c
team/oej/pinetree-trunk/apps/app_festival.c
team/oej/pinetree-trunk/apps/app_followme.c
team/oej/pinetree-trunk/apps/app_forkcdr.c
team/oej/pinetree-trunk/apps/app_jack.c
team/oej/pinetree-trunk/apps/app_meetme.c
team/oej/pinetree-trunk/apps/app_milliwatt.c
team/oej/pinetree-trunk/apps/app_minivm.c
team/oej/pinetree-trunk/apps/app_mixmonitor.c
team/oej/pinetree-trunk/apps/app_mp3.c
team/oej/pinetree-trunk/apps/app_nbscat.c
team/oej/pinetree-trunk/apps/app_osplookup.c
team/oej/pinetree-trunk/apps/app_page.c
team/oej/pinetree-trunk/apps/app_queue.c
team/oej/pinetree-trunk/apps/app_readexten.c
team/oej/pinetree-trunk/apps/app_record.c
team/oej/pinetree-trunk/apps/app_senddtmf.c
team/oej/pinetree-trunk/apps/app_sendtext.c
team/oej/pinetree-trunk/apps/app_sms.c
team/oej/pinetree-trunk/apps/app_softhangup.c
team/oej/pinetree-trunk/apps/app_speech_utils.c
team/oej/pinetree-trunk/apps/app_stack.c
team/oej/pinetree-trunk/apps/app_talkdetect.c
team/oej/pinetree-trunk/apps/app_test.c
team/oej/pinetree-trunk/apps/app_url.c
team/oej/pinetree-trunk/apps/app_voicemail.c
team/oej/pinetree-trunk/apps/app_waitforring.c
team/oej/pinetree-trunk/apps/app_waitforsilence.c
team/oej/pinetree-trunk/bridges/bridge_softmix.c
team/oej/pinetree-trunk/build_tools/cflags-devmode.xml
team/oej/pinetree-trunk/build_tools/cflags.xml
team/oej/pinetree-trunk/build_tools/get_documentation
team/oej/pinetree-trunk/build_tools/make_version_c
team/oej/pinetree-trunk/build_tools/make_version_h
team/oej/pinetree-trunk/build_tools/menuselect-deps.in
team/oej/pinetree-trunk/cdr/cdr_adaptive_odbc.c
team/oej/pinetree-trunk/cdr/cdr_pgsql.c
team/oej/pinetree-trunk/cdr/cdr_sqlite3_custom.c
team/oej/pinetree-trunk/cdr/cdr_tds.c
team/oej/pinetree-trunk/cel/cel_adaptive_odbc.c
team/oej/pinetree-trunk/cel/cel_pgsql.c
team/oej/pinetree-trunk/cel/cel_tds.c
team/oej/pinetree-trunk/channels/chan_agent.c
team/oej/pinetree-trunk/channels/chan_alsa.c
team/oej/pinetree-trunk/channels/chan_bridge.c
team/oej/pinetree-trunk/channels/chan_console.c
team/oej/pinetree-trunk/channels/chan_dahdi.c
team/oej/pinetree-trunk/channels/chan_gtalk.c
team/oej/pinetree-trunk/channels/chan_h323.c
team/oej/pinetree-trunk/channels/chan_iax2.c
team/oej/pinetree-trunk/channels/chan_jingle.c
team/oej/pinetree-trunk/channels/chan_local.c
team/oej/pinetree-trunk/channels/chan_mgcp.c
team/oej/pinetree-trunk/channels/chan_misdn.c
team/oej/pinetree-trunk/channels/chan_multicast_rtp.c
team/oej/pinetree-trunk/channels/chan_nbs.c
team/oej/pinetree-trunk/channels/chan_oss.c
team/oej/pinetree-trunk/channels/chan_phone.c
team/oej/pinetree-trunk/channels/chan_sip.c
team/oej/pinetree-trunk/channels/chan_skinny.c
team/oej/pinetree-trunk/channels/chan_unistim.c
team/oej/pinetree-trunk/channels/chan_vpb.cc
team/oej/pinetree-trunk/channels/h323/chan_h323.h
team/oej/pinetree-trunk/channels/iax2-parser.c
team/oej/pinetree-trunk/channels/iax2-parser.h
team/oej/pinetree-trunk/channels/iax2.h
team/oej/pinetree-trunk/channels/misdn/isdn_lib.c
team/oej/pinetree-trunk/channels/misdn/isdn_lib_intern.h
team/oej/pinetree-trunk/channels/misdn_config.c
team/oej/pinetree-trunk/channels/sig_analog.c
team/oej/pinetree-trunk/channels/sig_analog.h
team/oej/pinetree-trunk/channels/sig_pri.c
team/oej/pinetree-trunk/channels/sig_pri.h
team/oej/pinetree-trunk/codecs/codec_dahdi.c
team/oej/pinetree-trunk/codecs/codec_g726.c
team/oej/pinetree-trunk/codecs/codec_ilbc.c
team/oej/pinetree-trunk/codecs/codec_ulaw.c
team/oej/pinetree-trunk/codecs/ex_adpcm.h
team/oej/pinetree-trunk/codecs/ex_alaw.h
team/oej/pinetree-trunk/codecs/ex_g722.h
team/oej/pinetree-trunk/codecs/ex_g726.h
team/oej/pinetree-trunk/codecs/ex_gsm.h
team/oej/pinetree-trunk/codecs/ex_ilbc.h
team/oej/pinetree-trunk/codecs/ex_lpc10.h
team/oej/pinetree-trunk/codecs/ex_speex.h
team/oej/pinetree-trunk/codecs/ex_ulaw.h
team/oej/pinetree-trunk/configs/alsa.conf.sample
team/oej/pinetree-trunk/configs/cdr_custom.conf.sample
team/oej/pinetree-trunk/configs/cdr_mysql.conf.sample
team/oej/pinetree-trunk/configs/cdr_pgsql.conf.sample
team/oej/pinetree-trunk/configs/chan_dahdi.conf.sample
team/oej/pinetree-trunk/configs/extensions.conf.sample
team/oej/pinetree-trunk/configs/iax.conf.sample
team/oej/pinetree-trunk/configs/jabber.conf.sample
team/oej/pinetree-trunk/configs/manager.conf.sample
team/oej/pinetree-trunk/configs/mgcp.conf.sample
team/oej/pinetree-trunk/configs/modules.conf.sample
team/oej/pinetree-trunk/configs/osp.conf.sample
team/oej/pinetree-trunk/configs/queues.conf.sample
team/oej/pinetree-trunk/configs/res_ldap.conf.sample
team/oej/pinetree-trunk/configs/res_odbc.conf.sample
team/oej/pinetree-trunk/configs/sip.conf.sample
team/oej/pinetree-trunk/configs/sip_notify.conf.sample
team/oej/pinetree-trunk/configs/udptl.conf.sample
team/oej/pinetree-trunk/configs/voicemail.conf.sample
team/oej/pinetree-trunk/configure
team/oej/pinetree-trunk/configure.ac
team/oej/pinetree-trunk/contrib/asterisk-ng-doxygen
team/oej/pinetree-trunk/contrib/init.d/rc.archlinux.asterisk
team/oej/pinetree-trunk/contrib/init.d/rc.debian.asterisk
team/oej/pinetree-trunk/contrib/init.d/rc.gentoo.asterisk
team/oej/pinetree-trunk/contrib/init.d/rc.mandriva.asterisk
team/oej/pinetree-trunk/contrib/init.d/rc.redhat.asterisk
team/oej/pinetree-trunk/contrib/init.d/rc.slackware.asterisk
team/oej/pinetree-trunk/contrib/init.d/rc.suse.asterisk
team/oej/pinetree-trunk/contrib/scripts/asterisk.ldap-schema
team/oej/pinetree-trunk/contrib/scripts/safe_asterisk
team/oej/pinetree-trunk/contrib/upstart/asterisk.upstart-0.3.9
team/oej/pinetree-trunk/doc/CODING-GUIDELINES
team/oej/pinetree-trunk/doc/asterisk.sgml
team/oej/pinetree-trunk/doc/externalivr.txt
team/oej/pinetree-trunk/doc/janitor-projects.txt
team/oej/pinetree-trunk/doc/lang/language-criteria.txt (props changed)
team/oej/pinetree-trunk/doc/tex/channelvariables.tex
team/oej/pinetree-trunk/doc/tex/imapstorage.tex
team/oej/pinetree-trunk/doc/tex/localchannel.tex
team/oej/pinetree-trunk/doc/tex/manager.tex
team/oej/pinetree-trunk/doc/valgrind.txt
team/oej/pinetree-trunk/formats/format_g723.c
team/oej/pinetree-trunk/formats/format_g726.c
team/oej/pinetree-trunk/formats/format_g729.c
team/oej/pinetree-trunk/formats/format_gsm.c
team/oej/pinetree-trunk/formats/format_h263.c
team/oej/pinetree-trunk/formats/format_h264.c
team/oej/pinetree-trunk/formats/format_ilbc.c
team/oej/pinetree-trunk/formats/format_jpeg.c
team/oej/pinetree-trunk/formats/format_ogg_vorbis.c
team/oej/pinetree-trunk/formats/format_pcm.c
team/oej/pinetree-trunk/formats/format_siren14.c
team/oej/pinetree-trunk/formats/format_siren7.c
team/oej/pinetree-trunk/formats/format_sln.c
team/oej/pinetree-trunk/formats/format_sln16.c
team/oej/pinetree-trunk/formats/format_vox.c
team/oej/pinetree-trunk/formats/format_wav.c
team/oej/pinetree-trunk/formats/format_wav_gsm.c
team/oej/pinetree-trunk/funcs/func_aes.c
team/oej/pinetree-trunk/funcs/func_audiohookinherit.c
team/oej/pinetree-trunk/funcs/func_base64.c
team/oej/pinetree-trunk/funcs/func_callerid.c
team/oej/pinetree-trunk/funcs/func_cdr.c
team/oej/pinetree-trunk/funcs/func_channel.c
team/oej/pinetree-trunk/funcs/func_connectedline.c
team/oej/pinetree-trunk/funcs/func_dialgroup.c
team/oej/pinetree-trunk/funcs/func_groupcount.c
team/oej/pinetree-trunk/funcs/func_lock.c
team/oej/pinetree-trunk/funcs/func_math.c
team/oej/pinetree-trunk/funcs/func_speex.c
team/oej/pinetree-trunk/funcs/func_strings.c
team/oej/pinetree-trunk/funcs/func_volume.c
team/oej/pinetree-trunk/include/asterisk/_private.h
team/oej/pinetree-trunk/include/asterisk/abstract_jb.h
team/oej/pinetree-trunk/include/asterisk/app.h
team/oej/pinetree-trunk/include/asterisk/astmm.h
team/oej/pinetree-trunk/include/asterisk/astobj2.h
team/oej/pinetree-trunk/include/asterisk/audiohook.h
team/oej/pinetree-trunk/include/asterisk/autoconfig.h.in
team/oej/pinetree-trunk/include/asterisk/bridging.h
team/oej/pinetree-trunk/include/asterisk/bridging_technology.h
team/oej/pinetree-trunk/include/asterisk/calendar.h
team/oej/pinetree-trunk/include/asterisk/callerid.h
team/oej/pinetree-trunk/include/asterisk/cdr.h
team/oej/pinetree-trunk/include/asterisk/cel.h
team/oej/pinetree-trunk/include/asterisk/channel.h
team/oej/pinetree-trunk/include/asterisk/compat.h
team/oej/pinetree-trunk/include/asterisk/doxygen/commits.h
team/oej/pinetree-trunk/include/asterisk/doxyref.h
team/oej/pinetree-trunk/include/asterisk/dsp.h
team/oej/pinetree-trunk/include/asterisk/event.h
team/oej/pinetree-trunk/include/asterisk/file.h
team/oej/pinetree-trunk/include/asterisk/frame.h
team/oej/pinetree-trunk/include/asterisk/http.h
team/oej/pinetree-trunk/include/asterisk/jabber.h
team/oej/pinetree-trunk/include/asterisk/linkedlists.h
team/oej/pinetree-trunk/include/asterisk/lock.h
team/oej/pinetree-trunk/include/asterisk/logger.h
team/oej/pinetree-trunk/include/asterisk/manager.h
team/oej/pinetree-trunk/include/asterisk/mod_format.h
team/oej/pinetree-trunk/include/asterisk/netsock.h
team/oej/pinetree-trunk/include/asterisk/options.h
team/oej/pinetree-trunk/include/asterisk/pbx.h
team/oej/pinetree-trunk/include/asterisk/rtp_engine.h
team/oej/pinetree-trunk/include/asterisk/security_events.h
team/oej/pinetree-trunk/include/asterisk/slin.h
team/oej/pinetree-trunk/include/asterisk/slinfactory.h
team/oej/pinetree-trunk/include/asterisk/srv.h
team/oej/pinetree-trunk/include/asterisk/stringfields.h
team/oej/pinetree-trunk/include/asterisk/strings.h
team/oej/pinetree-trunk/include/asterisk/syslog.h
team/oej/pinetree-trunk/include/asterisk/tcptls.h
team/oej/pinetree-trunk/include/asterisk/threadstorage.h
team/oej/pinetree-trunk/include/asterisk/time.h
team/oej/pinetree-trunk/include/asterisk/translate.h
team/oej/pinetree-trunk/include/asterisk/udptl.h
team/oej/pinetree-trunk/include/asterisk/unaligned.h
team/oej/pinetree-trunk/include/asterisk/utils.h
team/oej/pinetree-trunk/main/Makefile
team/oej/pinetree-trunk/main/abstract_jb.c
team/oej/pinetree-trunk/main/acl.c
team/oej/pinetree-trunk/main/app.c
team/oej/pinetree-trunk/main/ast_expr2.c
team/oej/pinetree-trunk/main/ast_expr2.fl
team/oej/pinetree-trunk/main/ast_expr2.y
team/oej/pinetree-trunk/main/ast_expr2f.c
team/oej/pinetree-trunk/main/asterisk.c
team/oej/pinetree-trunk/main/asterisk.exports
team/oej/pinetree-trunk/main/astfd.c
team/oej/pinetree-trunk/main/astobj2.c
team/oej/pinetree-trunk/main/audiohook.c
team/oej/pinetree-trunk/main/autoservice.c
team/oej/pinetree-trunk/main/bridging.c
team/oej/pinetree-trunk/main/callerid.c
team/oej/pinetree-trunk/main/cdr.c
team/oej/pinetree-trunk/main/cel.c
team/oej/pinetree-trunk/main/channel.c
team/oej/pinetree-trunk/main/cli.c
team/oej/pinetree-trunk/main/config.c
team/oej/pinetree-trunk/main/dial.c
team/oej/pinetree-trunk/main/dsp.c
team/oej/pinetree-trunk/main/editline/makelist.in (props changed)
team/oej/pinetree-trunk/main/enum.c
team/oej/pinetree-trunk/main/event.c
team/oej/pinetree-trunk/main/features.c
team/oej/pinetree-trunk/main/file.c
team/oej/pinetree-trunk/main/frame.c
team/oej/pinetree-trunk/main/http.c
team/oej/pinetree-trunk/main/indications.c
team/oej/pinetree-trunk/main/loader.c
team/oej/pinetree-trunk/main/logger.c
team/oej/pinetree-trunk/main/manager.c
team/oej/pinetree-trunk/main/netsock.c
team/oej/pinetree-trunk/main/pbx.c
team/oej/pinetree-trunk/main/poll.c
team/oej/pinetree-trunk/main/rtp_engine.c
team/oej/pinetree-trunk/main/say.c
team/oej/pinetree-trunk/main/slinfactory.c
team/oej/pinetree-trunk/main/srv.c
team/oej/pinetree-trunk/main/strcompat.c
team/oej/pinetree-trunk/main/tcptls.c
team/oej/pinetree-trunk/main/timing.c
team/oej/pinetree-trunk/main/translate.c
team/oej/pinetree-trunk/main/udptl.c
team/oej/pinetree-trunk/main/utils.c
team/oej/pinetree-trunk/makeopts.in
team/oej/pinetree-trunk/pbx/Makefile
team/oej/pinetree-trunk/pbx/pbx_config.c
team/oej/pinetree-trunk/pbx/pbx_dundi.c
team/oej/pinetree-trunk/pbx/pbx_lua.c
team/oej/pinetree-trunk/pbx/pbx_spool.c
team/oej/pinetree-trunk/res/Makefile
team/oej/pinetree-trunk/res/ael/pval.c
team/oej/pinetree-trunk/res/res_adsi.c
team/oej/pinetree-trunk/res/res_agi.c
team/oej/pinetree-trunk/res/res_calendar.c
team/oej/pinetree-trunk/res/res_calendar_caldav.c
team/oej/pinetree-trunk/res/res_calendar_exchange.c
team/oej/pinetree-trunk/res/res_calendar_icalendar.c
team/oej/pinetree-trunk/res/res_clialiases.c
team/oej/pinetree-trunk/res/res_config_ldap.c
team/oej/pinetree-trunk/res/res_config_pgsql.c
team/oej/pinetree-trunk/res/res_http_post.c
team/oej/pinetree-trunk/res/res_jabber.c
team/oej/pinetree-trunk/res/res_monitor.c
team/oej/pinetree-trunk/res/res_musiconhold.c
team/oej/pinetree-trunk/res/res_odbc.c
team/oej/pinetree-trunk/res/res_phoneprov.c
team/oej/pinetree-trunk/res/res_rtp_asterisk.c
team/oej/pinetree-trunk/res/res_rtp_multicast.c
team/oej/pinetree-trunk/res/res_smdi.c
team/oej/pinetree-trunk/res/res_timing_timerfd.c
team/oej/pinetree-trunk/res/snmp/agent.c
team/oej/pinetree-trunk/sounds/Makefile
team/oej/pinetree-trunk/static-http/prototype.js
team/oej/pinetree-trunk/tests/test_heap.c
team/oej/pinetree-trunk/tests/test_sched.c
team/oej/pinetree-trunk/tests/test_skel.c
team/oej/pinetree-trunk/tests/test_substitution.c
team/oej/pinetree-trunk/utils/Makefile
team/oej/pinetree-trunk/utils/ael_main.c
team/oej/pinetree-trunk/utils/astcanary.c
Propchange: team/oej/pinetree-trunk/
------------------------------------------------------------------------------
automerge = http://www.codename-pineapple.org/
Propchange: team/oej/pinetree-trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/oej/pinetree-trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/oej/pinetree-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jul 9 07:41:45 2010
@@ -1,1 +1,1 @@
-/trunk:1-220860
+/trunk:1-244062
Modified: team/oej/pinetree-trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinetree-trunk/CHANGES?view=diff&rev=274905&r1=274904&r2=274905
==============================================================================
--- team/oej/pinetree-trunk/CHANGES (original)
+++ team/oej/pinetree-trunk/CHANGES Fri Jul 9 07:41:45 2010
@@ -9,7 +9,7 @@
======================================================================
------------------------------------------------------------------------------
---- Functionality changes from Asterisk 1.6.2 to Asterisk 1.6.3 -------------
+--- Functionality changes from Asterisk 1.6.2 to Asterisk 1.8 ----------------
------------------------------------------------------------------------------
SIP Changes
@@ -44,6 +44,18 @@
* Slave SIP channels now set HASH(SIP_CAUSE,<slave-channel-name>) on each
response. This permits the master channel to know how each channel dialled
in a multi-channel setup resolved in an individual way.
+ * Added 'externtcpport' and 'externtlsport' options to allow custom port
+ configuration for the externip and externhost options when tcp or tls is used.
+ * Added support for message body (stored in content variable) to SIP NOTIFY message
+ accessible via AMI and CLI.
+ * Added 'media_address' configuration option which can be used to explicitly specify
+ the IP address to use in the SDP for media (audio, video, and text) streams.
+ * Added 'unsolicited_mailbox' configuration option which specifies the virtual mailbox
+ that the new/old count should be stored on if an unsolicited MWI NOTIFY message is
+ received.
+ * Added 'use_q850_reason' configuration option for generating and parsing
+ if available Reason: Q.850;cause=<cause code> header. It is implemented
+ in some gateways for better passing PRI/SS7 cause codes via SIP.
IAX2 Changes
-----------
@@ -55,30 +67,77 @@
* Added ability to preset channel variables on indicated lines with the setvar
configuration option. Also, clearvars=all resets the list of variables back
to none.
+ * PacketCable NCS 1.0 support has been added for Docsis/Eurodocsis Networks.
+ See configs/res_pktccops.conf for more information.
Applications
------------
+ * Added "ready" option to QUEUE_MEMBER counting to count free agents who's wrap-up
+ timeout has expired.
+ * Added 'R' option to app_queue. This option stops moh and indicates ringing
+ to the caller when an Agent's phone is ringing. This can be used to indicate
+ to the caller that their call is about to be picked up, which is nice when
+ one has been on hold for an extened period of time.
+ * Added .m3u support for Mp3Player application.
* Added progress option to the app_dial D() option. When progress DTMF is
present, those values are sent immediately upon receiving a PROGRESS message
regardless if the call has been answered or not.
* Added functionality to the app_dial F() option to continue with execution
at the current location when no parameters are provided.
+ * Added the 'a' option to app_dial to answer the calling channel before any
+ announcements or macros are executed.
+ * Modified app_dial to set answertime when the called channel answers even if
+ the called channel hangs up during playback of an announcement.
+ * Modified app_dial 'r' option to support an additional parameter to play an
+ indication tone from indications.conf
* Added c() option to app_chanspy. This option allows custom DTMF to be set
to cycle through the next available channel. By default this is still '*'.
* Added x() option to app_chanspy. This option allows DTMF to be set to
exit the application.
* The Voicemail application has been improved to automatically ignore messages
that only contain silence.
+ * If you set maxmsg to 0 in voicemail.conf, Voicemail will consider the
+ associated mailbox(es) to be greetings-only.
* The ChanSpy application now has the 'S' option, which makes the application
automatically exit once it hits a point where no more channels are available
to spy on.
* The ChanSpy application also now has the 'E' option, which spies on a single
channel and exits when that channel hangs up.
+ * The MeetMe application now turns on the DENOISE() function by default, for
+ each participant. In our tests, this has significantly decreased background
+ noise (especially noisy data centers).
+ * Voicemail now permits storage of secrets in a separate file, located in the
+ spool directory of each individual user. The control for this is located in
+ the "passwordlocation" option in voicemail.conf. Please see the sample
+ configuration for more information.
+ * The ChanIsAvail application now exposes the returned cause code using a separate
+ variable, AVAILCAUSECODE, instead of overwriting the device state in AVAILSTATUS.
+ * Added 'd' option to app_followme. This option disables the "Please hold"
+ announcement.
+ * Added 'y' option to app_record. This option enables a mode where any DTMF digit
+ received will terminate recording.
+ * Voicemail now supports per mailbox settings for folders when using IMAP storage.
+ Previously the folder could only be set per context, but has now been extended
+ using the imapfolder option.
+ * Voicemail now allows the pager date format to be specified separately from the
+ email date format.
+ * New applications JabberJoin, JabberLeave, and JabberSendGroup have been added
+ to allow joining, leaving, and sending text to group chats.
+ * MeetMe has a new option 'G' to play an announcement before joining a conference.
+ * Page has a new option 'A(x)' which will playback an announcement simultaneously
+ to all paged phones (and optionally excluding the caller's one using the new
+ option 'n') before the call is bridged.
+ * The 'f' option to Dial has been augmented to take an optional argument. If no
+ argument is provided, the 'f' option works as it always has. If an argument is
+ provided, then the connected party information of all outgoing channels created
+ during the Dial will be set to the argument passed to the 'f' option.
Dialplan Functions
------------------
* Added new dialplan functions CONNECTEDLINE and REDIRECTING which permits
setting various connected line and redirecting party information.
+ * CALLERID and CONNECTEDLINE dialplan functions have been extended to
+ support ISDN subaddressing.
* The CHANNEL() function now supports the "name" option.
* For DAHDI channels, the CHANNEL() dialplan function now
supports changing the channel's buffer policy (for the current
@@ -117,8 +176,16 @@
mode=multirow. If rowlimit is set, then additional rows may be retrieved
from the same query by using the name of the function which retrieved the
first row as an argument to ODBC_FETCH().
- * Added JABBER_RECEIVE, which permits receiving XMPP messages from the
- dialplan. This function returns the content of the received message.
+ * Added JABBER_RECEIVE, which permits receiving XMPP messages from the
+ dialplan. This function returns the content of the received message.
+ * Added REPLACE, which searches a given variable name for a set of characters,
+ then either replaces them with a single character or deletes them.
+ * Added PASSTHRU, which literally passes the same argument back as its return
+ value. The intent is to be able to use a literal string argument to
+ functions that currently require a variable name as an argument.
+ * HASH-associated variables now can be inherited across channel creation, by
+ prefixing the name of the hash at assignment with the appropriate number of
+ underscores, just like variables.
Dialplan Variables
------------------
@@ -128,9 +195,15 @@
Queue changes
-------------
+ * A new config option, penaltymemberslimit, has been added to queues.conf.
+ When set this option will disregard penalty settings when a queue has too
+ few members.
* A new option, 'I' has been added to both app_queue and app_dial.
By setting this option, Asterisk will not update the caller with
connected line changes or redirecting party changes when they occur.
+ * A 'relative-peroidic-announce' option has been added to queues.conf. When
+ enabled, this option will cause periodic announce times to be calculated
+ from the end of announcements rather than from the beginning.
mISDN channel driver (chan_misdn) changes
----------------------------------------
@@ -201,10 +274,34 @@
dialing the redirected-to party. You still have to set the
REDIRECTING(to-xxx,i) and the REDIRECTING(from-xxx,i) values. The call
will update the redirecting-to presentation (COLR) when it becomes available.
- * Added Reverse Charging Indication receipt & transmission (requires latest
- LibPRI).
* Added the ability to ignore calls that are not in a Multiple Subscriber
Number (MSN) list for PTMP CPE interfaces.
+ * Added dynamic range compression support for dahdi channels. It is
+ configured via the rxdrc and txdrc parameters in chan_dahdi.conf.
+ * Added support for ISDN calling and called subaddress with partial support
+ for connected line subaddress.
+ * Added support for BRI PTMP NT mode. (Requires latest LibPRI.)
+ * Added handling of received HOLD/RETRIEVE messages and the optional ability
+ to transfer a held call on disconnect similar to an analog phone.
+ * Added CallRerouting/CallDeflection support for Q.SIG, ETSI PTP, ETSI PTMP.
+ Will reroute/deflect an outgoing call when receive the message.
+ Can use the DAHDISendCallreroutingFacility to send the message for the
+ supported switches.
+ * Added standard location to add options to chan_dahdi dialing:
+ Dial(DAHDI/g1[/extension[/options]])
+ Current options:
+ K(<keypad_digits>)
+ R Reverse charging indication
+ * Added Reverse Charging Indication (Collect calls) send/receive option.
+ Send reverse charging in SETUP message with the chan_dahdi R dialing option.
+ Dial(DAHDI/g1/extension/R)
+ Access received reverse charge in SETUP message by: ${CHANNEL(reversecharge)}
+ (requires latest LibPRI)
+ * Added ability to send/receive keypad digits in the SETUP message.
+ Send keypad digits in SETUP message with the chan_dahdi K(<keypad_digits>)
+ dialing option. Dial(DAHDI/g1/[extension]/K(<keypad_digits>))
+ Access any received keypad digits in SETUP message by: ${CHANNEL(keypad_digits)}
+ (requires latest LibPRI)
Asterisk Manager Interface
--------------------------
@@ -221,6 +318,12 @@
but options with the 'tls' prefix are preferred.
* Added a MuteAudio AMI action for muting inbound and/or outbound audio
in a channel. (res_mutestream.so)
+ * The configuration file manager.conf now supports a channelvars option, which
+ specifies a list of channel variables to include in each channel-oriented
+ event.
+ * The redirect command now has new parameters ExtraContext, ExtraExtension,
+ and ExtraPriority to allow redirecting the second channel to a different
+ location than the first.
Channel Event Logging
---------------------
@@ -234,12 +337,14 @@
CDR
---
- * 'linkedid' and 'peeraccount' are new CDR fields available to CDR officianados.
+ * 'linkedid' and 'peeraccount' are new CDR fields available to CDR aficionados.
linkedid is based on uniqueID, but spreads to other channels as transfers, dials,
etc are performed. Thus the peices of CDR can be grouped into multilegged sets.
* Multiple files and formats can now be specified in cdr_custom.conf.
* cdr_syslog has been added which allows CDRs to be written directly to syslog.
See configs/cdr_syslog.conf.sample for more information.
+ * A 'sequence' field has been added to CDRs which can be combined with
+ linkedid or uniqueid to uniquely identify a CDR.
Calendaring for Asterisk
------------------------
@@ -269,8 +374,23 @@
Miscellaneous
-------------
+ * The transmit_silence_during_record option in asterisk.conf.sample has been removed.
+ Now, in order to enable transmitting silence during record the transmit_silence
+ option should be used. transmit_silence_during_record remains a valid option, but
+ defaults to the behavior of the transmit_silence option.
+ * Addition of the Unit Test Framework API for managing registration and execution
+ of unit tests with the purpose of verifying the operation of C functions.
* SendText is now implemented in chan_gtalk and chan_jingle. It will simply send
XMPP text messages to the remote JID.
+ * Modules.conf has a new option - "require" - that marks a module as critical for
+ the execution of Asterisk.
+ If one of the required modules fail to load, Asterisk will exit with a return
+ code set to 2.
+ * An 'X' option has been added to the asterisk application which enables #exec support.
+ This allows #exec to be used in asterisk.conf.
+ * jabber.conf supports a new option auth_policy that toggles auto user registration.
+ * A new lockconfdir option has been added to asterisk.conf to protect the
+ configuration directory (/etc/asterisk by default) during reloads.
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.6.1 to Asterisk 1.6.2 -------------
@@ -281,17 +401,12 @@
* Added support for SUBSCRIBE/NOTIFY with dialog-info based call pickups.
Snom phones use this for call pickup of extensions that the phone is
subscribed to.
- * Added support for subscribing to a voice mailbox on a remote server and
- making the new/old message count available to local devices.
* Added support for setting the domain in the URI for caller of an
outbound call by using the SIPFROMDOMAIN channel variable.
* Added a new configuration option "remotesecret" for authentication to
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
@@ -358,9 +473,8 @@
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 LOCAL_PEEK, which allows access to variables in any stack frame within
+ a subroutine when using the GoSub() and Return() applications.
* 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
@@ -371,8 +485,6 @@
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
@@ -392,9 +504,6 @@
-------------
* 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.
* extensions.conf now allows you to use keyword "same" to define an extension
without actually specifying an extension. It uses exactly the same pattern
as previously used on the last "exten" line. For example:
@@ -446,6 +555,20 @@
SKINNYshowdevice
SKINNYlines
SKINNYshowline
+
+LDAP Schema File Additions
+--------------------------
+ * Added AsteriskDialplan, AsteriskAccount and AsteriskMailbox objectClasses
+ to allow standalone dialplan, account and mailbox entries (STRUCTURAL)
+ * Added new Fields:
+ - AstAccountLanguage, AstAccountTransport, AstAccountPromiscRedir,
+ - AstAccountAccountCode, AstAccountSetVar, AstAccountAllowOverlap,
+ - AstAccountVideoSupport, AstAccountIgnoreSDPVersion
+ * Removed redundant IPaddr (there's already IPAddress)
+ - Gives more configuration Flags for SIP-Users available (tested)
+ - Allows to create Asterisk Attributes in defined Asterisk ObjectClasses
+ without extensibleObject (which really should be the last resort); gives
+ also additional possibilities for LDAP-filter
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.6.0 to Asterisk 1.6.1 -------------
@@ -786,6 +909,10 @@
SIP changes
-----------
+ * Added a new 'faxdetect=yes|no' configuration option to sip.conf. When this
+ option is enabled, Asterisk will watch for a CNG tone in the incoming audio
+ for a received call. If it is detected, the channel will jump to the
+ 'fax' extension in the dialplan.
* Improved NAT and STUN support.
[... 81988 lines stripped ...]
More information about the svn-commits
mailing list