[asterisk-commits] mmichelson: branch file/bridging r136826 - in /team/file/bridging: ./ apps/ b...

Fri Aug 8 13:22:59 CDT 2008

Author: mmichelson
Date: Fri Aug  8 13:22:54 2008
New Revision: 136826

URL: http://svn.digium.com/view/asterisk?view=rev&rev=136826
Log:
Resolve and reset


Added:
    team/file/bridging/apps/app_dahdibarge.c
      - copied unchanged from r136787, trunk/apps/app_dahdibarge.c
    team/file/bridging/apps/app_dahdiras.c
      - copied unchanged from r136787, trunk/apps/app_dahdiras.c
    team/file/bridging/apps/app_dahdiscan.c
      - copied unchanged from r136787, trunk/apps/app_dahdiscan.c
    team/file/bridging/apps/app_fax.c
      - copied unchanged from r136787, trunk/apps/app_fax.c
    team/file/bridging/channels/chan_dahdi.c
      - copied unchanged from r136787, trunk/channels/chan_dahdi.c
    team/file/bridging/channels/chan_phone.h
      - copied unchanged from r136787, trunk/channels/chan_phone.h
    team/file/bridging/codecs/codec_dahdi.c
      - copied unchanged from r136787, trunk/codecs/codec_dahdi.c
    team/file/bridging/configs/ais.conf.sample
      - copied unchanged from r136787, trunk/configs/ais.conf.sample
    team/file/bridging/configs/chan_dahdi.conf.sample
      - copied unchanged from r136787, trunk/configs/chan_dahdi.conf.sample
    team/file/bridging/contrib/init.d/rc.mandriva.asterisk
      - copied unchanged from r136787, trunk/contrib/init.d/rc.mandriva.asterisk
    team/file/bridging/contrib/init.d/rc.mandriva.zaptel
      - copied unchanged from r136787, trunk/contrib/init.d/rc.mandriva.zaptel
    team/file/bridging/contrib/scripts/asterisk.logrotate
      - copied unchanged from r136787, trunk/contrib/scripts/asterisk.logrotate
    team/file/bridging/doc/api-1.6.0-changes.odt
      - copied unchanged from r136787, trunk/doc/api-1.6.0-changes.odt
    team/file/bridging/doc/cli.txt
      - copied unchanged from r136787, trunk/doc/cli.txt
    team/file/bridging/doc/distributed_devstate.txt
      - copied unchanged from r136787, trunk/doc/distributed_devstate.txt
    team/file/bridging/doc/hoard.txt
      - copied unchanged from r136787, trunk/doc/hoard.txt
    team/file/bridging/doc/lang/
      - copied from r136787, trunk/doc/lang/
    team/file/bridging/doc/lang/hebrew.ods
      - copied unchanged from r136787, trunk/doc/lang/hebrew.ods
    team/file/bridging/doc/realtimetext.txt
      - copied unchanged from r136787, trunk/doc/realtimetext.txt
    team/file/bridging/doc/sip-retransmit.txt
      - copied unchanged from r136787, trunk/doc/sip-retransmit.txt
    team/file/bridging/doc/video_console.txt
      - copied unchanged from r136787, trunk/doc/video_console.txt
    team/file/bridging/include/asterisk/datastore.h
      - copied unchanged from r136787, trunk/include/asterisk/datastore.h
    team/file/bridging/include/asterisk/fskmodem_float.h
      - copied unchanged from r136787, trunk/include/asterisk/fskmodem_float.h
    team/file/bridging/include/asterisk/fskmodem_int.h
      - copied unchanged from r136787, trunk/include/asterisk/fskmodem_int.h
    team/file/bridging/include/asterisk/timing.h
      - copied unchanged from r136787, trunk/include/asterisk/timing.h
    team/file/bridging/main/datastore.c
      - copied unchanged from r136787, trunk/main/datastore.c
    team/file/bridging/main/editline/makelist.in
      - copied unchanged from r136787, trunk/main/editline/makelist.in
    team/file/bridging/main/fskmodem_float.c
      - copied unchanged from r136787, trunk/main/fskmodem_float.c
    team/file/bridging/main/fskmodem_int.c
      - copied unchanged from r136787, trunk/main/fskmodem_int.c
    team/file/bridging/main/timing.c
      - copied unchanged from r136787, trunk/main/timing.c
    team/file/bridging/res/ais/
      - copied from r136787, trunk/res/ais/
    team/file/bridging/res/ais/ais.h
      - copied unchanged from r136787, trunk/res/ais/ais.h
    team/file/bridging/res/ais/amf.c
      - copied unchanged from r136787, trunk/res/ais/amf.c
    team/file/bridging/res/ais/ckpt.c
      - copied unchanged from r136787, trunk/res/ais/ckpt.c
    team/file/bridging/res/ais/clm.c
      - copied unchanged from r136787, trunk/res/ais/clm.c
    team/file/bridging/res/ais/evt.c
      - copied unchanged from r136787, trunk/res/ais/evt.c
    team/file/bridging/res/ais/lck.c
      - copied unchanged from r136787, trunk/res/ais/lck.c
    team/file/bridging/res/res_ais.c
      - copied unchanged from r136787, trunk/res/res_ais.c
    team/file/bridging/res/res_curl.c
      - copied unchanged from r136787, trunk/res/res_curl.c
    team/file/bridging/res/res_timing_dahdi.c
      - copied unchanged from r136787, trunk/res/res_timing_dahdi.c
    team/file/bridging/res/res_timing_pthread.c
      - copied unchanged from r136787, trunk/res/res_timing_pthread.c
