[asterisk-commits] oej: branch oej/moremanager r168495 - in /team/oej/moremanager: ./ agi/ apps/...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Jan 12 10:15:08 CST 2009
Author: oej
Date: Mon Jan 12 10:15:07 2009
New Revision: 168495
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168495
Log:
Reset, resolve and go on living happily ever after
Added:
team/oej/moremanager/UPGRADE-1.2.txt
- copied unchanged from r168382, branches/1.4/UPGRADE-1.2.txt
team/oej/moremanager/Zaptel-to-DAHDI.txt
- copied unchanged from r168382, branches/1.4/Zaptel-to-DAHDI.txt
team/oej/moremanager/apps/app_dahdibarge.c
- copied unchanged from r168382, branches/1.4/apps/app_dahdibarge.c
team/oej/moremanager/apps/app_dahdiras.c
- copied unchanged from r168382, branches/1.4/apps/app_dahdiras.c
team/oej/moremanager/apps/app_dahdiscan.c
- copied unchanged from r168382, branches/1.4/apps/app_dahdiscan.c
team/oej/moremanager/autoconf/
- copied from r168382, branches/1.4/autoconf/
team/oej/moremanager/autoconf/acx_pthread.m4
- copied unchanged from r168382, branches/1.4/autoconf/acx_pthread.m4
team/oej/moremanager/autoconf/ast_c_compile_check.m4
- copied unchanged from r168382, branches/1.4/autoconf/ast_c_compile_check.m4
team/oej/moremanager/autoconf/ast_c_define_check.m4
- copied unchanged from r168382, branches/1.4/autoconf/ast_c_define_check.m4
team/oej/moremanager/autoconf/ast_check_gnu_make.m4
- copied unchanged from r168382, branches/1.4/autoconf/ast_check_gnu_make.m4
team/oej/moremanager/autoconf/ast_check_openh323.m4
- copied unchanged from r168382, branches/1.4/autoconf/ast_check_openh323.m4
team/oej/moremanager/autoconf/ast_check_pwlib.m4
- copied unchanged from r168382, branches/1.4/autoconf/ast_check_pwlib.m4
team/oej/moremanager/autoconf/ast_ext_lib.m4
- copied unchanged from r168382, branches/1.4/autoconf/ast_ext_lib.m4
team/oej/moremanager/autoconf/ast_func_fork.m4
- copied unchanged from r168382, branches/1.4/autoconf/ast_func_fork.m4
team/oej/moremanager/autoconf/ast_gcc_attribute.m4
- copied unchanged from r168382, branches/1.4/autoconf/ast_gcc_attribute.m4
team/oej/moremanager/autoconf/ast_prog_egrep.m4
- copied unchanged from r168382, branches/1.4/autoconf/ast_prog_egrep.m4
team/oej/moremanager/autoconf/ast_prog_ld.m4
- copied unchanged from r168382, branches/1.4/autoconf/ast_prog_ld.m4
team/oej/moremanager/autoconf/ast_prog_ld_gnu.m4
- copied unchanged from r168382, branches/1.4/autoconf/ast_prog_ld_gnu.m4
team/oej/moremanager/autoconf/ast_prog_sed.m4
- copied unchanged from r168382, branches/1.4/autoconf/ast_prog_sed.m4
team/oej/moremanager/channels/busy_tone.h
- copied unchanged from r168382, branches/1.4/channels/busy_tone.h
team/oej/moremanager/channels/chan_dahdi.c
- copied unchanged from r168382, branches/1.4/channels/chan_dahdi.c
team/oej/moremanager/channels/ring_tone.h
- copied unchanged from r168382, branches/1.4/channels/ring_tone.h
team/oej/moremanager/codecs/codec_dahdi.c
- copied unchanged from r168382, branches/1.4/codecs/codec_dahdi.c
team/oej/moremanager/configs/chan_dahdi.conf.sample
- copied unchanged from r168382, branches/1.4/configs/chan_dahdi.conf.sample
team/oej/moremanager/doc/cli.txt
- copied unchanged from r168382, branches/1.4/doc/cli.txt
team/oej/moremanager/doc/lang/
- copied from r168382, branches/1.4/doc/lang/
team/oej/moremanager/doc/lang/hebrew.ods
- copied unchanged from r168382, branches/1.4/doc/lang/hebrew.ods
team/oej/moremanager/doc/sip-retransmit.txt
- copied unchanged from r168382, branches/1.4/doc/sip-retransmit.txt
team/oej/moremanager/funcs/func_audiohookinherit.c
- copied unchanged from r168382, branches/1.4/funcs/func_audiohookinherit.c
team/oej/moremanager/include/asterisk/dahdi_compat.h
- copied unchanged from r168382, branches/1.4/include/asterisk/dahdi_compat.h
team/oej/moremanager/include/asterisk/tonezone_compat.h
- copied unchanged from r168382, branches/1.4/include/asterisk/tonezone_compat.h
team/oej/moremanager/main/editline/makelist.in
- copied unchanged from r168382, branches/1.4/main/editline/makelist.in
team/oej/moremanager/pbx/ael/ael-test/ael-vtest25/
- copied from r168382, branches/1.4/pbx/ael/ael-test/ael-vtest25/
team/oej/moremanager/pbx/ael/ael-test/ael-vtest25/extensions.ael
- copied unchanged from r168382, branches/1.4/pbx/ael/ael-test/ael-vtest25/extensions.ael
team/oej/moremanager/pbx/ael/ael-test/ref.ael-vtest25
- copied unchanged from r168382, branches/1.4/pbx/ael/ael-test/ref.ael-vtest25
Removed:
team/oej/moremanager/acinclude.m4
team/oej/moremanager/apps/app_zapbarge.c
team/oej/moremanager/apps/app_zapras.c
team/oej/moremanager/apps/app_zapscan.c
team/oej/moremanager/channels/chan_zap.c
team/oej/moremanager/codecs/codec_zap.c
team/oej/moremanager/configs/zapata.conf.sample
team/oej/moremanager/contrib/scripts/postgres_cdr.sql
team/oej/moremanager/include/asterisk/dlfcn-compat.h
team/oej/moremanager/main/dlfcn.c
team/oej/moremanager/main/editline/makelist
team/oej/moremanager/redhat/
Modified:
team/oej/moremanager/ (props changed)
team/oej/moremanager/.cleancount
team/oej/moremanager/CHANGES
team/oej/moremanager/LICENSE
team/oej/moremanager/Makefile
team/oej/moremanager/Makefile.moddir_rules
team/oej/moremanager/Makefile.rules
team/oej/moremanager/README
team/oej/moremanager/UPGRADE.txt
team/oej/moremanager/agi/Makefile
team/oej/moremanager/agi/eagi-sphinx-test.c
team/oej/moremanager/agi/eagi-test.c
team/oej/moremanager/apps/Makefile
team/oej/moremanager/apps/app_adsiprog.c
team/oej/moremanager/apps/app_authenticate.c
team/oej/moremanager/apps/app_chanspy.c
team/oej/moremanager/apps/app_dial.c
team/oej/moremanager/apps/app_directed_pickup.c
team/oej/moremanager/apps/app_directory.c
team/oej/moremanager/apps/app_disa.c
team/oej/moremanager/apps/app_externalivr.c
team/oej/moremanager/apps/app_festival.c
team/oej/moremanager/apps/app_flash.c
team/oej/moremanager/apps/app_followme.c
team/oej/moremanager/apps/app_forkcdr.c
team/oej/moremanager/apps/app_getcpeid.c
team/oej/moremanager/apps/app_ices.c
team/oej/moremanager/apps/app_macro.c
team/oej/moremanager/apps/app_meetme.c
team/oej/moremanager/apps/app_milliwatt.c
team/oej/moremanager/apps/app_page.c
team/oej/moremanager/apps/app_parkandannounce.c
team/oej/moremanager/apps/app_playback.c
team/oej/moremanager/apps/app_queue.c
team/oej/moremanager/apps/app_read.c
team/oej/moremanager/apps/app_realtime.c
team/oej/moremanager/apps/app_rpt.c
team/oej/moremanager/apps/app_sendtext.c
team/oej/moremanager/apps/app_setcallerid.c
team/oej/moremanager/apps/app_sms.c
team/oej/moremanager/apps/app_speech_utils.c
team/oej/moremanager/apps/app_voicemail.c
team/oej/moremanager/apps/app_waitforsilence.c
team/oej/moremanager/apps/app_while.c
team/oej/moremanager/bootstrap.sh
team/oej/moremanager/build_tools/cflags.xml
team/oej/moremanager/build_tools/get_makeopts
team/oej/moremanager/build_tools/get_moduleinfo
team/oej/moremanager/build_tools/menuselect-deps.in
team/oej/moremanager/build_tools/strip_nonapi
team/oej/moremanager/cdr/cdr_csv.c
team/oej/moremanager/cdr/cdr_odbc.c
team/oej/moremanager/cdr/cdr_tds.c
team/oej/moremanager/channels/ (props changed)
team/oej/moremanager/channels/Makefile
team/oej/moremanager/channels/chan_agent.c
team/oej/moremanager/channels/chan_alsa.c
team/oej/moremanager/channels/chan_gtalk.c
team/oej/moremanager/channels/chan_h323.c
team/oej/moremanager/channels/chan_iax2.c
team/oej/moremanager/channels/chan_local.c
team/oej/moremanager/channels/chan_mgcp.c
team/oej/moremanager/channels/chan_misdn.c
team/oej/moremanager/channels/chan_oss.c
team/oej/moremanager/channels/chan_phone.c
team/oej/moremanager/channels/chan_sip.c
team/oej/moremanager/channels/chan_skinny.c
team/oej/moremanager/channels/chan_vpb.cc
team/oej/moremanager/channels/h323/ast_h323.cxx
team/oej/moremanager/channels/iax2-parser.c
team/oej/moremanager/channels/iax2.h
team/oej/moremanager/channels/misdn/ (props changed)
team/oej/moremanager/channels/misdn/Makefile
team/oej/moremanager/channels/misdn/isdn_lib.c
team/oej/moremanager/channels/misdn/isdn_lib.h
team/oej/moremanager/channels/misdn/isdn_lib_intern.h
team/oej/moremanager/channels/misdn_config.c
team/oej/moremanager/codecs/codec_speex.c
team/oej/moremanager/codecs/gsm/Makefile
team/oej/moremanager/codecs/gsm/src/ (props changed)
team/oej/moremanager/configs/agents.conf.sample
team/oej/moremanager/configs/extensions.ael.sample
team/oej/moremanager/configs/extensions.conf.sample
team/oej/moremanager/configs/features.conf.sample
team/oej/moremanager/configs/iax.conf.sample
team/oej/moremanager/configs/iaxprov.conf.sample
team/oej/moremanager/configs/misdn.conf.sample
team/oej/moremanager/configs/queues.conf.sample
team/oej/moremanager/configs/sip.conf.sample
team/oej/moremanager/configs/sla.conf.sample
team/oej/moremanager/configs/smdi.conf.sample
team/oej/moremanager/configs/voicemail.conf.sample
team/oej/moremanager/configure
team/oej/moremanager/configure.ac
team/oej/moremanager/contrib/asterisk-ng-doxygen
team/oej/moremanager/contrib/init.d/rc.debian.asterisk
team/oej/moremanager/contrib/init.d/rc.gentoo.asterisk
team/oej/moremanager/contrib/init.d/rc.mandrake.asterisk
team/oej/moremanager/contrib/init.d/rc.redhat.asterisk
team/oej/moremanager/contrib/init.d/rc.slackware.asterisk
team/oej/moremanager/contrib/init.d/rc.suse.asterisk
team/oej/moremanager/contrib/scripts/autosupport
team/oej/moremanager/contrib/scripts/get_ilbc_source.sh
team/oej/moremanager/contrib/scripts/realtime_pgsql.sql
team/oej/moremanager/contrib/scripts/safe_asterisk
team/oej/moremanager/contrib/scripts/vmail.cgi
team/oej/moremanager/contrib/utils/zones2indications.c
team/oej/moremanager/doc/00README.1st
team/oej/moremanager/doc/ael.txt
team/oej/moremanager/doc/asterisk-conf.txt
team/oej/moremanager/doc/asterisk-mib.txt
team/oej/moremanager/doc/backtrace.txt
team/oej/moremanager/doc/cdrdriver.txt
team/oej/moremanager/doc/configuration.txt
team/oej/moremanager/doc/digium-mib.txt
team/oej/moremanager/doc/hardware.txt
team/oej/moremanager/doc/imapstorage.txt
team/oej/moremanager/doc/misdn.txt
team/oej/moremanager/doc/sla.tex
team/oej/moremanager/doc/smdi.txt
team/oej/moremanager/doc/valgrind.txt
team/oej/moremanager/formats/format_gsm.c
team/oej/moremanager/formats/format_ogg_vorbis.c
team/oej/moremanager/formats/format_pcm.c
team/oej/moremanager/formats/format_wav.c
team/oej/moremanager/formats/format_wav_gsm.c
team/oej/moremanager/funcs/func_callerid.c
team/oej/moremanager/funcs/func_cdr.c
team/oej/moremanager/funcs/func_channel.c
team/oej/moremanager/funcs/func_curl.c
team/oej/moremanager/funcs/func_cut.c
team/oej/moremanager/funcs/func_enum.c
team/oej/moremanager/funcs/func_groupcount.c
team/oej/moremanager/funcs/func_math.c
team/oej/moremanager/funcs/func_odbc.c
team/oej/moremanager/funcs/func_realtime.c
team/oej/moremanager/funcs/func_strings.c
team/oej/moremanager/funcs/func_timeout.c
team/oej/moremanager/include/asterisk.h
team/oej/moremanager/include/asterisk/abstract_jb.h
team/oej/moremanager/include/asterisk/ael_structs.h
team/oej/moremanager/include/asterisk/app.h
team/oej/moremanager/include/asterisk/astmm.h
team/oej/moremanager/include/asterisk/astobj.h
team/oej/moremanager/include/asterisk/astobj2.h
team/oej/moremanager/include/asterisk/audiohook.h
team/oej/moremanager/include/asterisk/autoconfig.h.in
team/oej/moremanager/include/asterisk/causes.h
team/oej/moremanager/include/asterisk/cdr.h
team/oej/moremanager/include/asterisk/channel.h
team/oej/moremanager/include/asterisk/cli.h
team/oej/moremanager/include/asterisk/compat.h
team/oej/moremanager/include/asterisk/compiler.h
team/oej/moremanager/include/asterisk/devicestate.h
team/oej/moremanager/include/asterisk/doxyref.h
team/oej/moremanager/include/asterisk/dsp.h
team/oej/moremanager/include/asterisk/dundi.h
team/oej/moremanager/include/asterisk/features.h
team/oej/moremanager/include/asterisk/file.h
team/oej/moremanager/include/asterisk/frame.h
team/oej/moremanager/include/asterisk/global_datastores.h
team/oej/moremanager/include/asterisk/indications.h
team/oej/moremanager/include/asterisk/linkedlists.h
team/oej/moremanager/include/asterisk/lock.h
team/oej/moremanager/include/asterisk/logger.h
team/oej/moremanager/include/asterisk/manager.h
team/oej/moremanager/include/asterisk/module.h
team/oej/moremanager/include/asterisk/options.h
team/oej/moremanager/include/asterisk/pbx.h
team/oej/moremanager/include/asterisk/res_odbc.h
team/oej/moremanager/include/asterisk/sched.h
team/oej/moremanager/include/asterisk/stringfields.h
team/oej/moremanager/include/asterisk/strings.h
team/oej/moremanager/include/asterisk/threadstorage.h
team/oej/moremanager/include/asterisk/utils.h
team/oej/moremanager/include/jitterbuf.h
team/oej/moremanager/main/Makefile
team/oej/moremanager/main/abstract_jb.c
team/oej/moremanager/main/acl.c
team/oej/moremanager/main/app.c
team/oej/moremanager/main/ast_expr2.c
team/oej/moremanager/main/ast_expr2.fl
team/oej/moremanager/main/ast_expr2.y
team/oej/moremanager/main/ast_expr2f.c
team/oej/moremanager/main/asterisk.c
team/oej/moremanager/main/astmm.c
team/oej/moremanager/main/astobj2.c
team/oej/moremanager/main/audiohook.c
team/oej/moremanager/main/autoservice.c
team/oej/moremanager/main/callerid.c
team/oej/moremanager/main/cdr.c
team/oej/moremanager/main/channel.c
team/oej/moremanager/main/cli.c
team/oej/moremanager/main/config.c
team/oej/moremanager/main/db.c
team/oej/moremanager/main/db1-ast/Makefile
team/oej/moremanager/main/db1-ast/btree/ (props changed)
team/oej/moremanager/main/db1-ast/db/ (props changed)
team/oej/moremanager/main/db1-ast/hash/ (props changed)
team/oej/moremanager/main/db1-ast/hash/hash_page.c
team/oej/moremanager/main/db1-ast/mpool/ (props changed)
team/oej/moremanager/main/db1-ast/recno/ (props changed)
team/oej/moremanager/main/devicestate.c
team/oej/moremanager/main/dns.c
team/oej/moremanager/main/dnsmgr.c
team/oej/moremanager/main/dsp.c
team/oej/moremanager/main/editline/ (props changed)
team/oej/moremanager/main/editline/Makefile.in
team/oej/moremanager/main/editline/configure
team/oej/moremanager/main/editline/configure.in
team/oej/moremanager/main/editline/np/vis.c
team/oej/moremanager/main/editline/read.c
team/oej/moremanager/main/enum.c
team/oej/moremanager/main/file.c
team/oej/moremanager/main/fixedjitterbuf.h
team/oej/moremanager/main/frame.c
team/oej/moremanager/main/global_datastores.c
team/oej/moremanager/main/http.c
team/oej/moremanager/main/indications.c
team/oej/moremanager/main/jitterbuf.c
team/oej/moremanager/main/loader.c
team/oej/moremanager/main/logger.c
team/oej/moremanager/main/manager.c
team/oej/moremanager/main/pbx.c
team/oej/moremanager/main/poll.c
team/oej/moremanager/main/rtp.c
team/oej/moremanager/main/say.c
team/oej/moremanager/main/sched.c
team/oej/moremanager/main/srv.c
team/oej/moremanager/main/stdtime/ (props changed)
team/oej/moremanager/main/stdtime/Makefile
team/oej/moremanager/main/stdtime/localtime.c
team/oej/moremanager/main/threadstorage.c
team/oej/moremanager/main/translate.c
team/oej/moremanager/main/udptl.c
team/oej/moremanager/main/utils.c
team/oej/moremanager/makeopts.in
team/oej/moremanager/pbx/Makefile
team/oej/moremanager/pbx/ael/ (props changed)
team/oej/moremanager/pbx/ael/ael-test/ref.ael-ntest10
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test1
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test15
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test18
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test3
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test5
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test6
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test8
team/oej/moremanager/pbx/ael/ael-test/ref.ael-vtest13
team/oej/moremanager/pbx/ael/ael-test/ref.ael-vtest17
team/oej/moremanager/pbx/ael/ael.flex
team/oej/moremanager/pbx/ael/ael.tab.c
team/oej/moremanager/pbx/ael/ael.tab.h
team/oej/moremanager/pbx/ael/ael.y
team/oej/moremanager/pbx/ael/ael_lex.c
team/oej/moremanager/pbx/pbx_ael.c
team/oej/moremanager/pbx/pbx_config.c
team/oej/moremanager/pbx/pbx_dundi.c
team/oej/moremanager/pbx/pbx_gtkconsole.c
team/oej/moremanager/pbx/pbx_loopback.c
team/oej/moremanager/pbx/pbx_spool.c
team/oej/moremanager/res/Makefile
team/oej/moremanager/res/res_agi.c
team/oej/moremanager/res/res_config_odbc.c
team/oej/moremanager/res/res_config_pgsql.c
team/oej/moremanager/res/res_crypto.c
team/oej/moremanager/res/res_features.c
team/oej/moremanager/res/res_indications.c
team/oej/moremanager/res/res_jabber.c
team/oej/moremanager/res/res_musiconhold.c
team/oej/moremanager/res/res_odbc.c
team/oej/moremanager/res/res_smdi.c
team/oej/moremanager/res/snmp/ (props changed)
team/oej/moremanager/res/snmp/agent.c
team/oej/moremanager/sample.call
team/oej/moremanager/sounds/Makefile
team/oej/moremanager/utils/Makefile
team/oej/moremanager/utils/ael_main.c
team/oej/moremanager/utils/astman.c
team/oej/moremanager/utils/check_expr.c
team/oej/moremanager/utils/frame.c
team/oej/moremanager/utils/muted.c
team/oej/moremanager/utils/smsq.c
team/oej/moremanager/utils/stereorize.c
team/oej/moremanager/utils/streamplayer.c
Propchange: team/oej/moremanager/
------------------------------------------------------------------------------
automerge = http://www.codename-pineapple.org/
Propchange: team/oej/moremanager/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/oej/moremanager/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/moremanager/
------------------------------------------------------------------------------
--- reviewboard:url (added)
+++ reviewboard:url Mon Jan 12 10:15:07 2009
@@ -1,0 +1,1 @@
+http://reviewboard.digium.com
Propchange: team/oej/moremanager/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 12 10:15:07 2009
@@ -1,1 +1,1 @@
-/branches/1.4:1-113957
+/branches/1.4:1-168476
Modified: team/oej/moremanager/.cleancount
URL: http://svn.digium.com/svn-view/asterisk/team/oej/moremanager/.cleancount?view=diff&rev=168495&r1=168494&r2=168495
==============================================================================
--- team/oej/moremanager/.cleancount (original)
+++ team/oej/moremanager/.cleancount Mon Jan 12 10:15:07 2009
@@ -1,1 +1,1 @@
-32
+33
Modified: team/oej/moremanager/CHANGES
URL: http://svn.digium.com/svn-view/asterisk/team/oej/moremanager/CHANGES?view=diff&rev=168495&r1=168494&r2=168495
==============================================================================
--- team/oej/moremanager/CHANGES (original)
+++ team/oej/moremanager/CHANGES Mon Jan 12 10:15:07 2009
@@ -120,6 +120,7 @@
19. SQL_ESC()
20. STAT()
21. STRPTIME()
+ 22. AUDIOHOOK_INHERIT()
* Apps that have changes to their interface:
1. Authenticate() -- optional maxdigits argument added.
2. ChanSpy() -- new options:
@@ -131,12 +132,22 @@
o New Option: K/k parking via dtmf tones
5. Dictate() -- optional filename argument added.
6. Directory() -- new option: e - In addition to the name, also read the extension number...
- 7. Meetme() -- new options:
+ 7. ForkCDR() -- new options:
+ o 'a' -- update answer time on new cdr
+ o 'A' -- Lock the orig CDR answer time against changes.
+ o 'D' -- Copy the disposition from the orig to the new CDR.
+ o 'd' -- clear the dstcannel field in the new CDR.
+ o 'e' -- set the end time of the original CDR.
+ o 'R' -- do NOT reset the new CDR.
+ o 's' -- Add/change var in orig CDR.
+ o 'T' -- Force ast_cdr_end, answer to obey LOCKED flag for the orig. CDR.
+ -- ast_cdr_setvar will be forced also (used by the CDR() func in write mode)
+ 8. Meetme() -- new options:
o 'I' -- announce user join/leave without review
o 'l' -- set listen only mode (Listen only, no talking)
o 'o' -- set talker optimization - treats talkers who aren't speaking as...
o '1' -- do not play message when first person enters
- 8. MeetmeAdmin() -- new options:
+ 9. MeetmeAdmin() -- new options:
o 'r' -- Reset one user's volume settings
o 'R' -- Reset all users volume settings
o 's' -- Lower entire conference speaking volume
@@ -147,21 +158,21 @@
o 'U' -- Lower all users listen volume
o 'v' -- Lower entire conference listening volume
o 'V' -- Raise entire conference listening volume
- 9. OSPFinish() : now also can return ERROR result.
- 10. OSPLookup() : Sets more variables, also now returns ERROR result.
- 11. Page() -- New option: r - record the page into a file (see 'r' for app_meetme)
- 12. Pickup() -- multiple extensions, PICKUPMARK; read the description!
- 13. Queue()
+ 10. OSPFinish() : now also can return ERROR result.
+ 11. OSPLookup() : Sets more variables, also now returns ERROR result.
+ 12. Page() -- New option: r - record the page into a file (see 'r' for app_meetme)
+ 13. Pickup() -- multiple extensions, PICKUPMARK; read the description!
+ 14. Queue()
o New Argument: AGI
o New option: i
- 14. Random() -- is now deprecated in 1.4
- 15. Read() -- replace 'skip' and 'noanswer' options with 's', 'n', add 'i' option.
- 16. Record() -- New option: 'x' : ignore all terminator keys (DTMF) and keep recording until hangup
- 17. UserEvent() -- slight change in behavior. Read the description.
- 18. VoiceMailMain() -- new a(#) option, goes to folder # directly.
- 19. WaitForSilence() -- new optional 3rd arg, time delay before returning.
+ 15. Random() -- is now deprecated in 1.4
+ 16. Read() -- replace 'skip' and 'noanswer' options with 's', 'n', add 'i' option.
+ 17. Record() -- New option: 'x' : ignore all terminator keys (DTMF) and keep recording until hangup
+ 18. UserEvent() -- slight change in behavior. Read the description.
+ 19. VoiceMailMain() -- new a(#) option, goes to folder # directly.
+ 20. WaitForSilence() -- new optional 3rd arg, time delay before returning.
* Functions that have changes to their interfaces:
- 1. CDR -- new option: u
+ 1. CDR -- new options: u and s
2. LANGUAGE -- Deprecated. Use CHANNEL(language) instead.
3. MUSICCLASS -- Deprecated. Use CHANNEL(musicclass) instead.
* Configuration File Changes:
@@ -193,10 +204,11 @@
1. mohinterpret
2. mohsuggest
2. agents.conf
+ o multiplelogin variable added
o maxlogintries variable added
o autologoffunavail variable added
o endcall variable added
- o agentgoodbye variable added
+ o goodbye variable added
o createlink variable REMOVED
3. alsa.conf
o mohinterpret variable added
@@ -219,6 +231,7 @@
o atxfernoanswertimeout variable added
o parkcall variable added (one step parking)
o improved documentation for dynamic feature declarations!
+ o added parkedcallltransfers option to control builtin transfers with parking
9. iax.conf
o adsi variable added
o mohinterpret variable added
@@ -285,8 +298,15 @@
21. rtp.conf
o rtcpinterval varaible added
22. sip.conf
+ o allowguest variable can't be set to 'osp'
o allowoverlap variable added
o allowtransfer variable added
+ o limitonpeer variable added
+ o directrtpsetup variable added
+ o buggymwi variable added
+ o ospauth variable REMOVED
+ o notifyhold variable added
+ o autoframing variable added
o tos variable REMOVED
o tos_sip variable added
o tos_audio variable added
@@ -295,17 +315,22 @@
o t1min variable added
o musicclass variable REMOVED
o mohinterpret variable added
- o maxcallbitratesuggest variable added
+ o mohsuggest variable added
o allowsubscribe variable added
o videosupport variable added
o maxcallbitrate variable added
o g726nonstandard variable added
o dumphistory variable added
- o allowsubscribe variable added
o t38pt_udptl variable added
+ o t38pt_rtp variable added
+ o t38pt_tcp variable added
+ o rfc2833compensate variable added
+ o matchexterniplocally variable added
o canreinvite variable can also now be set to 'nonat'
o rtsavesysname variable added
o JitterBuffer support added
+ o t38pt_usertpsource variable added
+ o regcontext variable can contains multiple contexts separated by an '&'
23. skinny.conf
o port variable renamed to bindport
o JitterBuffer support added
@@ -340,3 +365,6 @@
* New manager events:
1. OriginateResponse event comes to replace OriginateSuccess and OriginateFailure
* iLBC source code no longer included (see UPGRADE.txt for details)
+ * New CLI command "pri show version" that shows the current version of libpri
+ that the library was built against (requires a version of libpri since this API
+ feature was added).
Modified: team/oej/moremanager/LICENSE
URL: http://svn.digium.com/svn-view/asterisk/team/oej/moremanager/LICENSE?view=diff&rev=168495&r1=168494&r2=168495
==============================================================================
--- team/oej/moremanager/LICENSE (original)
+++ team/oej/moremanager/LICENSE Mon Jan 12 10:15:07 2009
@@ -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
@@ -59,7 +59,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/oej/moremanager/Makefile
URL: http://svn.digium.com/svn-view/asterisk/team/oej/moremanager/Makefile?view=diff&rev=168495&r1=168494&r2=168495
==============================================================================
--- team/oej/moremanager/Makefile (original)
+++ team/oej/moremanager/Makefile Mon Jan 12 10:15:07 2009
@@ -203,10 +203,15 @@
ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
-ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
-
ifeq ($(AST_DEVMODE),yes)
- ASTCFLAGS+=-Werror -Wunused $(AST_DECLARATION_AFTER_STATEMENT)
+ ASTCFLAGS+=-Werror
+ ASTCFLAGS+=-Wunused
+ ASTCFLAGS+=$(AST_DECLARATION_AFTER_STATEMENT)
+ ASTCFLAGS+=$(AST_FORTIFY_SOURCE)
+# ASTCFLAGS+=-Wundef
+ ASTCFLAGS+=-Wformat -Wformat-security
+ ASTCFLAGS+=-Wmissing-format-attribute
+# ASTCFLAGS+=-Wformat=2
endif
ifneq ($(findstring BSD,$(OSARCH)),)
@@ -245,9 +250,6 @@
ifneq ($(wildcard .version),)
ASTERISKVERSIONNUM:=$(shell $(AWK) -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
- RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
-else
- RPMVERSION=unknown
endif
ifneq ($(wildcard .svn),)
@@ -274,14 +276,14 @@
SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
else
# These are used for all but Darwin
- SOLINK=-shared -Xlinker -x
+ SOLINK=-shared
ifneq ($(findstring BSD,$(OSARCH)),)
LDFLAGS+=-L/usr/local/lib
endif
endif
ifeq ($(OSARCH),SunOS)
- SOLINK=-shared -fpic -L/usr/local/ssl/lib
+ SOLINK=-shared -fpic -L/usr/local/ssl/lib -lrt
endif
SUBMAKE=$(MAKE) --quiet --no-print-directory
@@ -315,7 +317,7 @@
@exit 1
menuselect.makeopts: menuselect/menuselect menuselect-tree
- menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
+ menuselect/menuselect --check-deps menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
$(MOD_SUBDIRS_EMBED_LDSCRIPT):
@echo "EMBED_LDSCRIPTS+="`$(SUBMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
@@ -346,10 +348,10 @@
main: $(filter-out main,$(MOD_SUBDIRS))
$(MOD_SUBDIRS):
- @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
+ @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
$(OTHER_SUBDIRS):
- @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AUDIO_LIBS="$(AUDIO_LIBS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
+ @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AUDIO_LIBS="$(AUDIO_LIBS)" $(MAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp
@@ -358,7 +360,7 @@
fi
@rm -f $@.tmp
-include/asterisk/version.h:
+include/asterisk/version.h: FORCE
@build_tools/make_version_h > $@.tmp
@if cmp -s $@.tmp $@ ; then : ; else \
mv $@.tmp $@ ; \
@@ -378,7 +380,9 @@
$(SUBDIRS_DIST_CLEAN):
@$(MAKE) --no-print-directory -C $(@:-dist-clean=) dist-clean
-clean: $(SUBDIRS_CLEAN)
+clean: $(SUBDIRS_CLEAN) _clean
+
+_clean:
rm -f defaults.h
rm -f include/asterisk/build.h
rm -f include/asterisk/version.h
@@ -387,12 +391,12 @@
dist-clean: distclean
-distclean: $(SUBDIRS_DIST_CLEAN) clean
+distclean: $(SUBDIRS_DIST_CLEAN) _clean
@$(MAKE) -C menuselect dist-clean
@$(MAKE) -C sounds dist-clean
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
rm -f makeopts.embed_rules
- rm -f config.log config.status
+ rm -f config.log config.status config.cache
rm -rf autom4te.cache
rm -f include/asterisk/autoconfig.h
rm -f include/asterisk/buildopts.h
@@ -432,7 +436,7 @@
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
-bininstall: _all
+installdirs:
mkdir -p $(DESTDIR)$(MODULES_DIR)
mkdir -p $(DESTDIR)$(ASTSBINDIR)
mkdir -p $(DESTDIR)$(ASTETCDIR)
@@ -444,6 +448,8 @@
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
+
+bininstall: _all installdirs $(SUBDIRS_INSTALL)
$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
@@ -478,9 +484,11 @@
@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) -C $(@:-install=) install
NEWMODS=$(notdir $(wildcard */*.so))
-OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
+DEPMODS=chan_zap.so app_zapras.so app_zapscan.so app_zapbarge.so codec_zap.so
+OLDMODS=$(filter-out $(NEWMODS) $(DEPMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
oldmodcheck:
+ @for f in $(DEPMODS); do rm -f $(DESTDIR)$(MODULES_DIR)/$$f; done
@if [ -n "$(OLDMODS)" ]; then \
echo " WARNING WARNING WARNING" ;\
echo "" ;\
@@ -505,7 +513,7 @@
@exit 1
endif
-install: badshell datafiles bininstall $(SUBDIRS_INSTALL)
+install: badshell datafiles bininstall
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
fi
@@ -579,7 +587,8 @@
echo "astrundir => $(ASTVARRUNDIR)" ; \
echo "astlogdir => $(ASTLOGDIR)" ; \
echo "" ; \
- echo ";[options]" ; \
+ echo "[options]" ; \
+ echo "languageprefix = yes ; Use the new sound prefix path syntax" ; \
echo ";verbose = 3" ; \
echo ";debug = 3" ; \
echo ";alwaysfork = yes ; same as -F at startup" ; \
@@ -593,7 +602,6 @@
echo ";nocolor = yes ; Disable console colors" ; \
echo ";dontwarn = yes ; Disable some warnings" ; \
echo ";dumpcore = yes ; Dump core on crash (same as -g at startup)" ; \
- echo ";languageprefix = yes ; Use the new sound prefix path syntax" ; \
echo ";internal_timing = yes" ; \
echo ";systemname = my_system_name ; prefix uniqueid with a system name for global uniqueness issues" ; \
echo ";maxcalls = 10 ; Maximum amount of calls allowed" ; \
@@ -605,6 +613,7 @@
echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
echo ";runuser = asterisk ; The user to run as" ; \
echo ";rungroup = asterisk ; The group to run as" ; \
+ echo ";dahdichanname = yes ; Channels created by chan_dahdi will be called 'DAHDI', otherwise 'Zap'" ; \
echo "" ; \
echo "; Changing the following lines may compromise your security." ; \
echo ";[files]" ; \
@@ -644,20 +653,6 @@
@echo " + HTTP_DOCSDIR +"
@echo " + +"
@echo " +-------------------------------------------+"
-
-spec:
- sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \
-
-rpm: __rpm
-
-__rpm: include/asterisk/version.h include/asterisk/buildopts.h spec
- rm -rf /tmp/asterisk ; \
- mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
- $(MAKE) DESTDIR=/tmp/asterisk install ; \
- $(MAKE) DESTDIR=/tmp/asterisk samples ; \
- mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
- cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \
- rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
progdocs:
(cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
@@ -746,10 +741,10 @@
gmenuconfig: gmenuselect
menuselect: menuselect/menuselect menuselect-tree
- - at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+ - at menuselect/menuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
gmenuselect: menuselect/gmenuselect menuselect-tree
- - at menuselect/gmenuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+ - at menuselect/gmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
@CC="$(HOST_CC)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
@@ -772,4 +767,6 @@
@cat sounds/sounds.xml >> $@
@echo "</menu>" >> $@
-.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell menuselect.makeopts include/asterisk/version.h
+.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell menuselect.makeopts installdirs _clean
+
+FORCE:
Modified: team/oej/moremanager/Makefile.moddir_rules
URL: http://svn.digium.com/svn-view/asterisk/team/oej/moremanager/Makefile.moddir_rules?view=diff&rev=168495&r1=168494&r2=168495
==============================================================================
--- team/oej/moremanager/Makefile.moddir_rules (original)
+++ team/oej/moremanager/Makefile.moddir_rules Mon Jan 12 10:15:07 2009
@@ -10,12 +10,6 @@
# This program is free software, distributed under the terms of
# the GNU General Public License
#
-
-ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),)
- ifeq ($(findstring astmm.h,$(ASTCFLAGS)),)
- ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/astmm.h
- endif
-endif
ifeq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
ASTCFLAGS+=${GC_CFLAGS}
@@ -70,8 +64,8 @@
@for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
clean::
- rm -f *.so *.o *.oo *.s *.i
- rm -f .*.o.d .*.oo.d
+ rm -f *.so *.o *.oo *.s *.i *.ii
+ rm -f .*.d
rm -f modules.link
install:: all
Modified: team/oej/moremanager/Makefile.rules
URL: http://svn.digium.com/svn-view/asterisk/team/oej/moremanager/Makefile.rules?view=diff&rev=168495&r1=168494&r2=168495
==============================================================================
--- team/oej/moremanager/Makefile.rules (original)
+++ team/oej/moremanager/Makefile.rules Mon Jan 12 10:15:07 2009
@@ -3,7 +3,7 @@
#
# Makefile rules
#
-# Copyright (C) 2006, Digium, Inc.
+# Copyright (C) 2006-2008, Digium, Inc.
#
[... 56553 lines stripped ...]
More information about the asterisk-commits
mailing list