[asterisk-commits] oej: branch oej/cancel_elsewhere_1.4 r93958 - in /team/oej/cancel_elsewhere_1...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Dec 19 11:46:07 CST 2007 

Author: oej
Date: Wed Dec 19 11:46:05 2007
New Revision: 93958

URL: http://svn.digium.com/view/asterisk?view=rev&rev=93958
Log:
Reset, resolve

Added:
    team/oej/cancel_elsewhere_1.4/doc/valgrind.txt
      - copied unchanged from r93764, branches/1.4/doc/valgrind.txt
    team/oej/cancel_elsewhere_1.4/include/asterisk/global_datastores.h
      - copied unchanged from r93764, branches/1.4/include/asterisk/global_datastores.h
    team/oej/cancel_elsewhere_1.4/main/global_datastores.c
      - copied unchanged from r93764, branches/1.4/main/global_datastores.c
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ael-ntest22/
      - copied from r93764, branches/1.4/pbx/ael/ael-test/ael-ntest22/
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ael-ntest22/extensions.ael
      - copied unchanged from r93764, branches/1.4/pbx/ael/ael-test/ael-ntest22/extensions.ael
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ael-ntest22/qq.ael
      - copied unchanged from r93764, branches/1.4/pbx/ael/ael-test/ael-ntest22/qq.ael
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ael-ntest22/t1/
      - copied from r93764, branches/1.4/pbx/ael/ael-test/ael-ntest22/t1/
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ael-ntest22/t1/a.ael
      - copied unchanged from r93764, branches/1.4/pbx/ael/ael-test/ael-ntest22/t1/a.ael
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ael-ntest22/t1/b.ael
      - copied unchanged from r93764, branches/1.4/pbx/ael/ael-test/ael-ntest22/t1/b.ael
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ael-ntest22/t1/c.ael
      - copied unchanged from r93764, branches/1.4/pbx/ael/ael-test/ael-ntest22/t1/c.ael
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ael-ntest22/t2/
      - copied from r93764, branches/1.4/pbx/ael/ael-test/ael-ntest22/t2/
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ael-ntest22/t2/d.ael
      - copied unchanged from r93764, branches/1.4/pbx/ael/ael-test/ael-ntest22/t2/d.ael
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ael-ntest22/t2/e.ael
      - copied unchanged from r93764, branches/1.4/pbx/ael/ael-test/ael-ntest22/t2/e.ael
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ael-ntest22/t2/f.ael
      - copied unchanged from r93764, branches/1.4/pbx/ael/ael-test/ael-ntest22/t2/f.ael
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ael-ntest22/t3/
      - copied from r93764, branches/1.4/pbx/ael/ael-test/ael-ntest22/t3/
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ael-ntest22/t3/g.ael
      - copied unchanged from r93764, branches/1.4/pbx/ael/ael-test/ael-ntest22/t3/g.ael
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ael-ntest22/t3/h.ael
      - copied unchanged from r93764, branches/1.4/pbx/ael/ael-test/ael-ntest22/t3/h.ael
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ael-ntest22/t3/i.ael
      - copied unchanged from r93764, branches/1.4/pbx/ael/ael-test/ael-ntest22/t3/i.ael
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ael-ntest22/t3/j.ael
      - copied unchanged from r93764, branches/1.4/pbx/ael/ael-test/ael-ntest22/t3/j.ael
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ref.ael-ntest22
      - copied unchanged from r93764, branches/1.4/pbx/ael/ael-test/ref.ael-ntest22
Removed:
    team/oej/cancel_elsewhere_1.4/build_tools/prep_moduledeps