Removed:
    team/file/bridging/apps/app_zapbarge.c
    team/file/bridging/apps/app_zapras.c
    team/file/bridging/apps/app_zapscan.c
    team/file/bridging/channels/DialTone.h
    team/file/bridging/channels/chan_zap.c
    team/file/bridging/codecs/codec_zap.c
    team/file/bridging/configs/zapata.conf.sample
    team/file/bridging/contrib/init.d/rc.mandrake.asterisk
    team/file/bridging/contrib/init.d/rc.mandrake.zaptel
    team/file/bridging/include/asterisk/dlfcn-compat.h
    team/file/bridging/include/asterisk/libresample.h
    team/file/bridging/include/asterisk/zapata.h
    team/file/bridging/main/dlfcn.c
    team/file/bridging/main/editline/makelist
    team/file/bridging/main/libresample/
Modified:
    team/file/bridging/   (props changed)
    team/file/bridging/CHANGES
    team/file/bridging/LICENSE
    team/file/bridging/Makefile
    team/file/bridging/README
    team/file/bridging/UPGRADE.txt
    team/file/bridging/acinclude.m4
    team/file/bridging/apps/Makefile
    team/file/bridging/apps/app_adsiprog.c
    team/file/bridging/apps/app_alarmreceiver.c
    team/file/bridging/apps/app_chanisavail.c
    team/file/bridging/apps/app_channelredirect.c
    team/file/bridging/apps/app_chanspy.c
    team/file/bridging/apps/app_dial.c
    team/file/bridging/apps/app_directory.c
    team/file/bridging/apps/app_disa.c
    team/file/bridging/apps/app_exec.c
    team/file/bridging/apps/app_externalivr.c
    team/file/bridging/apps/app_festival.c
    team/file/bridging/apps/app_flash.c
    team/file/bridging/apps/app_followme.c
    team/file/bridging/apps/app_forkcdr.c
    team/file/bridging/apps/app_getcpeid.c
    team/file/bridging/apps/app_ices.c
    team/file/bridging/apps/app_image.c
    team/file/bridging/apps/app_jack.c
    team/file/bridging/apps/app_meetme.c
    team/file/bridging/apps/app_milliwatt.c
    team/file/bridging/apps/app_minivm.c
    team/file/bridging/apps/app_mp3.c
    team/file/bridging/apps/app_nbscat.c
    team/file/bridging/apps/app_page.c
    team/file/bridging/apps/app_parkandannounce.c
    team/file/bridging/apps/app_privacy.c
    team/file/bridging/apps/app_queue.c
    team/file/bridging/apps/app_rpt.c
    team/file/bridging/apps/app_senddtmf.c
    team/file/bridging/apps/app_sendtext.c
    team/file/bridging/apps/app_sms.c
    team/file/bridging/apps/app_speech_utils.c
    team/file/bridging/apps/app_stack.c
    team/file/bridging/apps/app_talkdetect.c
    team/file/bridging/apps/app_test.c
    team/file/bridging/apps/app_voicemail.c
    team/file/bridging/build_tools/cflags.xml
    team/file/bridging/build_tools/make_buildopts_h
    team/file/bridging/build_tools/make_version
    team/file/bridging/build_tools/menuselect-deps.in
    team/file/bridging/build_tools/prep_tarball
    team/file/bridging/build_tools/strip_nonapi
    team/file/bridging/cdr/cdr_adaptive_odbc.c
    team/file/bridging/cdr/cdr_csv.c
    team/file/bridging/cdr/cdr_pgsql.c
    team/file/bridging/cdr/cdr_radius.c
    team/file/bridging/cdr/cdr_tds.c
    team/file/bridging/channels/chan_agent.c
    team/file/bridging/channels/chan_alsa.c
    team/file/bridging/channels/chan_console.c
    team/file/bridging/channels/chan_features.c
    team/file/bridging/channels/chan_gtalk.c
    team/file/bridging/channels/chan_h323.c
    team/file/bridging/channels/chan_iax2.c
    team/file/bridging/channels/chan_jingle.c
    team/file/bridging/channels/chan_local.c
    team/file/bridging/channels/chan_mgcp.c
    team/file/bridging/channels/chan_misdn.c
    team/file/bridging/channels/chan_nbs.c
    team/file/bridging/channels/chan_oss.c
    team/file/bridging/channels/chan_phone.c
    team/file/bridging/channels/chan_sip.c
    team/file/bridging/channels/chan_skinny.c
    team/file/bridging/channels/chan_unistim.c
    team/file/bridging/channels/chan_usbradio.c
    team/file/bridging/channels/chan_vpb.cc
    team/file/bridging/channels/console_board.c
    team/file/bridging/channels/console_gui.c
    team/file/bridging/channels/console_video.c
    team/file/bridging/channels/console_video.h
    team/file/bridging/channels/h323/ast_h323.cxx
    team/file/bridging/channels/iax2-parser.c
    team/file/bridging/channels/iax2-provision.c
    team/file/bridging/channels/iax2.h
    team/file/bridging/channels/misdn/isdn_lib.c
    team/file/bridging/channels/misdn/isdn_lib.h
    team/file/bridging/channels/misdn_config.c
    team/file/bridging/channels/vcodecs.c
    team/file/bridging/channels/vgrabbers.c
    team/file/bridging/codecs/Makefile
    team/file/bridging/codecs/codec_a_mu.c
    team/file/bridging/codecs/codec_adpcm.c
    team/file/bridging/codecs/codec_alaw.c
    team/file/bridging/codecs/codec_g722.c
    team/file/bridging/codecs/codec_g726.c
    team/file/bridging/codecs/codec_gsm.c
    team/file/bridging/codecs/codec_ilbc.c
    team/file/bridging/codecs/codec_lpc10.c
    team/file/bridging/codecs/codec_resample.c
    team/file/bridging/codecs/codec_speex.c
    team/file/bridging/codecs/codec_ulaw.c
    team/file/bridging/configs/agents.conf.sample
    team/file/bridging/configs/dundi.conf.sample
    team/file/bridging/configs/extensions.ael.sample
    team/file/bridging/configs/extensions.conf.sample
    team/file/bridging/configs/extensions.lua.sample
    team/file/bridging/configs/features.conf.sample
    team/file/bridging/configs/gtalk.conf.sample
    team/file/bridging/configs/http.conf.sample
    team/file/bridging/configs/iax.conf.sample
    team/file/bridging/configs/jabber.conf.sample
    team/file/bridging/configs/jingle.conf.sample
    team/file/bridging/configs/manager.conf.sample
    team/file/bridging/configs/meetme.conf.sample
    team/file/bridging/configs/misdn.conf.sample
    team/file/bridging/configs/modules.conf.sample
    team/file/bridging/configs/muted.conf.sample
    team/file/bridging/configs/queues.conf.sample
    team/file/bridging/configs/res_pgsql.conf.sample
    team/file/bridging/configs/rpt.conf.sample
    team/file/bridging/configs/sip.conf.sample
    team/file/bridging/configs/skinny.conf.sample
    team/file/bridging/configs/sla.conf.sample
    team/file/bridging/configs/smdi.conf.sample
    team/file/bridging/configs/users.conf.sample
    team/file/bridging/configs/voicemail.conf.sample
    team/file/bridging/configs/vpb.conf.sample
    team/file/bridging/configure
    team/file/bridging/configure.ac
    team/file/bridging/contrib/init.d/rc.debian.asterisk
    team/file/bridging/contrib/init.d/rc.gentoo.asterisk
    team/file/bridging/contrib/init.d/rc.redhat.asterisk
    team/file/bridging/contrib/init.d/rc.slackware.asterisk
    team/file/bridging/contrib/init.d/rc.suse.asterisk
    team/file/bridging/contrib/scripts/astcli
    team/file/bridging/contrib/scripts/asterisk.ldap-schema
    team/file/bridging/contrib/scripts/asterisk.ldif
    team/file/bridging/contrib/scripts/autosupport
    team/file/bridging/contrib/scripts/dbsep.cgi
    team/file/bridging/contrib/scripts/get_ilbc_source.sh
    team/file/bridging/contrib/scripts/loadtest.tcl
    team/file/bridging/contrib/scripts/realtime_pgsql.sql
    team/file/bridging/contrib/scripts/safe_asterisk
    team/file/bridging/contrib/utils/zones2indications.c
    team/file/bridging/doc/CODING-GUIDELINES
    team/file/bridging/doc/asterisk-mib.txt
    team/file/bridging/doc/asterisk.8
    team/file/bridging/doc/asterisk.sgml
    team/file/bridging/doc/backtrace.txt
    team/file/bridging/doc/digium-mib.txt
    team/file/bridging/doc/externalivr.txt
    team/file/bridging/doc/janitor-projects.txt
    team/file/bridging/doc/manager_1_1.txt
    team/file/bridging/doc/osp.txt
    team/file/bridging/doc/siptls.txt
    team/file/bridging/doc/sms.txt
    team/file/bridging/doc/ss7.txt
    team/file/bridging/doc/tex/Makefile
    team/file/bridging/doc/tex/ael.tex
    team/file/bridging/doc/tex/app-sms.tex
    team/file/bridging/doc/tex/asterisk-conf.tex
    team/file/bridging/doc/tex/asterisk.tex
    team/file/bridging/doc/tex/backtrace.tex
    team/file/bridging/doc/tex/channelvariables.tex
    team/file/bridging/doc/tex/cliprompt.tex
    team/file/bridging/doc/tex/configuration.tex
    team/file/bridging/doc/tex/enum.tex
    team/file/bridging/doc/tex/extensions.tex
    team/file/bridging/doc/tex/freetds.tex
    team/file/bridging/doc/tex/hardware.tex
    team/file/bridging/doc/tex/localchannel.tex
    team/file/bridging/doc/tex/manager.tex
    team/file/bridging/doc/tex/privacy.tex
    team/file/bridging/doc/tex/queuelog.tex
    team/file/bridging/doc/tex/queues-with-callback-members.tex
    team/file/bridging/doc/tex/security.tex
    team/file/bridging/doc/tex/sla.tex
    team/file/bridging/doc/video.txt
    team/file/bridging/formats/format_g723.c
    team/file/bridging/formats/format_g726.c
    team/file/bridging/formats/format_g729.c
    team/file/bridging/formats/format_gsm.c
    team/file/bridging/formats/format_h263.c
    team/file/bridging/formats/format_h264.c
    team/file/bridging/formats/format_ilbc.c
    team/file/bridging/formats/format_jpeg.c
    team/file/bridging/formats/format_ogg_vorbis.c
    team/file/bridging/formats/format_pcm.c
    team/file/bridging/formats/format_sln.c
    team/file/bridging/formats/format_sln16.c
    team/file/bridging/formats/format_vox.c
    team/file/bridging/formats/format_wav.c
    team/file/bridging/formats/format_wav_gsm.c
    team/file/bridging/formats/msgsm.h
    team/file/bridging/funcs/func_cdr.c
    team/file/bridging/funcs/func_channel.c
    team/file/bridging/funcs/func_config.c
    team/file/bridging/funcs/func_curl.c
    team/file/bridging/funcs/func_devstate.c
    team/file/bridging/funcs/func_dialgroup.c
    team/file/bridging/funcs/func_enum.c
    team/file/bridging/funcs/func_global.c
    team/file/bridging/funcs/func_lock.c
    team/file/bridging/funcs/func_odbc.c
    team/file/bridging/funcs/func_realtime.c
    team/file/bridging/funcs/func_speex.c
    team/file/bridging/funcs/func_strings.c
    team/file/bridging/funcs/func_timeout.c
    team/file/bridging/funcs/func_volume.c
    team/file/bridging/images/kpad2.jpg
    team/file/bridging/include/asterisk/_private.h
    team/file/bridging/include/asterisk/abstract_jb.h
    team/file/bridging/include/asterisk/ael_structs.h
    team/file/bridging/include/asterisk/agi.h
    team/file/bridging/include/asterisk/app.h
    team/file/bridging/include/asterisk/astobj.h
    team/file/bridging/include/asterisk/astobj2.h
    team/file/bridging/include/asterisk/autoconfig.h.in
    team/file/bridging/include/asterisk/callerid.h
    team/file/bridging/include/asterisk/causes.h
    team/file/bridging/include/asterisk/cdr.h
    team/file/bridging/include/asterisk/channel.h
    team/file/bridging/include/asterisk/compat.h
    team/file/bridging/include/asterisk/compiler.h
    team/file/bridging/include/asterisk/config.h
    team/file/bridging/include/asterisk/devicestate.h
    team/file/bridging/include/asterisk/dnsmgr.h
    team/file/bridging/include/asterisk/doxyref.h
    team/file/bridging/include/asterisk/dsp.h
    team/file/bridging/include/asterisk/dundi.h
    team/file/bridging/include/asterisk/event.h
    team/file/bridging/include/asterisk/event_defs.h
    team/file/bridging/include/asterisk/frame.h
    team/file/bridging/include/asterisk/fskmodem.h
    team/file/bridging/include/asterisk/http.h
    team/file/bridging/include/asterisk/jabber.h
    team/file/bridging/include/asterisk/jingle.h
    team/file/bridging/include/asterisk/lock.h
    team/file/bridging/include/asterisk/logger.h
    team/file/bridging/include/asterisk/manager.h
    team/file/bridging/include/asterisk/module.h
    team/file/bridging/include/asterisk/network.h
    team/file/bridging/include/asterisk/options.h
    team/file/bridging/include/asterisk/pbx.h
    team/file/bridging/include/asterisk/res_odbc.h
    team/file/bridging/include/asterisk/rtp.h
    team/file/bridging/include/asterisk/sched.h
    team/file/bridging/include/asterisk/slinfactory.h
    team/file/bridging/include/asterisk/stringfields.h
    team/file/bridging/include/asterisk/strings.h
    team/file/bridging/include/asterisk/tcptls.h
    team/file/bridging/include/asterisk/threadstorage.h
    team/file/bridging/include/asterisk/time.h
    team/file/bridging/include/asterisk/translate.h
    team/file/bridging/include/asterisk/utils.h
    team/file/bridging/main/Makefile
    team/file/bridging/main/abstract_jb.c
    team/file/bridging/main/acl.c
    team/file/bridging/main/app.c
    team/file/bridging/main/ast_expr2.fl
    team/file/bridging/main/ast_expr2f.c
    team/file/bridging/main/asterisk.c
    team/file/bridging/main/astmm.c
    team/file/bridging/main/astobj2.c
    team/file/bridging/main/audiohook.c
    team/file/bridging/main/autoservice.c
    team/file/bridging/main/callerid.c
    team/file/bridging/main/cdr.c
    team/file/bridging/main/channel.c
    team/file/bridging/main/cli.c
    team/file/bridging/main/config.c
    team/file/bridging/main/devicestate.c
    team/file/bridging/main/dial.c
    team/file/bridging/main/dns.c
    team/file/bridging/main/dnsmgr.c
    team/file/bridging/main/dsp.c
    team/file/bridging/main/editline/   (props changed)
    team/file/bridging/main/editline/Makefile.in
    team/file/bridging/main/editline/configure
    team/file/bridging/main/editline/configure.in
    team/file/bridging/main/editline/np/vis.c
    team/file/bridging/main/event.c
    team/file/bridging/main/features.c
    team/file/bridging/main/file.c
    team/file/bridging/main/fixedjitterbuf.h
    team/file/bridging/main/frame.c
    team/file/bridging/main/fskmodem.c
    team/file/bridging/main/hashtab.c
    team/file/bridging/main/http.c
    team/file/bridging/main/indications.c
    team/file/bridging/main/loader.c
    team/file/bridging/main/logger.c
    team/file/bridging/main/manager.c
    team/file/bridging/main/netsock.c
    team/file/bridging/main/pbx.c
    team/file/bridging/main/rtp.c
    team/file/bridging/main/say.c
    team/file/bridging/main/sched.c
    team/file/bridging/main/slinfactory.c
    team/file/bridging/main/srv.c
    team/file/bridging/main/taskprocessor.c
    team/file/bridging/main/tcptls.c
    team/file/bridging/main/tdd.c
    team/file/bridging/main/threadstorage.c
    team/file/bridging/main/translate.c
    team/file/bridging/main/udptl.c
    team/file/bridging/main/utils.c
    team/file/bridging/makeopts.in
    team/file/bridging/pbx/Makefile
    team/file/bridging/pbx/ael/ael-test/ref.ael-ntest10
    team/file/bridging/pbx/ael/ael-test/ref.ael-test1
    team/file/bridging/pbx/ael/ael-test/ref.ael-test15
    team/file/bridging/pbx/ael/ael-test/ref.ael-test18
    team/file/bridging/pbx/ael/ael-test/ref.ael-test19
    team/file/bridging/pbx/ael/ael-test/ref.ael-test3
    team/file/bridging/pbx/ael/ael-test/ref.ael-test5
    team/file/bridging/pbx/ael/ael-test/ref.ael-test8
    team/file/bridging/pbx/ael/ael-test/ref.ael-vtest13
    team/file/bridging/pbx/ael/ael-test/ref.ael-vtest17
    team/file/bridging/pbx/ael/ael-test/ref.ael-vtest21
    team/file/bridging/pbx/dundi-parser.c
    team/file/bridging/pbx/dundi-parser.h
    team/file/bridging/pbx/pbx_config.c
    team/file/bridging/pbx/pbx_dundi.c
    team/file/bridging/pbx/pbx_gtkconsole.c
    team/file/bridging/pbx/pbx_loopback.c
    team/file/bridging/pbx/pbx_lua.c
    team/file/bridging/pbx/pbx_realtime.c
    team/file/bridging/pbx/pbx_spool.c
    team/file/bridging/res/Makefile
    team/file/bridging/res/ael/pval.c
    team/file/bridging/res/res_adsi.c
    team/file/bridging/res/res_agi.c
    team/file/bridging/res/res_config_curl.c
    team/file/bridging/res/res_config_ldap.c
    team/file/bridging/res/res_config_odbc.c
    team/file/bridging/res/res_config_pgsql.c
    team/file/bridging/res/res_config_sqlite.c
    team/file/bridging/res/res_http_post.c
    team/file/bridging/res/res_jabber.c
    team/file/bridging/res/res_limit.c
    team/file/bridging/res/res_musiconhold.c
    team/file/bridging/res/res_odbc.c
    team/file/bridging/res/res_realtime.c
    team/file/bridging/res/res_smdi.c
    team/file/bridging/sample.call
    team/file/bridging/sounds/Makefile
    team/file/bridging/utils/Makefile
    team/file/bridging/utils/ael_main.c
    team/file/bridging/utils/astman.c
    team/file/bridging/utils/check_expr.c
    team/file/bridging/utils/conf2ael.c
    team/file/bridging/utils/extconf.c
    team/file/bridging/utils/frame.c
    team/file/bridging/utils/hashtest.c
    team/file/bridging/utils/hashtest2.c
    team/file/bridging/utils/muted.c
    team/file/bridging/utils/refcounter.c
    team/file/bridging/utils/smsq.c

