[asterisk-commits] oej: branch oej/sip_spiral_7403 r64688 - in /team/oej/sip_spiral_7403: ./ agi...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Wed May 16 23:38:11 MST 2007


Author: oej
Date: Thu May 17 01:38:04 2007
New Revision: 64688

URL: http://svn.digium.com/view/asterisk?view=rev&rev=64688
Log:
Upgraded to trunk. COnflict in chan_sip find_call() function resolved (hopefully)

Added:
    team/oej/sip_spiral_7403/apps/app_minivm.c
      - copied unchanged from r64657, trunk/apps/app_minivm.c
    team/oej/sip_spiral_7403/build_tools/make_linker_eo_script
      - copied unchanged from r64657, trunk/build_tools/make_linker_eo_script
    team/oej/sip_spiral_7403/build_tools/make_sample_voicemail
      - copied unchanged from r64657, trunk/build_tools/make_sample_voicemail
    team/oej/sip_spiral_7403/cdr/cdr_sqlite3_custom.c
      - copied unchanged from r64657, trunk/cdr/cdr_sqlite3_custom.c
    team/oej/sip_spiral_7403/codecs/codec_g722.c
      - copied unchanged from r64657, trunk/codecs/codec_g722.c
    team/oej/sip_spiral_7403/codecs/g722/   (props changed)
      - copied from r64657, trunk/codecs/g722/
    team/oej/sip_spiral_7403/codecs/g722/Makefile
      - copied unchanged from r64657, trunk/codecs/g722/Makefile
    team/oej/sip_spiral_7403/codecs/g722/g722.h
      - copied unchanged from r64657, trunk/codecs/g722/g722.h
    team/oej/sip_spiral_7403/codecs/g722/g722_decode.c
      - copied unchanged from r64657, trunk/codecs/g722/g722_decode.c
    team/oej/sip_spiral_7403/codecs/g722/g722_encode.c
      - copied unchanged from r64657, trunk/codecs/g722/g722_encode.c
    team/oej/sip_spiral_7403/codecs/g722_slin_ex.h
      - copied unchanged from r64657, trunk/codecs/g722_slin_ex.h
    team/oej/sip_spiral_7403/codecs/slin_g722_ex.h
      - copied unchanged from r64657, trunk/codecs/slin_g722_ex.h
    team/oej/sip_spiral_7403/configs/cdr_sqlite3_custom.conf
      - copied unchanged from r64657, trunk/configs/cdr_sqlite3_custom.conf
    team/oej/sip_spiral_7403/configs/extensions_minivm.conf.sample
      - copied unchanged from r64657, trunk/configs/extensions_minivm.conf.sample
    team/oej/sip_spiral_7403/configs/minivm.conf.sample
      - copied unchanged from r64657, trunk/configs/minivm.conf.sample
    team/oej/sip_spiral_7403/configs/res_config_sqlite.conf
      - copied unchanged from r64657, trunk/configs/res_config_sqlite.conf
    team/oej/sip_spiral_7403/configs/res_pgsql.conf.sample
      - copied unchanged from r64657, trunk/configs/res_pgsql.conf.sample
    team/oej/sip_spiral_7403/contrib/scripts/realtime_pgsql.sql
      - copied unchanged from r64657, trunk/contrib/scripts/realtime_pgsql.sql
    team/oej/sip_spiral_7403/doc/ael.tex
      - copied unchanged from r64657, trunk/doc/ael.tex
    team/oej/sip_spiral_7403/doc/ajam.tex
      - copied unchanged from r64657, trunk/doc/ajam.tex
    team/oej/sip_spiral_7403/doc/app-sms.tex
      - copied unchanged from r64657, trunk/doc/app-sms.tex
    team/oej/sip_spiral_7403/doc/ast_appdocs.tex
      - copied unchanged from r64657, trunk/doc/ast_appdocs.tex
    team/oej/sip_spiral_7403/doc/asterisk-conf.tex
      - copied unchanged from r64657, trunk/doc/asterisk-conf.tex
    team/oej/sip_spiral_7403/doc/asterisk.tex
      - copied unchanged from r64657, trunk/doc/asterisk.tex
    team/oej/sip_spiral_7403/doc/billing.tex
      - copied unchanged from r64657, trunk/doc/billing.tex
    team/oej/sip_spiral_7403/doc/cdrdriver.tex
      - copied unchanged from r64657, trunk/doc/cdrdriver.tex
    team/oej/sip_spiral_7403/doc/chaniax.tex
      - copied unchanged from r64657, trunk/doc/chaniax.tex
    team/oej/sip_spiral_7403/doc/channelvariables.tex
      - copied unchanged from r64657, trunk/doc/channelvariables.tex
    team/oej/sip_spiral_7403/doc/cliprompt.tex
      - copied unchanged from r64657, trunk/doc/cliprompt.tex
    team/oej/sip_spiral_7403/doc/configuration.tex
      - copied unchanged from r64657, trunk/doc/configuration.tex
    team/oej/sip_spiral_7403/doc/dundi.tex
      - copied unchanged from r64657, trunk/doc/dundi.tex
    team/oej/sip_spiral_7403/doc/enum.tex
      - copied unchanged from r64657, trunk/doc/enum.tex
    team/oej/sip_spiral_7403/doc/extensions.tex
      - copied unchanged from r64657, trunk/doc/extensions.tex
    team/oej/sip_spiral_7403/doc/freetds.tex
      - copied unchanged from r64657, trunk/doc/freetds.tex
    team/oej/sip_spiral_7403/doc/hardware.tex
      - copied unchanged from r64657, trunk/doc/hardware.tex
    team/oej/sip_spiral_7403/doc/ices.tex
      - copied unchanged from r64657, trunk/doc/ices.tex
    team/oej/sip_spiral_7403/doc/imapstorage.tex
      - copied unchanged from r64657, trunk/doc/imapstorage.tex
    team/oej/sip_spiral_7403/doc/jitterbuffer.tex
      - copied unchanged from r64657, trunk/doc/jitterbuffer.tex
    team/oej/sip_spiral_7403/doc/localchannel.tex
      - copied unchanged from r64657, trunk/doc/localchannel.tex
    team/oej/sip_spiral_7403/doc/manager.tex
      - copied unchanged from r64657, trunk/doc/manager.tex
    team/oej/sip_spiral_7403/doc/misdn.tex
      - copied unchanged from r64657, trunk/doc/misdn.tex
    team/oej/sip_spiral_7403/doc/mp3.tex
      - copied unchanged from r64657, trunk/doc/mp3.tex
    team/oej/sip_spiral_7403/doc/odbcstorage.tex
      - copied unchanged from r64657, trunk/doc/odbcstorage.tex
    team/oej/sip_spiral_7403/doc/privacy.tex
      - copied unchanged from r64657, trunk/doc/privacy.tex
    team/oej/sip_spiral_7403/doc/qos.tex
      - copied unchanged from r64657, trunk/doc/qos.tex
    team/oej/sip_spiral_7403/doc/queue.txt
      - copied unchanged from r64657, trunk/doc/queue.txt
    team/oej/sip_spiral_7403/doc/queuelog.tex
      - copied unchanged from r64657, trunk/doc/queuelog.tex
    team/oej/sip_spiral_7403/doc/queues-with-callback-members.tex
      - copied unchanged from r64657, trunk/doc/queues-with-callback-members.tex
    team/oej/sip_spiral_7403/doc/realtime.tex
      - copied unchanged from r64657, trunk/doc/realtime.tex
    team/oej/sip_spiral_7403/doc/res_config_sqlite.txt
      - copied unchanged from r64657, trunk/doc/res_config_sqlite.txt
    team/oej/sip_spiral_7403/doc/security.tex
      - copied unchanged from r64657, trunk/doc/security.tex
    team/oej/sip_spiral_7403/doc/sla.tex
      - copied unchanged from r64657, trunk/doc/sla.tex
    team/oej/sip_spiral_7403/doc/voicemail_odbc_postgresql.txt
      - copied unchanged from r64657, trunk/doc/voicemail_odbc_postgresql.txt
    team/oej/sip_spiral_7403/funcs/func_devstate.c
      - copied unchanged from r64657, trunk/funcs/func_devstate.c
    team/oej/sip_spiral_7403/funcs/func_shell.c
      - copied unchanged from r64657, trunk/funcs/func_shell.c
    team/oej/sip_spiral_7403/include/asterisk/dial.h
      - copied unchanged from r64657, trunk/include/asterisk/dial.h
    team/oej/sip_spiral_7403/include/asterisk/event.h
      - copied unchanged from r64657, trunk/include/asterisk/event.h
    team/oej/sip_spiral_7403/include/asterisk/event_defs.h
      - copied unchanged from r64657, trunk/include/asterisk/event_defs.h
    team/oej/sip_spiral_7403/include/asterisk/zapata.h
      - copied unchanged from r64657, trunk/include/asterisk/zapata.h
    team/oej/sip_spiral_7403/main/dial.c
      - copied unchanged from r64657, trunk/main/dial.c
    team/oej/sip_spiral_7403/main/event.c
      - copied unchanged from r64657, trunk/main/event.c
    team/oej/sip_spiral_7403/main/minimime/   (props changed)
      - copied from r64657, trunk/main/minimime/
    team/oej/sip_spiral_7403/main/minimime/Make.conf
      - copied unchanged from r64657, trunk/main/minimime/Make.conf
    team/oej/sip_spiral_7403/main/minimime/Makefile
      - copied unchanged from r64657, trunk/main/minimime/Makefile
    team/oej/sip_spiral_7403/main/minimime/mimeparser.h
      - copied unchanged from r64657, trunk/main/minimime/mimeparser.h
    team/oej/sip_spiral_7403/main/minimime/mimeparser.l
      - copied unchanged from r64657, trunk/main/minimime/mimeparser.l
    team/oej/sip_spiral_7403/main/minimime/mimeparser.tab.c
      - copied unchanged from r64657, trunk/main/minimime/mimeparser.tab.c
    team/oej/sip_spiral_7403/main/minimime/mimeparser.tab.h
      - copied unchanged from r64657, trunk/main/minimime/mimeparser.tab.h
    team/oej/sip_spiral_7403/main/minimime/mimeparser.y
      - copied unchanged from r64657, trunk/main/minimime/mimeparser.y
    team/oej/sip_spiral_7403/main/minimime/mimeparser.yy.c
      - copied unchanged from r64657, trunk/main/minimime/mimeparser.yy.c
    team/oej/sip_spiral_7403/main/minimime/minimime.c
      - copied unchanged from r64657, trunk/main/minimime/minimime.c
    team/oej/sip_spiral_7403/main/minimime/mm.h
      - copied unchanged from r64657, trunk/main/minimime/mm.h
    team/oej/sip_spiral_7403/main/minimime/mm_base64.c
      - copied unchanged from r64657, trunk/main/minimime/mm_base64.c
    team/oej/sip_spiral_7403/main/minimime/mm_codecs.c
      - copied unchanged from r64657, trunk/main/minimime/mm_codecs.c
    team/oej/sip_spiral_7403/main/minimime/mm_contenttype.c
      - copied unchanged from r64657, trunk/main/minimime/mm_contenttype.c
    team/oej/sip_spiral_7403/main/minimime/mm_context.c
      - copied unchanged from r64657, trunk/main/minimime/mm_context.c
    team/oej/sip_spiral_7403/main/minimime/mm_envelope.c
      - copied unchanged from r64657, trunk/main/minimime/mm_envelope.c
    team/oej/sip_spiral_7403/main/minimime/mm_error.c
      - copied unchanged from r64657, trunk/main/minimime/mm_error.c
    team/oej/sip_spiral_7403/main/minimime/mm_header.c
      - copied unchanged from r64657, trunk/main/minimime/mm_header.c
    team/oej/sip_spiral_7403/main/minimime/mm_init.c
      - copied unchanged from r64657, trunk/main/minimime/mm_init.c
    team/oej/sip_spiral_7403/main/minimime/mm_internal.h
      - copied unchanged from r64657, trunk/main/minimime/mm_internal.h
    team/oej/sip_spiral_7403/main/minimime/mm_mem.c
      - copied unchanged from r64657, trunk/main/minimime/mm_mem.c
    team/oej/sip_spiral_7403/main/minimime/mm_mem.h
      - copied unchanged from r64657, trunk/main/minimime/mm_mem.h
    team/oej/sip_spiral_7403/main/minimime/mm_mimepart.c
      - copied unchanged from r64657, trunk/main/minimime/mm_mimepart.c
    team/oej/sip_spiral_7403/main/minimime/mm_mimeutil.c
      - copied unchanged from r64657, trunk/main/minimime/mm_mimeutil.c
    team/oej/sip_spiral_7403/main/minimime/mm_param.c
      - copied unchanged from r64657, trunk/main/minimime/mm_param.c
    team/oej/sip_spiral_7403/main/minimime/mm_parse.c
      - copied unchanged from r64657, trunk/main/minimime/mm_parse.c
    team/oej/sip_spiral_7403/main/minimime/mm_queue.h
      - copied unchanged from r64657, trunk/main/minimime/mm_queue.h
    team/oej/sip_spiral_7403/main/minimime/mm_util.c
      - copied unchanged from r64657, trunk/main/minimime/mm_util.c
    team/oej/sip_spiral_7403/main/minimime/mm_util.h
      - copied unchanged from r64657, trunk/main/minimime/mm_util.h
    team/oej/sip_spiral_7403/main/minimime/mm_warnings.c
      - copied unchanged from r64657, trunk/main/minimime/mm_warnings.c
    team/oej/sip_spiral_7403/main/minimime/strlcat.c
      - copied unchanged from r64657, trunk/main/minimime/strlcat.c
    team/oej/sip_spiral_7403/main/minimime/strlcpy.c
      - copied unchanged from r64657, trunk/main/minimime/strlcpy.c
    team/oej/sip_spiral_7403/main/minimime/sys/
      - copied from r64657, trunk/main/minimime/sys/
    team/oej/sip_spiral_7403/main/minimime/sys/mm_queue.h
      - copied unchanged from r64657, trunk/main/minimime/sys/mm_queue.h
    team/oej/sip_spiral_7403/main/minimime/test.sh
      - copied unchanged from r64657, trunk/main/minimime/test.sh
    team/oej/sip_spiral_7403/main/minimime/tests/
      - copied from r64657, trunk/main/minimime/tests/
    team/oej/sip_spiral_7403/main/minimime/tests/Makefile
      - copied unchanged from r64657, trunk/main/minimime/tests/Makefile
    team/oej/sip_spiral_7403/main/minimime/tests/create.c
      - copied unchanged from r64657, trunk/main/minimime/tests/create.c
    team/oej/sip_spiral_7403/main/minimime/tests/messages/
      - copied from r64657, trunk/main/minimime/tests/messages/
    team/oej/sip_spiral_7403/main/minimime/tests/messages/test1.txt
      - copied unchanged from r64657, trunk/main/minimime/tests/messages/test1.txt
    team/oej/sip_spiral_7403/main/minimime/tests/messages/test2.txt
      - copied unchanged from r64657, trunk/main/minimime/tests/messages/test2.txt
    team/oej/sip_spiral_7403/main/minimime/tests/messages/test3.txt
      - copied unchanged from r64657, trunk/main/minimime/tests/messages/test3.txt
    team/oej/sip_spiral_7403/main/minimime/tests/messages/test4.txt
      - copied unchanged from r64657, trunk/main/minimime/tests/messages/test4.txt
    team/oej/sip_spiral_7403/main/minimime/tests/messages/test5.txt
      - copied unchanged from r64657, trunk/main/minimime/tests/messages/test5.txt
    team/oej/sip_spiral_7403/main/minimime/tests/messages/test6.txt
      - copied unchanged from r64657, trunk/main/minimime/tests/messages/test6.txt
    team/oej/sip_spiral_7403/main/minimime/tests/messages/test7.txt
      - copied unchanged from r64657, trunk/main/minimime/tests/messages/test7.txt
    team/oej/sip_spiral_7403/main/minimime/tests/parse.c
      - copied unchanged from r64657, trunk/main/minimime/tests/parse.c
    team/oej/sip_spiral_7403/main/threadstorage.c
      - copied unchanged from r64657, trunk/main/threadstorage.c
    team/oej/sip_spiral_7403/pbx/ael/ael-test/ael-test18/
      - copied from r64657, trunk/pbx/ael/ael-test/ael-test18/
    team/oej/sip_spiral_7403/pbx/ael/ael-test/ael-test18/extensions.ael
      - copied unchanged from r64657, trunk/pbx/ael/ael-test/ael-test18/extensions.ael
    team/oej/sip_spiral_7403/pbx/ael/ael-test/ael-test19/
      - copied from r64657, trunk/pbx/ael/ael-test/ael-test19/
    team/oej/sip_spiral_7403/pbx/ael/ael-test/ael-test19/extensions.ael
      - copied unchanged from r64657, trunk/pbx/ael/ael-test/ael-test19/extensions.ael
    team/oej/sip_spiral_7403/pbx/ael/ael-test/ael-test20/
      - copied from r64657, trunk/pbx/ael/ael-test/ael-test20/
    team/oej/sip_spiral_7403/pbx/ael/ael-test/ael-test20/extensions.ael
      - copied unchanged from r64657, trunk/pbx/ael/ael-test/ael-test20/extensions.ael
    team/oej/sip_spiral_7403/pbx/ael/ael-test/ref.ael-test18
      - copied unchanged from r64657, trunk/pbx/ael/ael-test/ref.ael-test18
    team/oej/sip_spiral_7403/pbx/ael/ael-test/ref.ael-test19
      - copied unchanged from r64657, trunk/pbx/ael/ael-test/ref.ael-test19
    team/oej/sip_spiral_7403/pbx/ael/ael-test/ref.ael-test20
      - copied unchanged from r64657, trunk/pbx/ael/ael-test/ref.ael-test20
    team/oej/sip_spiral_7403/res/res_config_sqlite.c
      - copied unchanged from r64657, trunk/res/res_config_sqlite.c
    team/oej/sip_spiral_7403/res/res_eventtest.c
      - copied unchanged from r64657, trunk/res/res_eventtest.c