Modified:
    team/oej/cancel_elsewhere_1.4/   (props changed)
    team/oej/cancel_elsewhere_1.4/.cleancount
    team/oej/cancel_elsewhere_1.4/LICENSE
    team/oej/cancel_elsewhere_1.4/Makefile
    team/oej/cancel_elsewhere_1.4/Makefile.moddir_rules
    team/oej/cancel_elsewhere_1.4/Makefile.rules
    team/oej/cancel_elsewhere_1.4/UPGRADE.txt
    team/oej/cancel_elsewhere_1.4/agi/   (props changed)
    team/oej/cancel_elsewhere_1.4/agi/Makefile
    team/oej/cancel_elsewhere_1.4/apps/   (props changed)
    team/oej/cancel_elsewhere_1.4/apps/Makefile
    team/oej/cancel_elsewhere_1.4/apps/app_controlplayback.c
    team/oej/cancel_elsewhere_1.4/apps/app_dial.c
    team/oej/cancel_elsewhere_1.4/apps/app_disa.c
    team/oej/cancel_elsewhere_1.4/apps/app_flash.c
    team/oej/cancel_elsewhere_1.4/apps/app_followme.c
    team/oej/cancel_elsewhere_1.4/apps/app_hasnewvoicemail.c
    team/oej/cancel_elsewhere_1.4/apps/app_meetme.c
    team/oej/cancel_elsewhere_1.4/apps/app_mixmonitor.c
    team/oej/cancel_elsewhere_1.4/apps/app_osplookup.c
    team/oej/cancel_elsewhere_1.4/apps/app_playback.c
    team/oej/cancel_elsewhere_1.4/apps/app_queue.c
    team/oej/cancel_elsewhere_1.4/apps/app_rpt.c
    team/oej/cancel_elsewhere_1.4/apps/app_stack.c
    team/oej/cancel_elsewhere_1.4/apps/app_system.c
    team/oej/cancel_elsewhere_1.4/apps/app_voicemail.c
    team/oej/cancel_elsewhere_1.4/build_tools/make_buildopts_h
    team/oej/cancel_elsewhere_1.4/build_tools/make_defaults_h
    team/oej/cancel_elsewhere_1.4/build_tools/make_version
    team/oej/cancel_elsewhere_1.4/build_tools/menuselect-deps.in
    team/oej/cancel_elsewhere_1.4/build_tools/prep_tarball
    team/oej/cancel_elsewhere_1.4/cdr/   (props changed)
    team/oej/cancel_elsewhere_1.4/cdr/Makefile
    team/oej/cancel_elsewhere_1.4/cdr/cdr_csv.c
    team/oej/cancel_elsewhere_1.4/cdr/cdr_pgsql.c
    team/oej/cancel_elsewhere_1.4/cdr/cdr_tds.c
    team/oej/cancel_elsewhere_1.4/channels/   (props changed)
    team/oej/cancel_elsewhere_1.4/channels/Makefile
    team/oej/cancel_elsewhere_1.4/channels/chan_agent.c
    team/oej/cancel_elsewhere_1.4/channels/chan_alsa.c
    team/oej/cancel_elsewhere_1.4/channels/chan_gtalk.c
    team/oej/cancel_elsewhere_1.4/channels/chan_h323.c
    team/oej/cancel_elsewhere_1.4/channels/chan_iax2.c
    team/oej/cancel_elsewhere_1.4/channels/chan_local.c
    team/oej/cancel_elsewhere_1.4/channels/chan_mgcp.c
    team/oej/cancel_elsewhere_1.4/channels/chan_misdn.c
    team/oej/cancel_elsewhere_1.4/channels/chan_sip.c
    team/oej/cancel_elsewhere_1.4/channels/chan_skinny.c
    team/oej/cancel_elsewhere_1.4/channels/chan_zap.c
    team/oej/cancel_elsewhere_1.4/channels/misdn/chan_misdn_config.h
    team/oej/cancel_elsewhere_1.4/channels/misdn/isdn_lib.c
    team/oej/cancel_elsewhere_1.4/channels/misdn/isdn_lib.h
    team/oej/cancel_elsewhere_1.4/channels/misdn/isdn_lib_intern.h
    team/oej/cancel_elsewhere_1.4/channels/misdn/isdn_msg_parser.c
    team/oej/cancel_elsewhere_1.4/channels/misdn_config.c
    team/oej/cancel_elsewhere_1.4/codecs/   (props changed)
    team/oej/cancel_elsewhere_1.4/codecs/Makefile
    team/oej/cancel_elsewhere_1.4/codecs/codec_zap.c
    team/oej/cancel_elsewhere_1.4/codecs/gsm/   (props changed)
    team/oej/cancel_elsewhere_1.4/codecs/gsm/src/long_term.c
    team/oej/cancel_elsewhere_1.4/codecs/gsm/src/lpc.c
    team/oej/cancel_elsewhere_1.4/codecs/ilbc/   (props changed)
    team/oej/cancel_elsewhere_1.4/codecs/ilbc/Makefile
    team/oej/cancel_elsewhere_1.4/codecs/lpc10/   (props changed)
    team/oej/cancel_elsewhere_1.4/codecs/lpc10/Makefile
    team/oej/cancel_elsewhere_1.4/configs/agents.conf.sample
    team/oej/cancel_elsewhere_1.4/configs/cdr.conf.sample
    team/oej/cancel_elsewhere_1.4/configs/extensions.ael.sample
    team/oej/cancel_elsewhere_1.4/configs/features.conf.sample
    team/oej/cancel_elsewhere_1.4/configs/misdn.conf.sample
    team/oej/cancel_elsewhere_1.4/configs/queues.conf.sample
    team/oej/cancel_elsewhere_1.4/configs/res_odbc.conf.sample
    team/oej/cancel_elsewhere_1.4/configs/sip.conf.sample
    team/oej/cancel_elsewhere_1.4/configs/users.conf.sample
    team/oej/cancel_elsewhere_1.4/configs/voicemail.conf.sample
    team/oej/cancel_elsewhere_1.4/configs/zapata.conf.sample
    team/oej/cancel_elsewhere_1.4/configure
    team/oej/cancel_elsewhere_1.4/configure.ac
    team/oej/cancel_elsewhere_1.4/contrib/scripts/safe_asterisk
    team/oej/cancel_elsewhere_1.4/doc/CODING-GUIDELINES
    team/oej/cancel_elsewhere_1.4/doc/PEERING
    team/oej/cancel_elsewhere_1.4/doc/asterisk-mib.txt
    team/oej/cancel_elsewhere_1.4/doc/localchannel.txt
    team/oej/cancel_elsewhere_1.4/doc/queues-with-callback-members.txt
    team/oej/cancel_elsewhere_1.4/doc/realtime.txt
    team/oej/cancel_elsewhere_1.4/formats/   (props changed)
    team/oej/cancel_elsewhere_1.4/formats/Makefile
    team/oej/cancel_elsewhere_1.4/formats/format_g726.c
    team/oej/cancel_elsewhere_1.4/formats/format_h263.c
    team/oej/cancel_elsewhere_1.4/formats/format_h264.c
    team/oej/cancel_elsewhere_1.4/formats/format_ogg_vorbis.c
    team/oej/cancel_elsewhere_1.4/formats/format_pcm.c
    team/oej/cancel_elsewhere_1.4/formats/format_wav.c
    team/oej/cancel_elsewhere_1.4/formats/format_wav_gsm.c
    team/oej/cancel_elsewhere_1.4/funcs/   (props changed)
    team/oej/cancel_elsewhere_1.4/funcs/Makefile
    team/oej/cancel_elsewhere_1.4/funcs/func_callerid.c
    team/oej/cancel_elsewhere_1.4/funcs/func_curl.c
    team/oej/cancel_elsewhere_1.4/funcs/func_cut.c
    team/oej/cancel_elsewhere_1.4/funcs/func_env.c
    team/oej/cancel_elsewhere_1.4/funcs/func_logic.c
    team/oej/cancel_elsewhere_1.4/funcs/func_odbc.c
    team/oej/cancel_elsewhere_1.4/funcs/func_realtime.c
    team/oej/cancel_elsewhere_1.4/funcs/func_strings.c
    team/oej/cancel_elsewhere_1.4/include/asterisk.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/ael_structs.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/agi.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/astobj2.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/autoconfig.h.in
    team/oej/cancel_elsewhere_1.4/include/asterisk/cdr.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/channel.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/cli.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/compat.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/compiler.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/file.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/frame.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/jabber.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/linkedlists.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/localtime.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/lock.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/logger.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/module.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/pbx.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/res_odbc.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/rtp.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/sched.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/srv.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/stringfields.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/strings.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/time.h
    team/oej/cancel_elsewhere_1.4/main/   (props changed)
    team/oej/cancel_elsewhere_1.4/main/Makefile
    team/oej/cancel_elsewhere_1.4/main/app.c
    team/oej/cancel_elsewhere_1.4/main/ast_expr2.fl
    team/oej/cancel_elsewhere_1.4/main/ast_expr2f.c
    team/oej/cancel_elsewhere_1.4/main/asterisk.c
    team/oej/cancel_elsewhere_1.4/main/astmm.c
    team/oej/cancel_elsewhere_1.4/main/astobj2.c
    team/oej/cancel_elsewhere_1.4/main/autoservice.c
    team/oej/cancel_elsewhere_1.4/main/cdr.c
    team/oej/cancel_elsewhere_1.4/main/channel.c
    team/oej/cancel_elsewhere_1.4/main/cli.c
    team/oej/cancel_elsewhere_1.4/main/config.c
    team/oej/cancel_elsewhere_1.4/main/db.c
    team/oej/cancel_elsewhere_1.4/main/db1-ast/   (props changed)
    team/oej/cancel_elsewhere_1.4/main/db1-ast/Makefile
    team/oej/cancel_elsewhere_1.4/main/db1-ast/hash/hash.c
    team/oej/cancel_elsewhere_1.4/main/dial.c
    team/oej/cancel_elsewhere_1.4/main/dnsmgr.c
    team/oej/cancel_elsewhere_1.4/main/dsp.c
    team/oej/cancel_elsewhere_1.4/main/editline/   (props changed)
    team/oej/cancel_elsewhere_1.4/main/editline/Makefile.in
    team/oej/cancel_elsewhere_1.4/main/editline/np/vis.c
    team/oej/cancel_elsewhere_1.4/main/file.c
    team/oej/cancel_elsewhere_1.4/main/loader.c
    team/oej/cancel_elsewhere_1.4/main/logger.c
    team/oej/cancel_elsewhere_1.4/main/manager.c
    team/oej/cancel_elsewhere_1.4/main/pbx.c
    team/oej/cancel_elsewhere_1.4/main/rtp.c
    team/oej/cancel_elsewhere_1.4/main/say.c
    team/oej/cancel_elsewhere_1.4/main/sched.c
    team/oej/cancel_elsewhere_1.4/main/srv.c
    team/oej/cancel_elsewhere_1.4/main/stdtime/localtime.c
    team/oej/cancel_elsewhere_1.4/main/stdtime/tzfile.h
    team/oej/cancel_elsewhere_1.4/main/tdd.c
    team/oej/cancel_elsewhere_1.4/main/threadstorage.c
    team/oej/cancel_elsewhere_1.4/main/translate.c
    team/oej/cancel_elsewhere_1.4/main/udptl.c
    team/oej/cancel_elsewhere_1.4/main/utils.c
    team/oej/cancel_elsewhere_1.4/makeopts.in
    team/oej/cancel_elsewhere_1.4/pbx/   (props changed)
    team/oej/cancel_elsewhere_1.4/pbx/Makefile
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ref.ael-ntest10
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ref.ael-test1
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ref.ael-test16
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ref.ael-test18
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ref.ael-test19
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ref.ael-test2
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ref.ael-test3
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ref.ael-test4
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ref.ael-test5
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ref.ael-test8
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ref.ael-vtest13
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael-test/ref.ael-vtest17
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael.flex
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael.tab.c
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael.tab.h
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael.y
    team/oej/cancel_elsewhere_1.4/pbx/ael/ael_lex.c
    team/oej/cancel_elsewhere_1.4/pbx/pbx_ael.c
    team/oej/cancel_elsewhere_1.4/pbx/pbx_config.c
    team/oej/cancel_elsewhere_1.4/pbx/pbx_dundi.c
    team/oej/cancel_elsewhere_1.4/pbx/pbx_realtime.c
    team/oej/cancel_elsewhere_1.4/pbx/pbx_spool.c
    team/oej/cancel_elsewhere_1.4/res/   (props changed)
    team/oej/cancel_elsewhere_1.4/res/Makefile
    team/oej/cancel_elsewhere_1.4/res/res_adsi.c
    team/oej/cancel_elsewhere_1.4/res/res_agi.c
    team/oej/cancel_elsewhere_1.4/res/res_config_odbc.c
    team/oej/cancel_elsewhere_1.4/res/res_config_pgsql.c
    team/oej/cancel_elsewhere_1.4/res/res_features.c
    team/oej/cancel_elsewhere_1.4/res/res_jabber.c
    team/oej/cancel_elsewhere_1.4/res/res_musiconhold.c
    team/oej/cancel_elsewhere_1.4/res/res_odbc.c
    team/oej/cancel_elsewhere_1.4/res/res_smdi.c
    team/oej/cancel_elsewhere_1.4/sounds/Makefile
    team/oej/cancel_elsewhere_1.4/utils/   (props changed)
    team/oej/cancel_elsewhere_1.4/utils/Makefile
    team/oej/cancel_elsewhere_1.4/utils/ael_main.c