Propchange: team/file/bridging/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/file/bridging/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/file/bridging/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/file/bridging/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug  8 13:22:54 2008
@@ -1,1 +1,1 @@
-/trunk:1-117369
+/trunk:1-136817

Modified: team/file/bridging/CHANGES
URL: http://svn.digium.com/view/asterisk/team/file/bridging/CHANGES?view=diff&rev=136826&r1=136825&r2=136826
==============================================================================
--- team/file/bridging/CHANGES (original)
+++ team/file/bridging/CHANGES Fri Aug  8 13:22:54 2008
@@ -1,6 +1,17 @@
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.0 to Asterisk 1.6.1  -------------
 ------------------------------------------------------------------------------
+
+Device State Handling
+---------------------
+ * The event infrastructure in Asterisk got another big update to help support
+    distributed events.  It currently supports distributed device state and
+    distributed Voicemail MWI (Message Waiting Indication).  A new module has
+    been merged, res_ais, which facilitates communicating events between servers.
+    It uses the SAForum AIS (Service Availability Forum Application Interface
+    Specification) CLM (Cluster Management) and EVT (Event) services to maintain
+    a cluster of Asterisk servers, and to share events between them.  For more
+    information on setting this up, see doc/distributed_devstate.txt.
 
 Dialplan Functions
 ------------------