Removed:
    team/oej/sip_spiral_7403/build_tools/mkdep
    team/oej/sip_spiral_7403/doc/00README.1st
    team/oej/sip_spiral_7403/doc/ael.txt
    team/oej/sip_spiral_7403/doc/ajam.txt
    team/oej/sip_spiral_7403/doc/app-sms.txt
    team/oej/sip_spiral_7403/doc/apps.txt
    team/oej/sip_spiral_7403/doc/asterisk-conf.txt
    team/oej/sip_spiral_7403/doc/billing.txt
    team/oej/sip_spiral_7403/doc/callingpres.txt
    team/oej/sip_spiral_7403/doc/cdrdriver.txt
    team/oej/sip_spiral_7403/doc/chaniax.txt
    team/oej/sip_spiral_7403/doc/channels.txt
    team/oej/sip_spiral_7403/doc/channelvariables.txt
    team/oej/sip_spiral_7403/doc/cliprompt.txt
    team/oej/sip_spiral_7403/doc/configuration.txt
    team/oej/sip_spiral_7403/doc/cygwin.txt
    team/oej/sip_spiral_7403/doc/dundi.txt
    team/oej/sip_spiral_7403/doc/enum.txt
    team/oej/sip_spiral_7403/doc/extconfig.txt
    team/oej/sip_spiral_7403/doc/extensions.txt
    team/oej/sip_spiral_7403/doc/freetds.txt
    team/oej/sip_spiral_7403/doc/h323.txt
    team/oej/sip_spiral_7403/doc/hardware.txt
    team/oej/sip_spiral_7403/doc/iax.txt
    team/oej/sip_spiral_7403/doc/ices.txt
    team/oej/sip_spiral_7403/doc/imapstorage.txt
    team/oej/sip_spiral_7403/doc/ip-tos.txt
    team/oej/sip_spiral_7403/doc/jitterbuffer.txt
    team/oej/sip_spiral_7403/doc/localchannel.txt
    team/oej/sip_spiral_7403/doc/manager.txt
    team/oej/sip_spiral_7403/doc/math.txt
    team/oej/sip_spiral_7403/doc/misdn.txt
    team/oej/sip_spiral_7403/doc/model.txt
    team/oej/sip_spiral_7403/doc/mp3.txt
    team/oej/sip_spiral_7403/doc/musiconhold-fpm.txt
    team/oej/sip_spiral_7403/doc/mysql.txt
    team/oej/sip_spiral_7403/doc/odbcstorage.txt
    team/oej/sip_spiral_7403/doc/privacy.txt
    team/oej/sip_spiral_7403/doc/queuelog.txt
    team/oej/sip_spiral_7403/doc/queues-with-callback-members.txt
    team/oej/sip_spiral_7403/doc/radius.txt
    team/oej/sip_spiral_7403/doc/realtime.txt
    team/oej/sip_spiral_7403/doc/security.txt