Propchange: team/oej/cancel_elsewhere_1.4/
------------------------------------------------------------------------------
    automerge = http://www.codename-pineapple.org/

Propchange: team/oej/cancel_elsewhere_1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/oej/cancel_elsewhere_1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/oej/cancel_elsewhere_1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec 19 11:46:05 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-81581
+/branches/1.4:1-93923

Modified: team/oej/cancel_elsewhere_1.4/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/cancel_elsewhere_1.4/.cleancount?view=diff&rev=93958&r1=93957&r2=93958
==============================================================================
--- team/oej/cancel_elsewhere_1.4/.cleancount (original)
+++ team/oej/cancel_elsewhere_1.4/.cleancount Wed Dec 19 11:46:05 2007
@@ -1,1 +1,1 @@
-28
+30

Modified: team/oej/cancel_elsewhere_1.4/LICENSE
URL: http://svn.digium.com/view/asterisk/team/oej/cancel_elsewhere_1.4/LICENSE?view=diff&rev=93958&r1=93957&r2=93958
==============================================================================
--- team/oej/cancel_elsewhere_1.4/LICENSE (original)
+++ team/oej/cancel_elsewhere_1.4/LICENSE Wed Dec 19 11:46:05 2007
@@ -32,7 +32,7 @@
 would strongly encourage you to make the same exception that we do).
 
 Specific permission is also granted to link Asterisk with OpenSSL and