@@ -17,14 +28,16 @@
  * TIMEOUT() has been modified to be accurate down to the millisecond.
  * ENUM*() functions now include the following new options:
      - 'u' returns the full URI and does not strip off the URI-scheme.
-	 - 's' triggers ISN specific rewriting
-	 - 'i' looks for branches into an Infrastructure ENUM tree
-	 - 'd' for a direct DNS lookup without any flipping of digits.
+     - 's' triggers ISN specific rewriting
+     - 'i' looks for branches into an Infrastructure ENUM tree
+     - 'd' for a direct DNS lookup without any flipping of digits.
  * TXCIDNAME() has a new zone-suffix parameter (which defaults to 'e164.arpa')
-
-Zaptel channel driver (chan_zap) Changes
+ * CHANNEL() now has options for the maximum, minimum, and standard or normal
+   deviation of jitter, rtt, and loss for a call using chan_sip.
+
+DAHDI channel driver (chan_dahdi) Changes
 ----------------------------------------
- * Channels can now be configured using named sections in zapata.conf, just
+ * Channels can now be configured using named sections in chan_dahdi.conf, just
    like other channel drivers, including the use of templates.
  * The default for pridialplan has changed from 'national' to 'unknown'.
 
@@ -72,11 +85,30 @@
    words, if using the 'd' option, it is not possible to enter a number to append to
    the first argument to Chanspy(). Pressing 4 will change to spy mode, pressing 5 will
    change to whisper mode, and pressing 6 will change to barge mode.