Modified:
    team/oej/sip_spiral_7403/   (props changed)
    team/oej/sip_spiral_7403/.cleancount
    team/oej/sip_spiral_7403/BUGS
    team/oej/sip_spiral_7403/CHANGES
    team/oej/sip_spiral_7403/CREDITS
    team/oej/sip_spiral_7403/Makefile
    team/oej/sip_spiral_7403/Makefile.moddir_rules
    team/oej/sip_spiral_7403/Makefile.rules
    team/oej/sip_spiral_7403/UPGRADE.txt
    team/oej/sip_spiral_7403/acinclude.m4
    team/oej/sip_spiral_7403/agi/   (props changed)
    team/oej/sip_spiral_7403/agi/Makefile
    team/oej/sip_spiral_7403/apps/   (props changed)
    team/oej/sip_spiral_7403/apps/Makefile
    team/oej/sip_spiral_7403/apps/app_adsiprog.c
    team/oej/sip_spiral_7403/apps/app_amd.c
    team/oej/sip_spiral_7403/apps/app_cdr.c
    team/oej/sip_spiral_7403/apps/app_chanisavail.c
    team/oej/sip_spiral_7403/apps/app_chanspy.c
    team/oej/sip_spiral_7403/apps/app_dial.c
    team/oej/sip_spiral_7403/apps/app_dictate.c
    team/oej/sip_spiral_7403/apps/app_directory.c
    team/oej/sip_spiral_7403/apps/app_disa.c
    team/oej/sip_spiral_7403/apps/app_dumpchan.c
    team/oej/sip_spiral_7403/apps/app_echo.c
    team/oej/sip_spiral_7403/apps/app_exec.c
    team/oej/sip_spiral_7403/apps/app_externalivr.c
    team/oej/sip_spiral_7403/apps/app_festival.c
    team/oej/sip_spiral_7403/apps/app_flash.c
    team/oej/sip_spiral_7403/apps/app_followme.c
    team/oej/sip_spiral_7403/apps/app_ices.c
    team/oej/sip_spiral_7403/apps/app_image.c
    team/oej/sip_spiral_7403/apps/app_macro.c
    team/oej/sip_spiral_7403/apps/app_meetme.c
    team/oej/sip_spiral_7403/apps/app_milliwatt.c
    team/oej/sip_spiral_7403/apps/app_mixmonitor.c
    team/oej/sip_spiral_7403/apps/app_mp3.c
    team/oej/sip_spiral_7403/apps/app_nbscat.c
    team/oej/sip_spiral_7403/apps/app_osplookup.c
    team/oej/sip_spiral_7403/apps/app_page.c
    team/oej/sip_spiral_7403/apps/app_playback.c
    team/oej/sip_spiral_7403/apps/app_queue.c
    team/oej/sip_spiral_7403/apps/app_read.c
    team/oej/sip_spiral_7403/apps/app_record.c
    team/oej/sip_spiral_7403/apps/app_rpt.c
    team/oej/sip_spiral_7403/apps/app_senddtmf.c
    team/oej/sip_spiral_7403/apps/app_setcallerid.c
    team/oej/sip_spiral_7403/apps/app_sms.c
    team/oej/sip_spiral_7403/apps/app_speech_utils.c
    team/oej/sip_spiral_7403/apps/app_stack.c
    team/oej/sip_spiral_7403/apps/app_userevent.c
    team/oej/sip_spiral_7403/apps/app_voicemail.c
    team/oej/sip_spiral_7403/apps/app_while.c
    team/oej/sip_spiral_7403/apps/app_zapbarge.c
    team/oej/sip_spiral_7403/apps/app_zapras.c
    team/oej/sip_spiral_7403/apps/app_zapscan.c
    team/oej/sip_spiral_7403/build_tools/cflags.xml
    team/oej/sip_spiral_7403/build_tools/embed_modules.xml
    team/oej/sip_spiral_7403/build_tools/get_makeopts
    team/oej/sip_spiral_7403/build_tools/get_moduleinfo
    team/oej/sip_spiral_7403/build_tools/make_buildopts_h
    team/oej/sip_spiral_7403/build_tools/make_version
    team/oej/sip_spiral_7403/build_tools/make_version_h
    team/oej/sip_spiral_7403/build_tools/menuselect-deps.in
    team/oej/sip_spiral_7403/build_tools/prep_tarball
    team/oej/sip_spiral_7403/cdr/   (props changed)
    team/oej/sip_spiral_7403/cdr/cdr_manager.c
    team/oej/sip_spiral_7403/cdr/cdr_odbc.c
    team/oej/sip_spiral_7403/cdr/cdr_pgsql.c
    team/oej/sip_spiral_7403/cdr/cdr_radius.c
    team/oej/sip_spiral_7403/cdr/cdr_sqlite.c
    team/oej/sip_spiral_7403/channels/   (props changed)
    team/oej/sip_spiral_7403/channels/Makefile
    team/oej/sip_spiral_7403/channels/chan_agent.c
    team/oej/sip_spiral_7403/channels/chan_alsa.c
    team/oej/sip_spiral_7403/channels/chan_features.c
    team/oej/sip_spiral_7403/channels/chan_gtalk.c
    team/oej/sip_spiral_7403/channels/chan_h323.c
    team/oej/sip_spiral_7403/channels/chan_iax2.c
    team/oej/sip_spiral_7403/channels/chan_jingle.c
    team/oej/sip_spiral_7403/channels/chan_local.c
    team/oej/sip_spiral_7403/channels/chan_mgcp.c
    team/oej/sip_spiral_7403/channels/chan_misdn.c
    team/oej/sip_spiral_7403/channels/chan_nbs.c
    team/oej/sip_spiral_7403/channels/chan_oss.c
    team/oej/sip_spiral_7403/channels/chan_phone.c
    team/oej/sip_spiral_7403/channels/chan_sip.c
    team/oej/sip_spiral_7403/channels/chan_skinny.c
    team/oej/sip_spiral_7403/channels/chan_vpb.cc
    team/oej/sip_spiral_7403/channels/chan_zap.c
    team/oej/sip_spiral_7403/channels/h323/ast_h323.cxx
    team/oej/sip_spiral_7403/channels/iax2-parser.c
    team/oej/sip_spiral_7403/channels/iax2-parser.h
    team/oej/sip_spiral_7403/channels/iax2-provision.c
    team/oej/sip_spiral_7403/channels/iax2.h
    team/oej/sip_spiral_7403/channels/misdn/Makefile
    team/oej/sip_spiral_7403/channels/misdn/chan_misdn_config.h
    team/oej/sip_spiral_7403/channels/misdn/ie.c
    team/oej/sip_spiral_7403/channels/misdn/isdn_lib.c
    team/oej/sip_spiral_7403/channels/misdn/isdn_lib.h
    team/oej/sip_spiral_7403/channels/misdn/isdn_msg_parser.c
    team/oej/sip_spiral_7403/channels/misdn_config.c
    team/oej/sip_spiral_7403/codecs/   (props changed)
    team/oej/sip_spiral_7403/codecs/Makefile
    team/oej/sip_spiral_7403/codecs/codec_gsm.c
    team/oej/sip_spiral_7403/codecs/codec_speex.c
    team/oej/sip_spiral_7403/codecs/codec_zap.c
    team/oej/sip_spiral_7403/codecs/gsm/   (props changed)
    team/oej/sip_spiral_7403/codecs/gsm/Makefile
    team/oej/sip_spiral_7403/codecs/gsm/inc/proto.h
    team/oej/sip_spiral_7403/codecs/ilbc/   (props changed)
    team/oej/sip_spiral_7403/codecs/ilbc/Makefile
    team/oej/sip_spiral_7403/codecs/lpc10/   (props changed)
    team/oej/sip_spiral_7403/codecs/lpc10/Makefile
    team/oej/sip_spiral_7403/configs/cdr.conf.sample
    team/oej/sip_spiral_7403/configs/cdr_custom.conf.sample
    team/oej/sip_spiral_7403/configs/dundi.conf.sample
    team/oej/sip_spiral_7403/configs/extconfig.conf.sample
    team/oej/sip_spiral_7403/configs/extensions.conf.sample
    team/oej/sip_spiral_7403/configs/features.conf.sample
    team/oej/sip_spiral_7403/configs/func_odbc.conf.sample
    team/oej/sip_spiral_7403/configs/h323.conf.sample
    team/oej/sip_spiral_7403/configs/http.conf.sample
    team/oej/sip_spiral_7403/configs/iax.conf.sample
    team/oej/sip_spiral_7403/configs/iaxprov.conf.sample
    team/oej/sip_spiral_7403/configs/indications.conf.sample
    team/oej/sip_spiral_7403/configs/manager.conf.sample
    team/oej/sip_spiral_7403/configs/meetme.conf.sample
    team/oej/sip_spiral_7403/configs/mgcp.conf.sample
    team/oej/sip_spiral_7403/configs/misdn.conf.sample
    team/oej/sip_spiral_7403/configs/osp.conf.sample
    team/oej/sip_spiral_7403/configs/phone.conf.sample
    team/oej/sip_spiral_7403/configs/queues.conf.sample
    team/oej/sip_spiral_7403/configs/say.conf.sample
    team/oej/sip_spiral_7403/configs/sip.conf.sample
    team/oej/sip_spiral_7403/configs/sip_notify.conf.sample
    team/oej/sip_spiral_7403/configs/skinny.conf.sample
    team/oej/sip_spiral_7403/configs/sla.conf.sample
    team/oej/sip_spiral_7403/configs/users.conf.sample
    team/oej/sip_spiral_7403/configs/voicemail.conf.sample
    team/oej/sip_spiral_7403/configs/zapata.conf.sample
    team/oej/sip_spiral_7403/configure
    team/oej/sip_spiral_7403/configure.ac
    team/oej/sip_spiral_7403/contrib/asterisk-ng-doxygen
    team/oej/sip_spiral_7403/contrib/init.d/rc.suse.asterisk
    team/oej/sip_spiral_7403/contrib/scripts/safe_asterisk
    team/oej/sip_spiral_7403/contrib/scripts/vmdb.sql
    team/oej/sip_spiral_7403/contrib/utils/zones2indications.c
    team/oej/sip_spiral_7403/doc/CODING-GUIDELINES
    team/oej/sip_spiral_7403/doc/PEERING
    team/oej/sip_spiral_7403/doc/externalivr.txt
    team/oej/sip_spiral_7403/doc/modules.txt
    team/oej/sip_spiral_7403/doc/osp.txt
    team/oej/sip_spiral_7403/doc/rtp-packetization.txt
    team/oej/sip_spiral_7403/doc/snmp.txt
    team/oej/sip_spiral_7403/formats/   (props changed)
    team/oej/sip_spiral_7403/formats/format_wav.c
    team/oej/sip_spiral_7403/funcs/   (props changed)
    team/oej/sip_spiral_7403/funcs/func_base64.c
    team/oej/sip_spiral_7403/funcs/func_blacklist.c
    team/oej/sip_spiral_7403/funcs/func_callerid.c
    team/oej/sip_spiral_7403/funcs/func_cdr.c
    team/oej/sip_spiral_7403/funcs/func_channel.c
    team/oej/sip_spiral_7403/funcs/func_curl.c
    team/oej/sip_spiral_7403/funcs/func_cut.c
    team/oej/sip_spiral_7403/funcs/func_db.c
    team/oej/sip_spiral_7403/funcs/func_enum.c
    team/oej/sip_spiral_7403/funcs/func_env.c
    team/oej/sip_spiral_7403/funcs/func_global.c
    team/oej/sip_spiral_7403/funcs/func_groupcount.c
    team/oej/sip_spiral_7403/funcs/func_logic.c
    team/oej/sip_spiral_7403/funcs/func_math.c
    team/oej/sip_spiral_7403/funcs/func_md5.c
    team/oej/sip_spiral_7403/funcs/func_module.c
    team/oej/sip_spiral_7403/funcs/func_odbc.c
    team/oej/sip_spiral_7403/funcs/func_rand.c
    team/oej/sip_spiral_7403/funcs/func_realtime.c
    team/oej/sip_spiral_7403/funcs/func_sha1.c
    team/oej/sip_spiral_7403/funcs/func_strings.c
    team/oej/sip_spiral_7403/funcs/func_timeout.c
    team/oej/sip_spiral_7403/funcs/func_uri.c
    team/oej/sip_spiral_7403/funcs/func_version.c
    team/oej/sip_spiral_7403/funcs/func_vmcount.c
    team/oej/sip_spiral_7403/include/asterisk.h
    team/oej/sip_spiral_7403/include/asterisk/acl.h
    team/oej/sip_spiral_7403/include/asterisk/ael_structs.h
    team/oej/sip_spiral_7403/include/asterisk/app.h
    team/oej/sip_spiral_7403/include/asterisk/astdb.h
    team/oej/sip_spiral_7403/include/asterisk/astmm.h
    team/oej/sip_spiral_7403/include/asterisk/autoconfig.h.in
    team/oej/sip_spiral_7403/include/asterisk/cdr.h
    team/oej/sip_spiral_7403/include/asterisk/channel.h
    team/oej/sip_spiral_7403/include/asterisk/cli.h
    team/oej/sip_spiral_7403/include/asterisk/compat.h
    team/oej/sip_spiral_7403/include/asterisk/config.h
    team/oej/sip_spiral_7403/include/asterisk/devicestate.h
    team/oej/sip_spiral_7403/include/asterisk/doxyref.h
    team/oej/sip_spiral_7403/include/asterisk/enum.h
    team/oej/sip_spiral_7403/include/asterisk/features.h
    team/oej/sip_spiral_7403/include/asterisk/frame.h
    team/oej/sip_spiral_7403/include/asterisk/http.h
    team/oej/sip_spiral_7403/include/asterisk/indications.h
    team/oej/sip_spiral_7403/include/asterisk/jabber.h
    team/oej/sip_spiral_7403/include/asterisk/jingle.h
    team/oej/sip_spiral_7403/include/asterisk/lock.h
    team/oej/sip_spiral_7403/include/asterisk/manager.h
    team/oej/sip_spiral_7403/include/asterisk/module.h
    team/oej/sip_spiral_7403/include/asterisk/netsock.h
    team/oej/sip_spiral_7403/include/asterisk/options.h
    team/oej/sip_spiral_7403/include/asterisk/pbx.h
    team/oej/sip_spiral_7403/include/asterisk/rtp.h
    team/oej/sip_spiral_7403/include/asterisk/smdi.h
    team/oej/sip_spiral_7403/include/asterisk/speech.h
    team/oej/sip_spiral_7403/include/asterisk/strings.h
    team/oej/sip_spiral_7403/include/asterisk/tdd.h
    team/oej/sip_spiral_7403/include/asterisk/threadstorage.h
    team/oej/sip_spiral_7403/include/asterisk/udptl.h
    team/oej/sip_spiral_7403/include/asterisk/utils.h
    team/oej/sip_spiral_7403/include/jitterbuf.h
    team/oej/sip_spiral_7403/main/   (props changed)
    team/oej/sip_spiral_7403/main/Makefile
    team/oej/sip_spiral_7403/main/abstract_jb.c
    team/oej/sip_spiral_7403/main/acl.c
    team/oej/sip_spiral_7403/main/alaw.c
    team/oej/sip_spiral_7403/main/app.c
    team/oej/sip_spiral_7403/main/ast_expr2.c
    team/oej/sip_spiral_7403/main/ast_expr2.fl
    team/oej/sip_spiral_7403/main/ast_expr2.y
    team/oej/sip_spiral_7403/main/ast_expr2f.c
    team/oej/sip_spiral_7403/main/asterisk.c
    team/oej/sip_spiral_7403/main/astmm.c
    team/oej/sip_spiral_7403/main/autoservice.c
    team/oej/sip_spiral_7403/main/callerid.c
    team/oej/sip_spiral_7403/main/cdr.c
    team/oej/sip_spiral_7403/main/channel.c
    team/oej/sip_spiral_7403/main/cli.c
    team/oej/sip_spiral_7403/main/config.c
    team/oej/sip_spiral_7403/main/db.c
    team/oej/sip_spiral_7403/main/db1-ast/   (props changed)
    team/oej/sip_spiral_7403/main/db1-ast/Makefile
    team/oej/sip_spiral_7403/main/db1-ast/btree/bt_close.c
    team/oej/sip_spiral_7403/main/db1-ast/btree/bt_conv.c
    team/oej/sip_spiral_7403/main/db1-ast/btree/bt_debug.c
    team/oej/sip_spiral_7403/main/db1-ast/btree/bt_delete.c
    team/oej/sip_spiral_7403/main/db1-ast/btree/bt_get.c
    team/oej/sip_spiral_7403/main/db1-ast/btree/bt_open.c
    team/oej/sip_spiral_7403/main/db1-ast/btree/bt_overflow.c
    team/oej/sip_spiral_7403/main/db1-ast/btree/bt_page.c
    team/oej/sip_spiral_7403/main/db1-ast/btree/bt_put.c
    team/oej/sip_spiral_7403/main/db1-ast/btree/bt_search.c
    team/oej/sip_spiral_7403/main/db1-ast/btree/bt_seq.c
    team/oej/sip_spiral_7403/main/db1-ast/btree/bt_split.c
    team/oej/sip_spiral_7403/main/db1-ast/btree/bt_utils.c
    team/oej/sip_spiral_7403/main/db1-ast/db/db.c
    team/oej/sip_spiral_7403/main/db1-ast/hash/hash.c
    team/oej/sip_spiral_7403/main/db1-ast/hash/hash_bigkey.c
    team/oej/sip_spiral_7403/main/db1-ast/hash/hash_buf.c
    team/oej/sip_spiral_7403/main/db1-ast/hash/hash_func.c
    team/oej/sip_spiral_7403/main/db1-ast/hash/hash_log2.c
    team/oej/sip_spiral_7403/main/db1-ast/hash/hash_page.c
    team/oej/sip_spiral_7403/main/db1-ast/hash/hsearch.c
    team/oej/sip_spiral_7403/main/db1-ast/include/ndbm.h
    team/oej/sip_spiral_7403/main/db1-ast/mpool/mpool.c
    team/oej/sip_spiral_7403/main/db1-ast/recno/rec_close.c
    team/oej/sip_spiral_7403/main/db1-ast/recno/rec_delete.c
    team/oej/sip_spiral_7403/main/db1-ast/recno/rec_get.c
    team/oej/sip_spiral_7403/main/db1-ast/recno/rec_open.c
    team/oej/sip_spiral_7403/main/db1-ast/recno/rec_put.c
    team/oej/sip_spiral_7403/main/db1-ast/recno/rec_search.c
    team/oej/sip_spiral_7403/main/db1-ast/recno/rec_seq.c
    team/oej/sip_spiral_7403/main/db1-ast/recno/rec_utils.c
    team/oej/sip_spiral_7403/main/devicestate.c
    team/oej/sip_spiral_7403/main/dns.c
    team/oej/sip_spiral_7403/main/dnsmgr.c
    team/oej/sip_spiral_7403/main/dsp.c
    team/oej/sip_spiral_7403/main/editline/refresh.c
    team/oej/sip_spiral_7403/main/enum.c
    team/oej/sip_spiral_7403/main/file.c
    team/oej/sip_spiral_7403/main/frame.c
    team/oej/sip_spiral_7403/main/fskmodem.c
    team/oej/sip_spiral_7403/main/http.c
    team/oej/sip_spiral_7403/main/image.c
    team/oej/sip_spiral_7403/main/indications.c
    team/oej/sip_spiral_7403/main/io.c
    team/oej/sip_spiral_7403/main/jitterbuf.c
    team/oej/sip_spiral_7403/main/loader.c
    team/oej/sip_spiral_7403/main/logger.c
    team/oej/sip_spiral_7403/main/manager.c
    team/oej/sip_spiral_7403/main/netsock.c
    team/oej/sip_spiral_7403/main/pbx.c
    team/oej/sip_spiral_7403/main/rtp.c
    team/oej/sip_spiral_7403/main/say.c
    team/oej/sip_spiral_7403/main/sched.c
    team/oej/sip_spiral_7403/main/slinfactory.c
    team/oej/sip_spiral_7403/main/srv.c
    team/oej/sip_spiral_7403/main/stdtime/localtime.c
    team/oej/sip_spiral_7403/main/strcompat.c
    team/oej/sip_spiral_7403/main/tdd.c
    team/oej/sip_spiral_7403/main/term.c
    team/oej/sip_spiral_7403/main/translate.c
    team/oej/sip_spiral_7403/main/udptl.c
    team/oej/sip_spiral_7403/main/utils.c
    team/oej/sip_spiral_7403/makeopts.in
    team/oej/sip_spiral_7403/pbx/   (props changed)
    team/oej/sip_spiral_7403/pbx/ael/ael-test/ref.ael-test2
    team/oej/sip_spiral_7403/pbx/ael/ael-test/ref.ael-test3
    team/oej/sip_spiral_7403/pbx/ael/ael-test/ref.ael-test4
    team/oej/sip_spiral_7403/pbx/ael/ael-test/ref.ael-test6
    team/oej/sip_spiral_7403/pbx/ael/ael-test/ref.ael-test7
    team/oej/sip_spiral_7403/pbx/ael/ael-test/ref.ael-vtest13
    team/oej/sip_spiral_7403/pbx/ael/ael-test/ref.ael-vtest17
    team/oej/sip_spiral_7403/pbx/ael/ael.flex
    team/oej/sip_spiral_7403/pbx/ael/ael.tab.c
    team/oej/sip_spiral_7403/pbx/ael/ael.y
    team/oej/sip_spiral_7403/pbx/ael/ael_lex.c
    team/oej/sip_spiral_7403/pbx/pbx_ael.c
    team/oej/sip_spiral_7403/pbx/pbx_config.c
    team/oej/sip_spiral_7403/pbx/pbx_dundi.c
    team/oej/sip_spiral_7403/pbx/pbx_spool.c
    team/oej/sip_spiral_7403/redhat/asterisk.spec
    team/oej/sip_spiral_7403/res/   (props changed)
    team/oej/sip_spiral_7403/res/res_adsi.c
    team/oej/sip_spiral_7403/res/res_agi.c
    team/oej/sip_spiral_7403/res/res_config_odbc.c
    team/oej/sip_spiral_7403/res/res_config_pgsql.c
    team/oej/sip_spiral_7403/res/res_convert.c
    team/oej/sip_spiral_7403/res/res_crypto.c
    team/oej/sip_spiral_7403/res/res_features.c
    team/oej/sip_spiral_7403/res/res_indications.c
    team/oej/sip_spiral_7403/res/res_jabber.c
    team/oej/sip_spiral_7403/res/res_limit.c
    team/oej/sip_spiral_7403/res/res_monitor.c
    team/oej/sip_spiral_7403/res/res_musiconhold.c
    team/oej/sip_spiral_7403/res/res_odbc.c
    team/oej/sip_spiral_7403/res/res_realtime.c
    team/oej/sip_spiral_7403/res/res_smdi.c
    team/oej/sip_spiral_7403/res/res_snmp.c
    team/oej/sip_spiral_7403/res/res_speech.c
    team/oej/sip_spiral_7403/res/snmp/agent.c
    team/oej/sip_spiral_7403/sounds/Makefile
    team/oej/sip_spiral_7403/utils/   (props changed)
    team/oej/sip_spiral_7403/utils/Makefile
    team/oej/sip_spiral_7403/utils/ael_main.c
    team/oej/sip_spiral_7403/utils/astman.c
    team/oej/sip_spiral_7403/utils/check_expr.c
    team/oej/sip_spiral_7403/utils/smsq.c