-OpenH323.
+OpenH323 and distribute the resulting binary files.
 
 In addition, Asterisk implements two management/control protocols: the
 Asterisk Manager Interface (AMI) and the Asterisk Gateway Interface
@@ -56,14 +56,13 @@
 If you have any questions regarding our licensing policy, please
 contact us:
 
-+1.877.546.8963 (via telephone in the USA)
++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)
 licensing at digium.com (via email)
 
 Digium, Inc.
-150 West Park Loop
-Suite 100
+445 Jan Davis Drive
 Huntsville, AL  35806
 USA

Modified: team/oej/cancel_elsewhere_1.4/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/cancel_elsewhere_1.4/Makefile?view=diff&rev=93958&r1=93957&r2=93958
==============================================================================
--- team/oej/cancel_elsewhere_1.4/Makefile (original)
+++ team/oej/cancel_elsewhere_1.4/Makefile Wed Dec 19 11:46:05 2007
@@ -58,6 +58,7 @@
 export SOLINK
 export STRIP
 export DOWNLOAD
+export AWK
 export GREP
 export ID
 export OSARCH
@@ -76,8 +77,9 @@
 endif
 
 # Some build systems, such as the one in openwrt, like to pass custom target
-# CFLAGS in the COPTS variable.
+# CFLAGS and LDFLAGS in the COPTS and LDOPTS variables.
 ASTCFLAGS+=$(COPTS)
+ASTLDFLAGS+=$(LDOPTS)
 
 #Uncomment this to see all build commands instead of 'quiet' output
 #NOISY_BUILD=yes
@@ -193,7 +195,11 @@
   endif
 endif
 
-ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
+ASTCFLAGS+=-pipe
+endif
+
+ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
 
 ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
 
@@ -233,10 +239,10 @@
   ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
 endif
 
-ASTERISKVERSION:=$(shell build_tools/make_version .)
+ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
 
 ifneq ($(wildcard .version),)
-  ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
+  ASTERISKVERSIONNUM:=$(shell $(AWK) -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
   RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
 else
   RPMVERSION=unknown
@@ -253,10 +259,12 @@
 SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
 SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
+SUBDIRS_DIST_CLEAN:=$(SUBDIRS:%=%-dist-clean)
 SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
 MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
 MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
 MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs)
+MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree)
 
 ifneq ($(findstring darwin,$(OSARCH)),)
   ASTCFLAGS+=-D__Darwin__
@@ -273,6 +281,8 @@
 ifeq ($(OSARCH),SunOS)
   SOLINK=-shared -fpic -L/usr/local/ssl/lib
 endif
+
+SUBMAKE=$(MAKE) --quiet --no-print-directory
 
 # This is used when generating the doxygen documentation
 ifneq ($(DOT),:)
@@ -306,13 +316,17 @@
 	menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
 
 $(MOD_SUBDIRS_EMBED_LDSCRIPT):
-	@echo "EMBED_LDSCRIPTS+="`$(MAKE) --quiet --no-print-directory -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
+	@echo "EMBED_LDSCRIPTS+="`$(SUBMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
 
 $(MOD_SUBDIRS_EMBED_LDFLAGS):
-	@echo "EMBED_LDFLAGS+="`$(MAKE) --quiet --no-print-directory -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
+	@echo "EMBED_LDFLAGS+="`$(SUBMAKE) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
 
 $(MOD_SUBDIRS_EMBED_LIBS):
-	@echo "EMBED_LIBS+="`$(MAKE) --quiet --no-print-directory -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+	@echo "EMBED_LIBS+="`$(SUBMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+
+$(MOD_SUBDIRS_MENUSELECT_TREE):
+	@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
+	@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
 
 makeopts.embed_rules: menuselect.makeopts
 	@echo "Generating embedded module rules ..."
@@ -359,6 +373,9 @@
 $(SUBDIRS_CLEAN):
 	@$(MAKE) --no-print-directory -C $(@:-clean=) clean
 
+$(SUBDIRS_DIST_CLEAN):
+	@$(MAKE) --no-print-directory -C $(@:-dist-clean=) dist-clean
+
 clean: $(SUBDIRS_CLEAN)
 	rm -f defaults.h
 	rm -f include/asterisk/build.h
@@ -368,7 +385,7 @@
 
 dist-clean: distclean
 
-distclean: 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
@@ -554,8 +571,31 @@
 		echo "astlogdir => $(ASTLOGDIR)" ; \
 		echo "" ; \
 		echo ";[options]" ; \
+		echo ";verbose = 3" ; \
+		echo ";debug = 3" ; \
+		echo ";alwaysfork = yes ; same as -F at startup" ; \
+		echo ";nofork = yes ; same as -f at startup" ; \
+		echo ";quiet = yes ; same as -q at startup" ; \
+		echo ";timestamp = yes ; same as -T at startup" ; \
+		echo ";execincludes = yes ; support #exec in config files" ; \
+		echo ";console = yes ; Run as console (same as -c at startup)" ; \
+		echo ";highpriority = yes ; Run realtime priority (same as -p at startup)" ; \
+		echo ";initcrypto = yes ; Initialize crypto keys (same as -i at startup)" ; \
+		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" ; \
+		echo ";maxload = 0.9 ; Asterisk stops accepting new calls if the load average exceed this limit" ; \
+		echo ";cache_record_files = yes ; Cache recorded sound files to another directory during recording" ; \
+		echo ";record_cache_dir = /tmp ; Specify cache directory (used in cnjunction with cache_record_files)" ; \
+		echo ";transmit_silence_during_record = yes ; Transmit SLINEAR silence while a channel is being recorded" ; \
+		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 "" ; \
 		echo "; Changing the following lines may compromise your security." ; \
 		echo ";[files]" ; \
 		echo ";astctlpermissions = 0660" ; \
@@ -616,20 +656,20 @@
 config:
 	@if [ "${OSARCH}" = "linux-gnu" ]; then \
 		if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
-			$(INSTALL) -m 755 contrib/init.d/rc.redhat.asterisk /etc/rc.d/init.d/asterisk; \
-			/sbin/chkconfig --add asterisk; \
+			$(INSTALL) -m 755 contrib/init.d/rc.redhat.asterisk $(DESTDIR)/etc/rc.d/init.d/asterisk; \
+			if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
 		elif [ -f /etc/debian_version ]; then \
-			$(INSTALL) -m 755 contrib/init.d/rc.debian.asterisk /etc/init.d/asterisk; \
-			/usr/sbin/update-rc.d asterisk start 10 2 3 4 5 . stop 91 2 3 4 5 .; \
+			$(INSTALL) -m 755 contrib/init.d/rc.debian.asterisk $(DESTDIR)/etc/init.d/asterisk; \
+			if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk start 50 2 3 4 5 . stop 91 2 3 4 5 .; fi; \
 		elif [ -f /etc/gentoo-release ]; then \
-			$(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk /etc/init.d/asterisk; \
-			/sbin/rc-update add asterisk default; \
-		elif [ -f /etc/mandrake-release ]; then \
-			$(INSTALL) -m 755 contrib/init.d/rc.mandrake.asterisk /etc/rc.d/init.d/asterisk; \
-			/sbin/chkconfig --add asterisk; \
+			$(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk $(DESTDIR)/etc/init.d/asterisk; \
+			if [ -z "$(DESTDIR)" ]; then /sbin/rc-update add asterisk default; fi; \
+		elif [ -f /etc/mandrake-release -o -f /etc/mandriva-release ]; then \
+			$(INSTALL) -m 755 contrib/init.d/rc.mandrake.asterisk $(DESTDIR)/etc/rc.d/init.d/asterisk; \
+			if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
 		elif [ -f /etc/SuSE-release -o -f /etc/novell-release ]; then \
-			$(INSTALL) -m 755 contrib/init.d/rc.suse.asterisk /etc/init.d/asterisk; \
-			/sbin/chkconfig --add asterisk; \
+			$(INSTALL) -m 755 contrib/init.d/rc.suse.asterisk $(DESTDIR)/etc/init.d/asterisk; \
+			if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
 		elif [ -f /etc/slackware-version ]; then \
 			echo "Slackware is not currently supported, although an init script does exist for it." \
 		else \
@@ -707,8 +747,16 @@
 menuselect/gmenuselect: makeopts menuselect/menuselect.c menuselect/menuselect_gtk.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
 	@CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect _gmenuselect CONFIGURE_SILENT="--silent"
 
-menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
+menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml configure
 	@echo "Generating input for menuselect ..."
-	@build_tools/prep_moduledeps > $@
-
-.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) menuselect.makeopts
+	@echo "<?xml version=\"1.0\"?>" > $@
+	@echo >> $@
+	@echo "<menu name=\"Asterisk Module and Build Option Selection\">" >> $@
+	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
+	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
+	@cat build_tools/cflags.xml >> $@
+	@cat build_tools/embed_modules.xml >> $@
+	@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) menuselect.makeopts

Modified: team/oej/cancel_elsewhere_1.4/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/oej/cancel_elsewhere_1.4/Makefile.moddir_rules?view=diff&rev=93958&r1=93957&r2=93958
==============================================================================
--- team/oej/cancel_elsewhere_1.4/Makefile.moddir_rules (original)
+++ team/oej/cancel_elsewhere_1.4/Makefile.moddir_rules Wed Dec 19 11:46:05 2007
@@ -42,7 +42,7 @@
 modules.link: $(addsuffix .o,$(filter $(EMBEDDED_MODS),$(C_MODS)))
 modules.link: $(addsuffix .oo,$(filter $(EMBEDDED_MODS),$(CC_MODS)))
 
-.PHONY: clean uninstall _all
+.PHONY: clean uninstall _all moduleinfo makeopts
 
 ifneq ($(LOADABLE_MODS),)
 _all: $(LOADABLE_MODS:%=%.so)
@@ -70,7 +70,7 @@
 	@for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
 
 clean::
-	rm -f *.so *.o *.oo
+	rm -f *.so *.o *.oo *.s *.i
 	rm -f .*.o.d .*.oo.d
 	rm -f modules.link
 
@@ -79,6 +79,40 @@
 
 uninstall::
 
+dist-clean::
+	rm -f .*.moduleinfo .moduleinfo
+	rm -f .*.makeopts .makeopts
+
+.%.moduleinfo: %.c
+	@echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.o $(SUBDIR)/$*.so\">" > $@
+	$(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@
+	echo "</member>" >> $@
+
+.%.moduleinfo: %.cc
+	@echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.oo $(SUBDIR)/$*.so\">" > $@
+	$(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@
+	echo "</member>" >> $@
+
+.moduleinfo:: $(addsuffix .moduleinfo,$(addprefix .,$(ALL_C_MODS) $(ALL_CC_MODS)))
+	@echo "<category name=\"MENUSELECT_$(MENUSELECT_CATEGORY)\" displayname=\"$(MENUSELECT_DESCRIPTION)\" remove_on_change=\"$(SUBDIR)/modules.link\">" > $@
+	@cat $^ >> $@
+	@echo "</category>" >> $@
+
+moduleinfo: .moduleinfo
+	@cat $<
+
+.%.makeopts: %.c
+	@$(AWK) -f $(ASTTOPDIR)/build_tools/get_makeopts $< > $@
+
+.%.makeopts: %.cc
+	@$(AWK) -f $(ASTTOPDIR)/build_tools/get_makeopts $< > $@
+
+.makeopts:: $(addsuffix .makeopts,$(addprefix .,$(ALL_C_MODS) $(ALL_CC_MODS)))
+	@cat $^ > $@
+
+makeopts: .makeopts
+	@cat $<
+
 ifneq ($(wildcard .*.d),)
    include .*.d
 endif

Modified: team/oej/cancel_elsewhere_1.4/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/oej/cancel_elsewhere_1.4/Makefile.rules?view=diff&rev=93958&r1=93957&r2=93958
==============================================================================
--- team/oej/cancel_elsewhere_1.4/Makefile.rules (original)
+++ team/oej/cancel_elsewhere_1.4/Makefile.rules Wed Dec 19 11:46:05 2007
@@ -16,6 +16,8 @@
 # behaviour. ECHO_PREFIX prefixes the comment, CMD_PREFIX prefixes the command.
 
 -include $(ASTTOPDIR)/makeopts
+
+.PHONY: dist-clean
 
 ifeq ($(NOISY_BUILD),)
    ECHO_PREFIX=@
@@ -38,27 +40,15 @@
 
 %.o: %.c
 	$(ECHO_PREFIX) echo "   [CC] $< -> $@"
-ifeq ($(AST_DEVMODE),yes)
 	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-else
-	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
-endif
 
 %.o: %.s
 	$(ECHO_PREFIX) echo "   [AS] $< -> $@"
-ifeq ($(AST_DEVMODE),yes)
 	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-else
-	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
-endif
 
 %.oo: %.cc
 	$(ECHO_PREFIX) echo "   [CXX] $< -> $@"
-ifeq ($(AST_DEVMODE),yes)
 	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS)) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-else
-	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS))
-endif
 
 %.c: %.y
 	$(ECHO_PREFIX) echo "   [BISON] $< -> $@"