+ * ExternalIVR now takes several options that affect the way it performs, as
+   well as having several new commands.  Please see doc/externalivr.txt for the
+   complete documentation.
+ * ChanIsAvail has a new option, 'a', which will return all available channels instead
+   of just the first one if you give the function more then one channel to check.
+ * PrivacyManager now takes an option where you can specify a context where the 
+   given number will be matched. This way you have more control over who is allowed
+   and it stops the people who blindly enter 10 digits.
+ * ForkCDR has new options: 'a' updates the answer time on the new CDR; 'A' locks
+   answer times, disposition, on orig CDR against updates; 'D' Copies the disposition
+   from the orig CDR to the new CDR after reset; 'e' sets the 'end' time on the
+   original CDR; 'R' prevents the new CDR from being reset; 's(var=val)' adds/changes
+   the 'var' variable on the original CDR; 'T' forces ast_cdr_end(), ast_cdr_answer(),
+   obey the LOCKED flag on cdr's in the chain, and also the ast_cdr_setvar() func.
+ * The Dial() application no longer copies the language used by the caller to the callee's
+   channel. If you desire for the caller's channel's language to be used for file playback
+   to the callee, then the file specified may be prepended with "${CHANNEL(language)}/" .
+ * SendImage() no longer hangs up the channel on error; instead, it sets the
+   status variable SENDIMAGESTATUS to one of 'SUCCESS', 'FAILURE', or
+   'UNSUPPORTED'.  This change makes SendImage() more consistent with other
+   applications.
 
 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.
    DNS manager runs in the background which allows DNS lookups to be run asynchronously 
    as well as periodically updating the IP address. These properties allow for