Propchange: team/oej/sip_spiral_7403/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/sip_spiral_7403/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/oej/sip_spiral_7403/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/oej/sip_spiral_7403/
            ('svnmerge-blocked' removed)

Propchange: team/oej/sip_spiral_7403/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May 17 01:38:04 2007
@@ -1,1 +1,1 @@
-/trunk:1-48358
+/trunk:1-64679

Modified: team/oej/sip_spiral_7403/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/sip_spiral_7403/.cleancount?view=diff&rev=64688&r1=64687&r2=64688
==============================================================================
--- team/oej/sip_spiral_7403/.cleancount (original)
+++ team/oej/sip_spiral_7403/.cleancount Thu May 17 01:38:04 2007
@@ -1,1 +1,1 @@
-27
+30

Modified: team/oej/sip_spiral_7403/BUGS
URL: http://svn.digium.com/view/asterisk/team/oej/sip_spiral_7403/BUGS?view=diff&rev=64688&r1=64687&r2=64688
==============================================================================
--- team/oej/sip_spiral_7403/BUGS (original)
+++ team/oej/sip_spiral_7403/BUGS Thu May 17 01:38:04 2007
@@ -10,7 +10,7 @@
 learn how you can contribute by acting as a bug marshall
 please see:
 
-	http://www.digium.com/index.php?menu=bugguidelines
+	http://www.asterisk.org/developers/bug-guidelines
 
 If you would like to submit a feature request, please
 resist the temptation to post it to the bug tracker.