@@ -79,3 +69,5 @@
 %: %.o
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(PTHREAD_LIBS) $(LIBS)
+
+dist-clean::

Modified: team/oej/cancel_elsewhere_1.4/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/cancel_elsewhere_1.4/UPGRADE.txt?view=diff&rev=93958&r1=93957&r2=93958
==============================================================================
--- team/oej/cancel_elsewhere_1.4/UPGRADE.txt (original)
+++ team/oej/cancel_elsewhere_1.4/UPGRADE.txt Wed Dec 19 11:46:05 2007
@@ -191,6 +191,11 @@
   provides more 'true' round-robin call delivery. For the Asterisk 1.6 release,
   'rrmemory' will be renamed 'roundrobin'.
 
+* The app_queue application option called 'monitor-join' has been deprecated
+  for this release. Users are encouraged to use 'monitor-type=mixmonitor' instead,
+  since it provides the same functionality but is not dependent on soxmix or some
+  other external program in order to mix the audio.
+
 * app_meetme: The 'm' option (monitor) is renamed to 'l' (listen only), and
   the 'm' option now provides the functionality of "initially muted". 
   In practice, most existing dialplans using the 'm' flag should not notice

Propchange: team/oej/cancel_elsewhere_1.4/agi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Dec 19 11:46:05 2007
@@ -1,4 +1,6 @@
 eagi-test
 eagi-sphinx-test
 *.d