@@ -92,10 +124,23 @@
    the register line.
  * Added support for T140 RED - redundancy in T.140 to prevent text loss due to
    lost packets.
+ * Added t38pt_usertpsource option. See sip.conf.sample for details.
+ * Added SIPnotify AMI command, for sending arbitrary SIP notify commands.
+ * 'sip show peers' and 'sip show users' display their entries sorted in
+    alphabetical order, as opposed to the order they were in, in the config 
+    file or database. 
+ * Videosupport now supports an additional option, "always", which always sets
+    up video RTP ports, even on clients that don't support it.  This helps with
+    callfiles and certain transfers to ensure that if two video phones are
+    connected, they will always share video feeds.
 
 IAX Changes
 -----------
  * Existing DNS manager lookups extended to check for SRV records.
+ * IAX2 encryption support has been improved to support periodic key rotation
+   within a call for enhanced security.  The option "keyrotate" has been
+   provided to disable this functionality to preserve backwards compatibility
+   with older versions of IAX2 that do not support key rotation.
 
 CLI Changes
 -----------
@@ -104,9 +149,14 @@
      which shows which configuration files are in use.
   * New CLI commands, "pri show version" and "ss7 show version" that will
      display which version of libpri and libss7 are being used, respectively.
-	 A new API call was added so trunk will now have to be compiled against
-	 a versions of libpri and libss7 that have them or it will not know that
-	 these libraries exist.
+     A new API call was added so trunk will now have to be compiled against
+     a versions of libpri and libss7 that have them or it will not know that
+     these libraries exist.
+  * The commands "core show globals", "core set global" and "core set chanvar" has
+     been deprecated in favor of the more semanticly correct "dialplan show globals",
+     "dialplan set chanvar" and "dialplan set global".
+  * New CLI command "dialplan show chanvar" to list all variables associated
+    with a given channel.
 
 DNS manager changes
 -------------------