Modified: team/oej/sip_spiral_7403/CHANGES
URL: http://svn.digium.com/view/asterisk/team/oej/sip_spiral_7403/CHANGES?view=diff&rev=64688&r1=64687&r2=64688
==============================================================================
--- team/oej/sip_spiral_7403/CHANGES (original)
+++ team/oej/sip_spiral_7403/CHANGES Thu May 17 01:38:04 2007
@@ -1,18 +1,138 @@
-Changes since Asterisk 1.4-beta was branched:
-  * Added the bindaddr option to gtalk.conf.
-  * Added the ability to specify arguments to the Dial application when using
-    the DUNDi switch in the dialplan.
-  * Added the ability to customize which sound files are used for some of the
-    prompts within the Voicemail application by changing them in voicemail.conf
+-------------------------------------------------------------------------------
+--- Functionality changes since Asterisk 1.4-beta was branched ----------------
+-------------------------------------------------------------------------------
+
+AMI - The manager (TCP/TLS/HTTP)
+--------------------------------
+  * Added the URI redirect option for the built-in HTTP server
+  * The output of CallerID in Manager events is now more consistent.
+     CallerIDNum is used for number and CallerIDName for name.
   * enable https support for builtin web server.
      See configs/http.conf.sample for details.
-  * add a new option, match_auth_username, to sip.conf,
-     to improve the matching of incoming requests.
+  * Added a new action, GetConfigJSON, which can return the contents of an
+     Asterisk configuration file in JSON format.  This is intended to help
+     improve the performance of AJAX applications using the manager interface
+     over HTTP.
+  * SIP and IAX manager events now use "ChannelType" in all cases where we 
+     indicate channel driver. Previously, we used a mixture of "Channel"
+     and "ChannelDriver" headers.
+  * Added a "Bridge" action which allows you to bridge any two channels that
+     are currently active on the system.
+
+Dialplan functions
+------------------
+  * Added the DEVSTATE() dialplan function which allows retrieving any device
+    state in the dialplan, as well as creating custom device states that are
+    controllable from the dialplan.
+  * Extend CALLERID() function with "pres" and "ton" parameters to
+     fetch string representation of calling number presentation indicator
+     and numeric representation of type of calling number value.
+  * MailboxExists converted to dialplan function
+
+CLI Changes
+-----------
+  * New CLI command "core show settings"
+  * Added 'core show channels count' CLI command.
+
+SIP changes
+-----------
+  * The default SIP useragent= identifier now includes the Asterisk version
+  * A new option, match_auth_username in sip.conf changes the matching of incoming requests.
      If set, and the incoming request carries authentication info,
-     the username to match in the users list is taken from there
-     rather than from the From: field.
+     the username to match in the users list is taken from the Digest header
+     rather than from the From: field. This feature is considered experimental.
+  * The "musiconhold" and "musicclass" settings in sip.conf are now removed,
+     since they where replaced by "mohsuggest" and "mohinterpret" in version 1.4
+  * The "localmask" setting was removed in version 1.2 and the reminder about it
+     being removed is now also removed.
+  * A new option "busy-level" for setting a level of calls where asterisk reports
+     a device as busy, to separate it from call-limit
+  * A new realtime family called "sipregs" is now supported to store SIP registration
+     data. If this family is defined, "sippeers" will be used for configuration and
+     "sipregs" for registrations. If it's not defined, "sippeers" will be used for

[... 88598 lines stripped ...]


More information about the asterisk-commits mailing list