+*.s
+*.i
 strcompat.c

Modified: team/oej/cancel_elsewhere_1.4/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/cancel_elsewhere_1.4/agi/Makefile?view=diff&rev=93958&r1=93957&r2=93958
==============================================================================
--- team/oej/cancel_elsewhere_1.4/agi/Makefile (original)
+++ team/oej/cancel_elsewhere_1.4/agi/Makefile Wed Dec 19 11:46:05 2007
@@ -39,7 +39,7 @@
 
 clean:
 	rm -f *.so *.o look eagi-test eagi-sphinx-test
-	rm -f .*.o.d .*.oo.d
+	rm -f .*.o.d .*.oo.d *.s *.i
 	rm -f strcompat.c
 
 ifneq ($(wildcard .*.d),)

Propchange: team/oej/cancel_elsewhere_1.4/apps/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Dec 19 11:46:05 2007
@@ -1,4 +1,8 @@
+*.a
 *.d
-*.a
+*.i
+*.makeopts
+*.moduleinfo
+*.s
 *.so
 modules.link

Modified: team/oej/cancel_elsewhere_1.4/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/cancel_elsewhere_1.4/apps/Makefile?view=diff&rev=93958&r1=93957&r2=93958
==============================================================================
--- team/oej/cancel_elsewhere_1.4/apps/Makefile (original)
+++ team/oej/cancel_elsewhere_1.4/apps/Makefile Wed Dec 19 11:46:05 2007
@@ -11,8 +11,14 @@
 
 -include ../menuselect.makeopts ../menuselect.makedeps
 
-C_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c)))
-CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.cc,%,$(wildcard app_*.cc)))
+MENUSELECT_CATEGORY=APPS
+MENUSELECT_DESCRIPTION=Applications
+
+ALL_C_MODS:=$(patsubst %.c,%,$(wildcard app_*.c))
+ALL_CC_MODS:=$(patsubst %.cc,%,$(wildcard app_*.cc))
+
+C_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_C_MODS))
+CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_CC_MODS))
 
 LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
 

Modified: team/oej/cancel_elsewhere_1.4/apps/app_controlplayback.c
URL: http://svn.digium.com/view/asterisk/team/oej/cancel_elsewhere_1.4/apps/app_controlplayback.c?view=diff&rev=93958&r1=93957&r2=93958
==============================================================================
--- team/oej/cancel_elsewhere_1.4/apps/app_controlplayback.c (original)
+++ team/oej/cancel_elsewhere_1.4/apps/app_controlplayback.c Wed Dec 19 11:46:05 2007
@@ -132,7 +132,7 @@
 	res = ast_control_streamfile(chan, argv[arg_file], argv[arg_fwd], argv[arg_rev], argv[arg_stop], argv[arg_pause], argv[arg_restart], skipms);
 
 	/* If we stopped on one of our stop keys, return 0  */