@@ -123,6 +173,36 @@
   * res_odbc no longer has a limit of 1023 total possible unshared connections,
     as some people were running into this limit.  This limit has been increased
     to 4.2 billion.
+
+Queue changes
+-------------
+  * The TRANSFER queue log entry now includes the the caller's original
+    position in the transferred-from queue.
+  * 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
+
+Realtime changes
+----------------
+  * Several (ODBC, Postgres, MySQL, SQLite) realtime drivers have been given
+    adaptive capabilities.  What this means in practical terms is that if your
+    realtime table lacks critical fields, Asterisk will now emit warnings to
+    that effect.  Also, some of the realtime drivers have the ability (if
+    configured) to automatically add those columns to the table with the
+    correct type and length.
+
+Miscellaneous
+-------------
+  * The channel variable ATTENDED_TRANSFER_COMPLETE_SOUND can now be set using
+    the 'setvar' option to cause a given audio file to be played upon completion
+    of an attended transfer.  Currently it works for DAHDI, IAX2, SIP, and
+    Skinny channels only.
+  * You can now compile Asterisk against the Hoard Memory Allocator, see doc/hoard.txt
+    for more information.
+  * Config file variables may now be appended to, by using the '+=' append
+    operator.  This is most helpful when working with long SQL queries in
+    func_odbc.conf, as the queries no longer need to be specified on a single
+    line.
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.4.X to Asterisk 1.6.0  -------------
@@ -339,28 +419,35 @@
      that is behind it when queried. This is useful for transfer scenarios as the
      actual channel will be transferred, not the Local channel.
 
-Zaptel channel driver (chan_zap) Changes
+Agent channel changes
+----------------------
+  * The ackcall and endcall options are now supplemented with options acceptdtmf
+    and enddtmf. These allow for the DTMF keypress to be configurable. The options
+	default to their old hard-coded values ('#' and '*' respectively) so this should
+	not break any existing agent installations.
+
+DAHDI channel driver (chan_dahdi) Changes
 ----------------------------------------
-  * SS7 support in chan_zap (via libss7 library)
+  * SS7 support (via libss7 library)
   * In India, some carriers transmit CID via dtmf. Some code has been added
      that will handle some situations. The cidstart=polarity_IN choice has been added for
      those carriers that transmit CID via dtmf after a polarity change.
   * CID matching information is now shown when doing 'dialplan show'.
-  * Added zap show version CLI command to chan_zap.
-  * Added setvar support to zapata.conf channel entries.
+  * Added dahdi show version CLI command.
+  * Added setvar support to chan_dahdi.conf channel entries.
   * Added two new options: mwimonitor and mwimonitornotify.  These options allow
      you to enable MWI monitoring on FXO lines.  When the MWI state changes,
      the script specified in the mwimonitornotify option is executed.  An internal
      event indicating the new state of the mailbox is also generated, so that
      the normal MWI facilities in Asterisk work as usual.
   * Added signalling type 'auto', which attempts to use the same signalling type
-     for a channel as configured in Zaptel. This is primarily designed for analog
+     for a channel as configured in DAHDI. This is primarily designed for analog
      ports, but will also work for digital ports that are configured for FXS or FXO
-     signalling types. This mode is also the default now, so if your zapata.conf
+     signalling types. This mode is also the default now, so if your chan_dahdi.conf
      does not specify signalling for a channel (which is unlikely as the sample
      configuration file has always recommended specifying it for every channel) then
      the 'auto' mode will be used for that channel if possible.
-  * Added a 'zap set dnd' command to allow CLI control of the Do-Not-Disturb
+  * Added a 'dahdi set dnd' command to allow CLI control of the Do-Not-Disturb
      state for a channel; also ensured that the DNDState Manager event is
      emitted no matter how the DND state is set or cleared.
 
@@ -431,10 +518,10 @@
      a web interface of some kind).
   * Added the support for marking messages as "urgent." There are two methods to accomplish
      this. One is to pass the 'U' option to VoiceMail(). Another way to mark a message as urgent
-	 is to specify "review=yes" in voicemail.conf. Doing this will cause allow the user to mark
-	 the message as urgent after he has recorded a voicemail by following the voice instructions.
-	When listening to voicemails using VoiceMailMain urgent messages will be presented before other
-	 messages
+     is to specify "review=yes" in voicemail.conf. Doing this will cause allow the user to mark
+     the message as urgent after he has recorded a voicemail by following the voice instructions.
+    When listening to voicemails using VoiceMailMain urgent messages will be presented before other
+     messages
 
 Queue changes
 -------------
@@ -468,13 +555,18 @@
     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
+    to play a periodic announcment
   * New configuration options: announce-position now takes two more values in addition to "yes" and
     "no." Two new options, "limit" and "more," are allowed. These are tied to another option,
-	announce-position-limit. By setting announce-position to "limit" callers will only have their
-	position announced if their position is less than what is specified by announce-position-limit.
-	If announce-position is set to "more" then callers beyond the position specified by announce-position-limit
-	will be told that their are more than announce-position-limit callers waiting.
+    announce-position-limit. By setting announce-position to "limit" callers will only have their
+    position announced if their position is less than what is specified by announce-position-limit.
+    If announce-position is set to "more" then callers beyond the position specified by announce-position-limit
+    will be told that their are more than announce-position-limit callers waiting.
+  * Two new queue log events have been added. An ADDMEMBER event will be logged
+    when a realtime queue member is added and a REMOVEMEMBER event will be logged
+    when a realtime queue member is removed. Since there is no calling channel associated
+    with these events, the string "REALTIME" is placed where the channel's unique id
+    is typically placed.
 
 MeetMe Changes
 --------------
@@ -617,6 +709,9 @@
 -----------
   * Added SPEECH commands for speech recognition. A complete listing can be found
      using agi show.
+  * If app_stack is loaded, GOSUB is a native AGI command that may be used to
+    invoke subroutines in the dialplan.  Note that calling EXEC with Gosub
+    does not behave as expected; the native command needs to be used, instead.
 
 Logger changes
 --------------
@@ -739,3 +834,17 @@
      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)
+  * If compiled with DETECT_DEADLOCKS enabled and if you have glibc, then if 
+     deadlock is detected, a backtrace of the stack which led to the lock calls
+     will be output to the CLI.
+  * If compiled with DEBUG_THREADS enabled and if you have glibc, then issuing
+     the "core show locks" CLI command will give lock information output as well
+     as a backtrace of the stack which led to the lock calls.
+  * users.conf now sports an optional alternateexts property, which permits
+    allocation of additional extensions which will reach the specified user.
+  * A new option for the configure script, --enable-internal-poll, has been added
+    for use with systems which may have a buggy implementation of the poll system
+	call. If you notice odd behavior such as the CLI being unresponsive on remote
+	consoles, you may want to try using this option. This option is enabled by default
+	on Darwin systems since it is known that the Darwin poll() implementation has
+	odd issues.

Modified: team/file/bridging/LICENSE
URL: http://svn.digium.com/view/asterisk/team/file/bridging/LICENSE?view=diff&rev=136826&r1=136825&r2=136826
==============================================================================
--- team/file/bridging/LICENSE (original)
+++ team/file/bridging/LICENSE Fri Aug  8 13:22:54 2008
@@ -31,8 +31,8 @@
 GPL'd products (although if you've written a module for Asterisk we
 would strongly encourage you to make the same exception that we do).
 
-Specific permission is also granted to link Asterisk with OpenSSL and
-OpenH323 and distribute the resulting binary files.
+Specific permission is also granted to link Asterisk with OpenSSL, OpenH323
+and/or the UW IMAP Toolkit and distribute the resulting binary files.
 
 In addition, Asterisk implements two management/control protocols: the
 Asterisk Manager Interface (AMI) and the Asterisk Gateway Interface
@@ -60,7 +60,7 @@
 +1.877.344.4861 (via telephone in the USA)
 +1.256.428.6000 (via telephone outside the USA)
 +1.256.864.0464 (via FAX inside or outside the USA)
-IAX2/misery.digium.com/6000 (via IAX2)
+IAX2/pbx.digium.com (via IAX2)
 licensing at digium.com (via email)
 
 Digium, Inc.

Modified: team/file/bridging/Makefile
URL: http://svn.digium.com/view/asterisk/team/file/bridging/Makefile?view=diff&rev=136826&r1=136825&r2=136826
==============================================================================
--- team/file/bridging/Makefile (original)
+++ team/file/bridging/Makefile Fri Aug  8 13:22:54 2008
@@ -73,12 +73,12 @@
 export NOISY_BUILD		# Used in Makefile.rules
 export MENUSELECT_CFLAGS	# Options selected in menuselect.
 export AST_DEVMODE		# Set to "yes" for additional compiler
-				# and runtime checks
+                                # and runtime checks
 
 export SOLINK			# linker flags for shared objects
 export STATIC_BUILD		# Additional cflags, set to -static
-				# for static builds. Probably
-				# should go directly to ASTLDFLAGS
+                                # for static builds. Probably
+                                # should go directly to ASTLDFLAGS
 
 #--- paths to various commands
 export CC
@@ -221,10 +221,16 @@
 endif
 
 ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
-ASTCFLAGS+=-pipe
-endif
-
-ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)

[... 62778 lines stripped ...]