-	if (argv[arg_stop] && strchr(argv[arg_stop], res)) {
+	if (res > 0 && argv[arg_stop] && strchr(argv[arg_stop], res)) {
 		res = 0;
 		pbx_builtin_setvar_helper(chan, "CPLAYBACKSTATUS", "USERSTOPPED");
 	} else {

Modified: team/oej/cancel_elsewhere_1.4/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/oej/cancel_elsewhere_1.4/apps/app_dial.c?view=diff&rev=93958&r1=93957&r2=93958
==============================================================================
--- team/oej/cancel_elsewhere_1.4/apps/app_dial.c (original)
+++ team/oej/cancel_elsewhere_1.4/apps/app_dial.c Wed Dec 19 11:46:05 2007
@@ -57,9 +57,11 @@
 #include "asterisk/app.h"
 #include "asterisk/causes.h"
 #include "asterisk/rtp.h"
+#include "asterisk/cdr.h"
 #include "asterisk/manager.h"
 #include "asterisk/privacy.h"
 #include "asterisk/stringfields.h"
+#include "asterisk/global_datastores.h"
 
 static char *app = "Dial";
 
@@ -295,6 +297,10 @@
 	AST_APP_OPTION('W', OPT_CALLER_MONITOR),
 });
 
+#define CAN_EARLY_BRIDGE(flags) (!ast_test_flag(flags, OPT_CALLEE_HANGUP | \
+	OPT_CALLER_HANGUP | OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER | \
+	OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR | OPT_CALLEE_PARK | OPT_CALLER_PARK))
+
 /* We define a custom "local user" structure because we
    use it not only for keeping track of what is in use but
    also for keeping track of who we're dialing. */
@@ -302,7 +308,6 @@
 struct dial_localuser {
 	struct ast_channel *chan;
 	unsigned int flags;
-	int forwards;
 	struct dial_localuser *next;
 };
 
@@ -323,8 +328,6 @@
 		free(oo);
 	}
 }
-
-#define AST_MAX_FORWARDS   8
 
 #define AST_MAX_WATCHERS 256
 
@@ -490,30 +493,23 @@
 					tech = "Local";
 				}
 				/* Before processing channel, go ahead and check for forwarding */
-				o->forwards++;
-				if (o->forwards < AST_MAX_FORWARDS) {
+				if (option_verbose > 2)
+					ast_verbose(VERBOSE_PREFIX_3 "Now forwarding %s to '%s/%s' (thanks to %s)\n", in->name, tech, stuff, c->name);
+				/* If we have been told to ignore forwards, just set this channel to null and continue processing extensions normally */
+				if (ast_test_flag(peerflags, OPT_IGNORE_FORWARDING)) {
 					if (option_verbose > 2)
-						ast_verbose(VERBOSE_PREFIX_3 "Now forwarding %s to '%s/%s' (thanks to %s)\n", in->name, tech, stuff, c->name);
-					/* If we have been told to ignore forwards, just set this channel to null and continue processing extensions normally */
-					if (ast_test_flag(peerflags, OPT_IGNORE_FORWARDING)) {
-						if (option_verbose > 2)
-							ast_verbose(VERBOSE_PREFIX_3 "Forwarding %s to '%s/%s' prevented.\n", in->name, tech, stuff);
-						c = o->chan = NULL;
-						cause = AST_CAUSE_BUSY;
-					} else {
-						/* Setup parameters */
-						if ((c = o->chan = ast_request(tech, in->nativeformats, stuff, &cause))) {
-							if (single)
-								ast_channel_make_compatible(o->chan, in);
-							ast_channel_inherit_variables(in, o->chan);
-						} else
-							ast_log(LOG_NOTICE, "Unable to create local channel for call forward to '%s/%s' (cause = %d)\n", tech, stuff, cause);
-					}
+						ast_verbose(VERBOSE_PREFIX_3 "Forwarding %s to '%s/%s' prevented.\n", in->name, tech, stuff);
+					c = o->chan = NULL;
+					cause = AST_CAUSE_BUSY;
 				} else {
-					if (option_verbose > 2)
-						ast_verbose(VERBOSE_PREFIX_3 "Too many forwards from %s\n", c->name);
-					cause = AST_CAUSE_CONGESTION;
-					c = o->chan = NULL;
+					/* Setup parameters */
+					if ((c = o->chan = ast_request(tech, in->nativeformats, stuff, &cause))) {
+						if (single)
+							ast_channel_make_compatible(o->chan, in);
+						ast_channel_inherit_variables(in, o->chan);
+						ast_channel_datastore_inherit(in, o->chan);
+					} else
+						ast_log(LOG_NOTICE, "Unable to create local channel for call forward to '%s/%s' (cause = %d)\n", tech, stuff, cause);
 				}
 				if (!c) {
 					ast_clear_flag(o, DIAL_STILLGOING);	
@@ -591,7 +587,8 @@
 						ast_copy_string(c->dialcontext, "", sizeof(c->dialcontext));
 						ast_copy_string(c->exten, "", sizeof(c->exten));
 						/* Setup RTP early bridge if appropriate */
-						ast_rtp_early_bridge(in, peer);
+						if (CAN_EARLY_BRIDGE(peerflags))
+							ast_rtp_early_bridge(in, peer);
 					}
 					/* If call has been answered, then the eventual hangup is likely to be normal hangup */
 					in->hangupcause = AST_CAUSE_NORMAL_CLEARING;
@@ -619,7 +616,7 @@
 					if (option_verbose > 2)
 						ast_verbose(VERBOSE_PREFIX_3 "%s is ringing\n", c->name);
 					/* Setup early media if appropriate */
-					if (single)

[... 27428 lines stripped ...]

More information about the asterisk-commits mailing list