[asterisk-commits] oej: branch oej/meetmefixes-1.4 r168710 - in /team/oej/meetmefixes-1.4: ./ ag...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Jan 15 10:54:51 CST 2009


Author: oej
Date: Thu Jan 15 10:54:50 2009
New Revision: 168710

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168710
Log:
oejmerge while automerge is on vacation

Added:
    team/oej/meetmefixes-1.4/autoconf/
      - copied from r168633, branches/1.4/autoconf/
    team/oej/meetmefixes-1.4/autoconf/acx_pthread.m4
      - copied unchanged from r168633, branches/1.4/autoconf/acx_pthread.m4
    team/oej/meetmefixes-1.4/autoconf/ast_c_compile_check.m4
      - copied unchanged from r168633, branches/1.4/autoconf/ast_c_compile_check.m4
    team/oej/meetmefixes-1.4/autoconf/ast_c_define_check.m4
      - copied unchanged from r168633, branches/1.4/autoconf/ast_c_define_check.m4
    team/oej/meetmefixes-1.4/autoconf/ast_check_gnu_make.m4
      - copied unchanged from r168633, branches/1.4/autoconf/ast_check_gnu_make.m4
    team/oej/meetmefixes-1.4/autoconf/ast_check_openh323.m4
      - copied unchanged from r168633, branches/1.4/autoconf/ast_check_openh323.m4
    team/oej/meetmefixes-1.4/autoconf/ast_check_pwlib.m4
      - copied unchanged from r168633, branches/1.4/autoconf/ast_check_pwlib.m4
    team/oej/meetmefixes-1.4/autoconf/ast_ext_lib.m4
      - copied unchanged from r168633, branches/1.4/autoconf/ast_ext_lib.m4
    team/oej/meetmefixes-1.4/autoconf/ast_func_fork.m4
      - copied unchanged from r168633, branches/1.4/autoconf/ast_func_fork.m4
    team/oej/meetmefixes-1.4/autoconf/ast_gcc_attribute.m4
      - copied unchanged from r168633, branches/1.4/autoconf/ast_gcc_attribute.m4
    team/oej/meetmefixes-1.4/autoconf/ast_prog_egrep.m4
      - copied unchanged from r168633, branches/1.4/autoconf/ast_prog_egrep.m4
    team/oej/meetmefixes-1.4/autoconf/ast_prog_ld.m4
      - copied unchanged from r168633, branches/1.4/autoconf/ast_prog_ld.m4
    team/oej/meetmefixes-1.4/autoconf/ast_prog_ld_gnu.m4
      - copied unchanged from r168633, branches/1.4/autoconf/ast_prog_ld_gnu.m4
    team/oej/meetmefixes-1.4/autoconf/ast_prog_sed.m4
      - copied unchanged from r168633, branches/1.4/autoconf/ast_prog_sed.m4
    team/oej/meetmefixes-1.4/channels/busy_tone.h
      - copied unchanged from r168633, branches/1.4/channels/busy_tone.h
    team/oej/meetmefixes-1.4/channels/ring_tone.h
      - copied unchanged from r168633, branches/1.4/channels/ring_tone.h
    team/oej/meetmefixes-1.4/funcs/func_audiohookinherit.c
      - copied unchanged from r168633, branches/1.4/funcs/func_audiohookinherit.c
Removed:
    team/oej/meetmefixes-1.4/acinclude.m4
Modified:
    team/oej/meetmefixes-1.4/   (props changed)
    team/oej/meetmefixes-1.4/.cleancount
    team/oej/meetmefixes-1.4/CHANGES
    team/oej/meetmefixes-1.4/Makefile
    team/oej/meetmefixes-1.4/Makefile.moddir_rules
    team/oej/meetmefixes-1.4/Makefile.rules
    team/oej/meetmefixes-1.4/README
    team/oej/meetmefixes-1.4/agi/Makefile
    team/oej/meetmefixes-1.4/agi/eagi-sphinx-test.c
    team/oej/meetmefixes-1.4/agi/eagi-test.c
    team/oej/meetmefixes-1.4/apps/app_adsiprog.c
    team/oej/meetmefixes-1.4/apps/app_authenticate.c
    team/oej/meetmefixes-1.4/apps/app_chanspy.c
    team/oej/meetmefixes-1.4/apps/app_dahdibarge.c
    team/oej/meetmefixes-1.4/apps/app_dahdiscan.c
    team/oej/meetmefixes-1.4/apps/app_dial.c
    team/oej/meetmefixes-1.4/apps/app_directed_pickup.c
    team/oej/meetmefixes-1.4/apps/app_directory.c
    team/oej/meetmefixes-1.4/apps/app_disa.c
    team/oej/meetmefixes-1.4/apps/app_festival.c
    team/oej/meetmefixes-1.4/apps/app_followme.c
    team/oej/meetmefixes-1.4/apps/app_macro.c
    team/oej/meetmefixes-1.4/apps/app_meetme.c
    team/oej/meetmefixes-1.4/apps/app_page.c
    team/oej/meetmefixes-1.4/apps/app_queue.c
    team/oej/meetmefixes-1.4/apps/app_read.c
    team/oej/meetmefixes-1.4/apps/app_realtime.c
    team/oej/meetmefixes-1.4/apps/app_rpt.c
    team/oej/meetmefixes-1.4/apps/app_sms.c
    team/oej/meetmefixes-1.4/apps/app_speech_utils.c
    team/oej/meetmefixes-1.4/apps/app_voicemail.c
    team/oej/meetmefixes-1.4/apps/app_waitforsilence.c
    team/oej/meetmefixes-1.4/apps/app_while.c
    team/oej/meetmefixes-1.4/bootstrap.sh
    team/oej/meetmefixes-1.4/cdr/cdr_odbc.c
    team/oej/meetmefixes-1.4/channels/   (props changed)
    team/oej/meetmefixes-1.4/channels/Makefile
    team/oej/meetmefixes-1.4/channels/chan_agent.c
    team/oej/meetmefixes-1.4/channels/chan_alsa.c
    team/oej/meetmefixes-1.4/channels/chan_dahdi.c
    team/oej/meetmefixes-1.4/channels/chan_h323.c
    team/oej/meetmefixes-1.4/channels/chan_iax2.c
    team/oej/meetmefixes-1.4/channels/chan_local.c
    team/oej/meetmefixes-1.4/channels/chan_misdn.c
    team/oej/meetmefixes-1.4/channels/chan_oss.c
    team/oej/meetmefixes-1.4/channels/chan_phone.c
    team/oej/meetmefixes-1.4/channels/chan_sip.c
    team/oej/meetmefixes-1.4/channels/chan_skinny.c
    team/oej/meetmefixes-1.4/channels/chan_vpb.cc
    team/oej/meetmefixes-1.4/channels/misdn/   (props changed)
    team/oej/meetmefixes-1.4/channels/misdn/Makefile
    team/oej/meetmefixes-1.4/channels/misdn/isdn_lib.c
    team/oej/meetmefixes-1.4/channels/misdn_config.c
    team/oej/meetmefixes-1.4/codecs/codec_dahdi.c
    team/oej/meetmefixes-1.4/codecs/gsm/Makefile
    team/oej/meetmefixes-1.4/codecs/gsm/src/   (props changed)
    team/oej/meetmefixes-1.4/configs/agents.conf.sample
    team/oej/meetmefixes-1.4/configs/features.conf.sample
    team/oej/meetmefixes-1.4/configs/indications.conf.sample
    team/oej/meetmefixes-1.4/configs/voicemail.conf.sample
    team/oej/meetmefixes-1.4/configure
    team/oej/meetmefixes-1.4/configure.ac
    team/oej/meetmefixes-1.4/contrib/asterisk-ng-doxygen
    team/oej/meetmefixes-1.4/contrib/scripts/autosupport
    team/oej/meetmefixes-1.4/doc/misdn.txt
    team/oej/meetmefixes-1.4/doc/valgrind.txt
    team/oej/meetmefixes-1.4/formats/format_gsm.c
    team/oej/meetmefixes-1.4/formats/format_ogg_vorbis.c
    team/oej/meetmefixes-1.4/formats/format_wav.c
    team/oej/meetmefixes-1.4/formats/format_wav_gsm.c
    team/oej/meetmefixes-1.4/funcs/func_callerid.c
    team/oej/meetmefixes-1.4/funcs/func_cdr.c
    team/oej/meetmefixes-1.4/funcs/func_channel.c
    team/oej/meetmefixes-1.4/funcs/func_curl.c
    team/oej/meetmefixes-1.4/funcs/func_cut.c
    team/oej/meetmefixes-1.4/funcs/func_enum.c
    team/oej/meetmefixes-1.4/funcs/func_groupcount.c
    team/oej/meetmefixes-1.4/funcs/func_logic.c
    team/oej/meetmefixes-1.4/funcs/func_math.c
    team/oej/meetmefixes-1.4/funcs/func_odbc.c
    team/oej/meetmefixes-1.4/funcs/func_strings.c
    team/oej/meetmefixes-1.4/funcs/func_timeout.c
    team/oej/meetmefixes-1.4/include/asterisk/ael_structs.h
    team/oej/meetmefixes-1.4/include/asterisk/astmm.h
    team/oej/meetmefixes-1.4/include/asterisk/astobj2.h
    team/oej/meetmefixes-1.4/include/asterisk/audiohook.h
    team/oej/meetmefixes-1.4/include/asterisk/autoconfig.h.in
    team/oej/meetmefixes-1.4/include/asterisk/channel.h
    team/oej/meetmefixes-1.4/include/asterisk/cli.h
    team/oej/meetmefixes-1.4/include/asterisk/dahdi_compat.h
    team/oej/meetmefixes-1.4/include/asterisk/devicestate.h
    team/oej/meetmefixes-1.4/include/asterisk/dundi.h
    team/oej/meetmefixes-1.4/include/asterisk/features.h
    team/oej/meetmefixes-1.4/include/asterisk/file.h
    team/oej/meetmefixes-1.4/include/asterisk/frame.h
    team/oej/meetmefixes-1.4/include/asterisk/indications.h
    team/oej/meetmefixes-1.4/include/asterisk/linkedlists.h
    team/oej/meetmefixes-1.4/include/asterisk/lock.h
    team/oej/meetmefixes-1.4/include/asterisk/logger.h
    team/oej/meetmefixes-1.4/include/asterisk/manager.h
    team/oej/meetmefixes-1.4/include/asterisk/module.h
    team/oej/meetmefixes-1.4/include/asterisk/pbx.h
    team/oej/meetmefixes-1.4/include/asterisk/res_odbc.h
    team/oej/meetmefixes-1.4/include/asterisk/stringfields.h
    team/oej/meetmefixes-1.4/include/asterisk/strings.h
    team/oej/meetmefixes-1.4/include/asterisk/threadstorage.h
    team/oej/meetmefixes-1.4/include/asterisk/utils.h
    team/oej/meetmefixes-1.4/include/jitterbuf.h
    team/oej/meetmefixes-1.4/main/app.c
    team/oej/meetmefixes-1.4/main/ast_expr2.c
    team/oej/meetmefixes-1.4/main/ast_expr2f.c
    team/oej/meetmefixes-1.4/main/asterisk.c
    team/oej/meetmefixes-1.4/main/astobj2.c
    team/oej/meetmefixes-1.4/main/audiohook.c
    team/oej/meetmefixes-1.4/main/autoservice.c
    team/oej/meetmefixes-1.4/main/callerid.c
    team/oej/meetmefixes-1.4/main/cdr.c
    team/oej/meetmefixes-1.4/main/channel.c
    team/oej/meetmefixes-1.4/main/cli.c
    team/oej/meetmefixes-1.4/main/db.c
    team/oej/meetmefixes-1.4/main/db1-ast/Makefile
    team/oej/meetmefixes-1.4/main/db1-ast/btree/   (props changed)
    team/oej/meetmefixes-1.4/main/db1-ast/db/   (props changed)
    team/oej/meetmefixes-1.4/main/db1-ast/hash/   (props changed)
    team/oej/meetmefixes-1.4/main/db1-ast/hash/hash_page.c
    team/oej/meetmefixes-1.4/main/db1-ast/mpool/   (props changed)
    team/oej/meetmefixes-1.4/main/db1-ast/recno/   (props changed)
    team/oej/meetmefixes-1.4/main/dns.c
    team/oej/meetmefixes-1.4/main/editline/read.c
    team/oej/meetmefixes-1.4/main/enum.c
    team/oej/meetmefixes-1.4/main/file.c
    team/oej/meetmefixes-1.4/main/frame.c
    team/oej/meetmefixes-1.4/main/http.c
    team/oej/meetmefixes-1.4/main/indications.c
    team/oej/meetmefixes-1.4/main/jitterbuf.c
    team/oej/meetmefixes-1.4/main/logger.c
    team/oej/meetmefixes-1.4/main/manager.c
    team/oej/meetmefixes-1.4/main/pbx.c
    team/oej/meetmefixes-1.4/main/rtp.c
    team/oej/meetmefixes-1.4/main/srv.c
    team/oej/meetmefixes-1.4/main/stdtime/   (props changed)
    team/oej/meetmefixes-1.4/main/stdtime/Makefile
    team/oej/meetmefixes-1.4/main/threadstorage.c
    team/oej/meetmefixes-1.4/main/translate.c
    team/oej/meetmefixes-1.4/main/udptl.c
    team/oej/meetmefixes-1.4/main/utils.c
    team/oej/meetmefixes-1.4/makeopts.in
    team/oej/meetmefixes-1.4/pbx/Makefile
    team/oej/meetmefixes-1.4/pbx/ael/   (props changed)
    team/oej/meetmefixes-1.4/pbx/ael/ael.flex
    team/oej/meetmefixes-1.4/pbx/ael/ael.tab.c
    team/oej/meetmefixes-1.4/pbx/ael/ael.tab.h
    team/oej/meetmefixes-1.4/pbx/ael/ael.y
    team/oej/meetmefixes-1.4/pbx/ael/ael_lex.c
    team/oej/meetmefixes-1.4/pbx/pbx_ael.c
    team/oej/meetmefixes-1.4/pbx/pbx_config.c
    team/oej/meetmefixes-1.4/pbx/pbx_dundi.c
    team/oej/meetmefixes-1.4/pbx/pbx_spool.c
    team/oej/meetmefixes-1.4/res/Makefile
    team/oej/meetmefixes-1.4/res/res_agi.c
    team/oej/meetmefixes-1.4/res/res_crypto.c
    team/oej/meetmefixes-1.4/res/res_features.c
    team/oej/meetmefixes-1.4/res/res_indications.c
    team/oej/meetmefixes-1.4/res/res_jabber.c
    team/oej/meetmefixes-1.4/res/res_musiconhold.c
    team/oej/meetmefixes-1.4/res/res_smdi.c
    team/oej/meetmefixes-1.4/res/snmp/   (props changed)
    team/oej/meetmefixes-1.4/res/snmp/agent.c
    team/oej/meetmefixes-1.4/sounds/Makefile
    team/oej/meetmefixes-1.4/utils/Makefile
    team/oej/meetmefixes-1.4/utils/astman.c
    team/oej/meetmefixes-1.4/utils/check_expr.c
    team/oej/meetmefixes-1.4/utils/frame.c
    team/oej/meetmefixes-1.4/utils/muted.c
    team/oej/meetmefixes-1.4/utils/smsq.c
    team/oej/meetmefixes-1.4/utils/stereorize.c
    team/oej/meetmefixes-1.4/utils/streamplayer.c

Propchange: team/oej/meetmefixes-1.4/
------------------------------------------------------------------------------
--- automerge (original)
+++ automerge Thu Jan 15 10:54:50 2009
@@ -1,1 +1,1 @@
-Find out more about chan_sip3 at http://www.codename-pineapple.org
+http://www.codename-pineapple.org/

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

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

Propchange: team/oej/meetmefixes-1.4/
------------------------------------------------------------------------------
--- reviewboard:url (added)
+++ reviewboard:url Thu Jan 15 10:54:50 2009
@@ -1,0 +1,1 @@
+http://reviewboard.digium.com

Propchange: team/oej/meetmefixes-1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jan 15 10:54:50 2009
@@ -1,1 +1,1 @@
-/branches/1.4:1-146014
+/branches/1.4:1-168705

Modified: team/oej/meetmefixes-1.4/.cleancount
URL: http://svn.digium.com/svn-view/asterisk/team/oej/meetmefixes-1.4/.cleancount?view=diff&rev=168710&r1=168709&r2=168710
==============================================================================
--- team/oej/meetmefixes-1.4/.cleancount (original)
+++ team/oej/meetmefixes-1.4/.cleancount Thu Jan 15 10:54:50 2009
@@ -1,1 +1,1 @@
-32
+33

Modified: team/oej/meetmefixes-1.4/CHANGES
URL: http://svn.digium.com/svn-view/asterisk/team/oej/meetmefixes-1.4/CHANGES?view=diff&rev=168710&r1=168709&r2=168710
==============================================================================
--- team/oej/meetmefixes-1.4/CHANGES (original)
+++ team/oej/meetmefixes-1.4/CHANGES Thu Jan 15 10:54:50 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:
@@ -203,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
@@ -229,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
@@ -295,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
@@ -305,18 +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

Modified: team/oej/meetmefixes-1.4/Makefile
URL: http://svn.digium.com/svn-view/asterisk/team/oej/meetmefixes-1.4/Makefile?view=diff&rev=168710&r1=168709&r2=168710
==============================================================================
--- team/oej/meetmefixes-1.4/Makefile (original)
+++ team/oej/meetmefixes-1.4/Makefile Thu Jan 15 10:54:50 2009
@@ -204,7 +204,14 @@
 ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
 
 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)),)
@@ -269,7 +276,7 @@
   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
@@ -373,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
@@ -382,7 +391,7 @@
 
 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
@@ -758,6 +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 installdirs
+.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/meetmefixes-1.4/Makefile.moddir_rules
URL: http://svn.digium.com/svn-view/asterisk/team/oej/meetmefixes-1.4/Makefile.moddir_rules?view=diff&rev=168710&r1=168709&r2=168710
==============================================================================
--- team/oej/meetmefixes-1.4/Makefile.moddir_rules (original)
+++ team/oej/meetmefixes-1.4/Makefile.moddir_rules Thu Jan 15 10:54:50 2009
@@ -64,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/meetmefixes-1.4/Makefile.rules
URL: http://svn.digium.com/svn-view/asterisk/team/oej/meetmefixes-1.4/Makefile.rules?view=diff&rev=168710&r1=168709&r2=168710
==============================================================================
--- team/oej/meetmefixes-1.4/Makefile.rules (original)
+++ team/oej/meetmefixes-1.4/Makefile.rules Thu Jan 15 10:54:50 2009
@@ -3,7 +3,7 @@
 # 
 # Makefile rules
 #
-# Copyright (C) 2006, Digium, Inc.
+# Copyright (C) 2006-2008, Digium, Inc.
 #
 # Kevin P. Fleming <kpfleming at digium.com>
 #
@@ -19,44 +19,92 @@
 
 .PHONY: dist-clean
 
+# If 'make' decides to create intermediate files to satisfy a build requirement
+# (like producing a .i from a .c), we want to keep them, so tell make to keep
+# all intermediate files
+.SECONDARY:
+
+# extra cflags to build dependencies. Recursively expanded.
+MAKE_DEPS=-MD -MT $@ -MF .$(subst /,_,$@).d -MP
+
 ifeq ($(NOISY_BUILD),)
-   ECHO_PREFIX=@
-   CMD_PREFIX=@
+    ECHO_PREFIX=@
+    CMD_PREFIX=@
 else
-   ECHO_PREFIX=@\# 
-   CMD_PREFIX=
+    ECHO_PREFIX=@\# 
+    CMD_PREFIX=
 endif
 
+OPTIMIZE?=-O6
+
 ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
-# More GSM codec optimization
-# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-# which support MMX instructions.  This should be newer pentiums,
-# ppro's, etc, as well as the AMD K6 and K7.  
-#K6OPT=-DK6OPT
+    # More GSM codec optimization
+    # Uncomment to enable MMXTM optimizations for x86 architecture CPU's
+    # which support MMX instructions.  This should be newer pentiums,
+    # ppro's, etc, as well as the AMD K6 and K7.  
+    #K6OPT=-DK6OPT
 
-OPTIMIZE?=-O6
-ASTCFLAGS+=$(OPTIMIZE)
+    ASTCFLAGS+=$(OPTIMIZE)
 endif
 
-%.o: %.c
-	$(ECHO_PREFIX) echo "   [CC] $< -> $@"
-	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MD -MT $@ -MF .$(subst /,_,$@).d -MP
+# shortcuts for common combinations of flags; these must be recursively expanded so that
+# per-target settings will be applied
+CC_CFLAGS=$(PTHREAD_CFLAGS) $(ASTCFLAGS)
+CXX_CFLAGS=$(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_DECLARATION_AFTER_STATEMENT),$(ASTCFLAGS))
+CC_LDFLAGS_SO=$(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK)
+CXX_LDFLAGS_SO=$(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK)
+CC_LIBS=$(PTHREAD_LIBS) $(LIBS)
+CXX_LIBS=$(PTHREAD_LIBS) $(LIBS)
+
+# determine whether to double-compile so that the optimizer can report code path problems
+# this is only done when developer mode and DONT_OPTIMIZE are both enabled
+# in that case, we run the preprocessor to produce a .i or .ii file from the source
+# code, then compile once with optimizer enabled (and the output to /dev/null),
+# and if that doesn't fail then compile again with optimizer disabled
+ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS))$(AST_DEVMODE),DONT_OPTIMIZEyes)
+COMPILE_DOUBLE=yes
+endif
+
+%.o: %.s
+	$(ECHO_PREFIX) echo "   [AS] $< -> $@"
+ifeq ($(COMPILE_DOUBLE),yes)
+	$(CMD_PREFIX) $(CC) -o /dev/null -c $< $(CC_CFLAGS) $(OPTIMIZE)
+endif
+	$(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS)
 
 %.o: %.i
 	$(ECHO_PREFIX) echo "   [CCi] $< -> $@"
-	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MD -MT $@ -MF .$(subst /,_,$@).d -MP
+ifeq ($(COMPILE_DOUBLE),yes)
+	$(CMD_PREFIX) $(CC) -o /dev/null -c $< $(CC_CFLAGS) $(OPTIMIZE)
+endif
+	$(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS)
+
+ifneq ($(COMPILE_DOUBLE),yes)
+%.o: %.c
+	$(ECHO_PREFIX) echo "   [CC] $< -> $@"
+	$(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS) $(MAKE_DEPS)
+endif
 
 %.i: %.c
 	$(ECHO_PREFIX) echo "   [CPP] $< -> $@"
-	$(CMD_PREFIX) $(CC) -o $@ -E $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MD -MT $@ -MF .$(subst /,_,$@).d -MP
+	$(CMD_PREFIX) $(CC) -o $@ -E $< $(CC_CFLAGS) $(MAKE_DEPS)
 
-%.o: %.s
-	$(ECHO_PREFIX) echo "   [AS] $< -> $@"
-	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MD -MT $@ -MF .$(subst /,_,$@).d -MP
+%.oo: %.ii
+	$(ECHO_PREFIX) echo "   [CXXi] $< -> $@"
+ifeq ($(COMPILE_DOUBLE),yes)
+	$(CMD_PREFIX) $(CXX) -o /dev/null -c $< $(CXX_CFLAGS) $(OPTIMIZE)
+endif
+	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(CXX_CFLAGS)
 
+ifneq ($(COMPILE_DOUBLE),yes)
 %.oo: %.cc
 	$(ECHO_PREFIX) echo "   [CXX] $< -> $@"
-	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_DECLARATION_AFTER_STATEMENT),$(ASTCFLAGS)) -MD -MT $@ -MF .$(subst /,_,$@).d -MP
+	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(CXX_CFLAGS) $(MAKE_DEPS)
+endif
+
+%.ii: %.cc
+	$(ECHO_PREFIX) echo "   [CPP] $< -> $@"
+	$(CMD_PREFIX) $(CXX) -o $@ -E $< $(CXX_CFLAGS) $(MAKE_DEPS)
 
 %.c: %.y
 	$(ECHO_PREFIX) echo "   [BISON] $< -> $@"
@@ -68,14 +116,14 @@
 
 %.so: %.o
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
-	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $^ $(PTHREAD_LIBS) $(LIBS)
+	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(CC_LDFLAGS_SO) $^ $(CC_LIBS)
 
 %.so: %.oo
 	$(ECHO_PREFIX) echo "   [LDXX] $^ -> $@"
-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $^ $(PTHREAD_LIBS) $(LIBS)
+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(CXX_LDFLAGS_SO) $^ $(CXX_LIBS)
 
 %: %.o
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(PTHREAD_LIBS) $(LIBS)
+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(CXX_LIBS)
 
-dist-clean::
+dist-clean:: clean

Modified: team/oej/meetmefixes-1.4/README
URL: http://svn.digium.com/svn-view/asterisk/team/oej/meetmefixes-1.4/README?view=diff&rev=168710&r1=168709&r2=168710
==============================================================================
--- team/oej/meetmefixes-1.4/README (original)
+++ team/oej/meetmefixes-1.4/README Thu Jan 15 10:54:50 2009
@@ -2,7 +2,7 @@
 by Mark Spencer <markster at digium.com>
 and the Asterisk.org developer community
 
-Copyright (C) 2001-2008 Digium, Inc.
+Copyright (C) 2001-2009 Digium, Inc.
 and other copyright holders.
 ================================================================
 
@@ -11,7 +11,7 @@
 the security information file (doc/security.txt) before you attempt 
 to configure and run an Asterisk server.
 
-* WHAT IS ASTERISK ?
+* WHAT IS ASTERISK?
   Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
 sense, middleware between Internet and telephony channels on the bottom,
 and Internet and telephony applications at the top.  For more information

Modified: team/oej/meetmefixes-1.4/agi/Makefile
URL: http://svn.digium.com/svn-view/asterisk/team/oej/meetmefixes-1.4/agi/Makefile?view=diff&rev=168710&r1=168709&r2=168710
==============================================================================
--- team/oej/meetmefixes-1.4/agi/Makefile (original)
+++ team/oej/meetmefixes-1.4/agi/Makefile Thu Jan 15 10:54:50 2009
@@ -39,7 +39,7 @@
 
 clean:
 	rm -f *.so *.o look eagi-test eagi-sphinx-test
-	rm -f .*.o.d .*.oo.d *.s *.i
+	rm -f .*.d *.s *.i
 	rm -f strcompat.c
 
 ifneq ($(wildcard .*.d),)

Modified: team/oej/meetmefixes-1.4/agi/eagi-sphinx-test.c
URL: http://svn.digium.com/svn-view/asterisk/team/oej/meetmefixes-1.4/agi/eagi-sphinx-test.c?view=diff&rev=168710&r1=168709&r2=168710
==============================================================================
--- team/oej/meetmefixes-1.4/agi/eagi-sphinx-test.c (original)
+++ team/oej/meetmefixes-1.4/agi/eagi-sphinx-test.c Thu Jan 15 10:54:50 2009
@@ -70,7 +70,9 @@
 	char *val;
 	/* Read environment */
 	for(;;) {
-		fgets(buf, sizeof(buf), stdin);
+		if (!fgets(buf, sizeof(buf), stdin)) {
+			return -1;
+		}
 		if (feof(stdin))
 			return -1;
 		buf[strlen(buf) - 1] = '\0';
@@ -121,7 +123,9 @@
 			return NULL;
 		}
 		if (FD_ISSET(STDIN_FILENO, &fds)) {
-			fgets(astresp, sizeof(astresp), stdin);
+			if (!fgets(astresp, sizeof(astresp), stdin)) {
+				return NULL;
+			}
 			if (feof(stdin)) {
 				fprintf(stderr, "Got hungup on apparently\n");
 				return NULL;
@@ -132,9 +136,10 @@
 		}
 		if (FD_ISSET(AUDIO_FILENO, &fds)) {
 			res = read(AUDIO_FILENO, audiobuf, sizeof(audiobuf));
-			if (res > 0) {
-				if (sphinx_sock > -1) 
-					write(sphinx_sock, audiobuf, res);
+			if ((res > 0) && (sphinx_sock > -1)) {
+				if (write(sphinx_sock, audiobuf, res) < 0) {
+					fprintf(stderr, "write() failed: %s\n", strerror(errno));
+				}
 			}
 		}
 		if ((sphinx_sock > -1) && FD_ISSET(sphinx_sock, &fds)) {

Modified: team/oej/meetmefixes-1.4/agi/eagi-test.c
URL: http://svn.digium.com/svn-view/asterisk/team/oej/meetmefixes-1.4/agi/eagi-test.c?view=diff&rev=168710&r1=168709&r2=168710
==============================================================================
--- team/oej/meetmefixes-1.4/agi/eagi-test.c (original)
+++ team/oej/meetmefixes-1.4/agi/eagi-test.c Thu Jan 15 10:54:50 2009
@@ -24,7 +24,9 @@
 	char *val;
 	/* Read environment */
 	for(;;) {
-		fgets(buf, sizeof(buf), stdin);
+		if (!fgets(buf, sizeof(buf), stdin)) {
+			return -1;
+		}
 		if (feof(stdin))
 			return -1;
 		buf[strlen(buf) - 1] = '\0';
@@ -68,7 +70,9 @@
 			return NULL;
 		}
 		if (FD_ISSET(STDIN_FILENO, &fds)) {
-			fgets(astresp, sizeof(astresp), stdin);
+			if (!fgets(astresp, sizeof(astresp), stdin)) {
+				return NULL;
+			}
 			if (feof(stdin)) {
 				fprintf(stderr, "Got hungup on apparently\n");
 				return NULL;

Modified: team/oej/meetmefixes-1.4/apps/app_adsiprog.c
URL: http://svn.digium.com/svn-view/asterisk/team/oej/meetmefixes-1.4/apps/app_adsiprog.c?view=diff&rev=168710&r1=168709&r2=168710
==============================================================================
--- team/oej/meetmefixes-1.4/apps/app_adsiprog.c (original)
+++ team/oej/meetmefixes-1.4/apps/app_adsiprog.c Thu Jan 15 10:54:50 2009
@@ -1364,7 +1364,9 @@
 	/* Create "main" as first subroutine */
 	getsubbyname(scr, "main", NULL, 0);
 	while(!feof(f)) {
-		fgets(buf, sizeof(buf), f);
+		if (!fgets(buf, sizeof(buf), f)) {
+			continue;
+		}
 		if (!feof(f)) {
 			lineno++;
 			/* Trim off trailing return */

Modified: team/oej/meetmefixes-1.4/apps/app_authenticate.c
URL: http://svn.digium.com/svn-view/asterisk/team/oej/meetmefixes-1.4/apps/app_authenticate.c?view=diff&rev=168710&r1=168709&r2=168710
==============================================================================
--- team/oej/meetmefixes-1.4/apps/app_authenticate.c (original)
+++ team/oej/meetmefixes-1.4/apps/app_authenticate.c Thu Jan 15 10:54:50 2009
@@ -167,7 +167,9 @@
 					char *md5secret = NULL;
 
 					while (!feof(f)) {
-						fgets(buf, sizeof(buf), f);
+						if (!fgets(buf, sizeof(buf), f)) {
+							continue;
+						}
 						if (!ast_strlen_zero(buf)) {
 							size_t len = strlen(buf);
 							if (buf[len - 1] == '\n')

Modified: team/oej/meetmefixes-1.4/apps/app_chanspy.c
URL: http://svn.digium.com/svn-view/asterisk/team/oej/meetmefixes-1.4/apps/app_chanspy.c?view=diff&rev=168710&r1=168709&r2=168710
==============================================================================
--- team/oej/meetmefixes-1.4/apps/app_chanspy.c (original)
+++ team/oej/meetmefixes-1.4/apps/app_chanspy.c Thu Jan 15 10:54:50 2009
@@ -38,6 +38,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <ctype.h>
+#include <errno.h>
 
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -190,8 +191,11 @@
 		return -1;
 	}
 
-	if (csth->fd)
-		write(csth->fd, f->data, f->datalen);
+	if (csth->fd) {
+		if (write(csth->fd, f->data, f->datalen) < 0) {
+			ast_log(LOG_WARNING, "write() failed: %s\n", strerror(errno));
+		}
+	}
 
 	ast_frfree(f);
 
@@ -509,7 +513,7 @@
 	char *ptr;
 	int num;
 	int num_spyed_upon = 1;
-	struct chanspy_ds chanspy_ds;
+	struct chanspy_ds chanspy_ds = { 0, };
 
 	ast_mutex_init(&chanspy_ds.lock);
 

Modified: team/oej/meetmefixes-1.4/apps/app_dahdibarge.c
URL: http://svn.digium.com/svn-view/asterisk/team/oej/meetmefixes-1.4/apps/app_dahdibarge.c?view=diff&rev=168710&r1=168709&r2=168710
==============================================================================
--- team/oej/meetmefixes-1.4/apps/app_dahdibarge.c (original)
+++ team/oej/meetmefixes-1.4/apps/app_dahdibarge.c Thu Jan 15 10:54:50 2009
@@ -134,11 +134,7 @@
 zapretry:
 	origfd = chan->fds[0];
 	if (retryzap) {
-#ifdef HAVE_ZAPTEL
-		fd = open("/dev/zap/pseudo", O_RDWR);
-#else
-		fd = open("/dev/dahdi/pseudo", O_RDWR);
-#endif
+		fd = open(DAHDI_FILE_PSEUDO, O_RDWR);
 		if (fd < 0) {
 			ast_log(LOG_WARNING, "Unable to open pseudo channel: %s\n", strerror(errno));
 			goto outrun;

Modified: team/oej/meetmefixes-1.4/apps/app_dahdiscan.c
URL: http://svn.digium.com/svn-view/asterisk/team/oej/meetmefixes-1.4/apps/app_dahdiscan.c?view=diff&rev=168710&r1=168709&r2=168710
==============================================================================
--- team/oej/meetmefixes-1.4/apps/app_dahdiscan.c (original)
+++ team/oej/meetmefixes-1.4/apps/app_dahdiscan.c Thu Jan 15 10:54:50 2009
@@ -135,7 +135,7 @@
  zapretry:
 	origfd = chan->fds[0];
 	if (retryzap) {
-		fd = open("/dev/zap/pseudo", O_RDWR);
+		fd = open(DAHDI_FILE_PSEUDO, O_RDWR);
 		if (fd < 0) {
 			ast_log(LOG_WARNING, "Unable to open pseudo channel: %s\n", strerror(errno));
 			goto outrun;

Modified: team/oej/meetmefixes-1.4/apps/app_dial.c
URL: http://svn.digium.com/svn-view/asterisk/team/oej/meetmefixes-1.4/apps/app_dial.c?view=diff&rev=168710&r1=168709&r2=168710
==============================================================================
--- team/oej/meetmefixes-1.4/apps/app_dial.c (original)
+++ team/oej/meetmefixes-1.4/apps/app_dial.c Thu Jan 15 10:54:50 2009
@@ -126,15 +126,19 @@
 "           Optionally, an extension, or extension and context may be specified. \n"
 "           Otherwise, the current extension is used. You cannot use any additional\n"
 "           action post answer options in conjunction with this option.\n" 
-"    h    - Allow the called party to hang up by sending the '*' DTMF digit.\n"
-"    H    - Allow the calling party to hang up by hitting the '*' DTMF digit.\n"
+"    h    - Allow the called party to hang up by sending the '*' DTMF digit, or\n"
+"           whatever sequence was defined in the featuremap section for\n"
+"           'disconnect' in features.conf\n"
+"    H    - Allow the calling party to hang up by hitting the '*' DTMF digit, or\n"
+"           whatever sequence was defined in the featuremap section for\n"
+"           'disconnect' in features.conf\n"
 "    i    - Asterisk will ignore any forwarding requests it may receive on this\n"
 "           dial attempt.\n"
 "    j    - Jump to priority n+101 if all of the requested channels were busy.\n"
 "    k    - Allow the called party to enable parking of the call by sending\n"
-"           the DTMF sequence defined for call parking in features.conf.\n"
+"           the DTMF sequence defined for call parking in the featuremap section of features.conf.\n"
 "    K    - Allow the calling party to enable parking of the call by sending\n"
-"           the DTMF sequence defined for call parking in features.conf.\n"
+"           the DTMF sequence defined for call parking in the featuremap section of features.conf.\n"
 "    L(x[:y][:z]) - Limit the call to 'x' ms. Play a warning when 'y' ms are\n"
 "           left. Repeat the warning every 'z' ms. The following special\n"
 "           variables can be used with this option:\n"
@@ -195,13 +199,17 @@
 "    S(x) - Hang up the call after 'x' seconds *after* the called party has\n"
 "           answered the call.\n"  	
 "    t    - Allow the called party to transfer the calling party by sending the\n"
-"           DTMF sequence defined in features.conf.\n"
+"           DTMF sequence defined in the blindxfer setting in the featuremap section\n"
+"           of features.conf.\n"
 "    T    - Allow the calling party to transfer the called party by sending the\n"
-"           DTMF sequence defined in features.conf.\n"
+"           DTMF sequence defined in the blindxfer setting in the featuremap section\n"
+"           of features.conf.\n"
 "    w    - Allow the called party to enable recording of the call by sending\n"
-"           the DTMF sequence defined for one-touch recording in features.conf.\n"
+"           the DTMF sequence defined in the automon setting in the featuremap section\n"
+"           of features.conf.\n"
 "    W    - Allow the calling party to enable recording of the call by sending\n"
-"           the DTMF sequence defined for one-touch recording in features.conf.\n";
+"           the DTMF sequence defined in the automon setting in the featuremap section\n"
+"           of features.conf.\n";
 
 /* RetryDial App by Anthony Minessale II <anthmct at yahoo.com> Jan/2005 */
 static char *rapp = "RetryDial";
@@ -824,6 +832,35 @@
 		ast_set_flag(&(features->features_caller), AST_FEATURE_PARKCALL);
 }
 
+static void end_bridge_callback (void *data)
+{
+	char buf[80];
+	time_t end;
+	struct ast_channel *chan = data;
+
+	if (!chan->cdr) {
+		return;
+	}
+
+	time(&end);
+
+	ast_channel_lock(chan);
+	if (chan->cdr->answer.tv_sec) {
+		snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->answer.tv_sec);
+		pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", buf);
+	}
+
+	if (chan->cdr->start.tv_sec) {
+		snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->start.tv_sec);
+		pbx_builtin_setvar_helper(chan, "DIALEDTIME", buf);
+	}
+	ast_channel_unlock(chan);
+}
+
+static void end_bridge_callback_data_fixup(struct ast_bridge_config *bconfig, struct ast_channel *originator, struct ast_channel *terminator) {
+	bconfig->end_bridge_callback_data = originator;
+}
+
 static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags *peerflags, int *continue_exec)
 {
 	int res = -1;
@@ -839,7 +876,7 @@
 	char numsubst[256];
 	char cidname[AST_MAX_EXTENSION] = "";
 	int privdb_val = 0;
-	unsigned int calldurationlimit = 0;
+	int calldurationlimit = -1;
 	long timelimit = 0;
 	long play_warning = 0;
 	long warning_freq = 0;
@@ -877,6 +914,13 @@
 		return -1;
 	}
 
+	/* Reset all DIAL variables back to blank, to prevent confusion (in case we don't reset all of them). */
+	pbx_builtin_setvar_helper(chan, "DIALSTATUS", "");
+	pbx_builtin_setvar_helper(chan, "DIALEDPEERNUMBER", "");
+	pbx_builtin_setvar_helper(chan, "DIALEDPEERNAME", "");
+	pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", "");
+	pbx_builtin_setvar_helper(chan, "DIALEDTIME", "");
+
 	u = ast_module_user_add(chan);
 
 	parse = ast_strdupa(data);
@@ -973,7 +1017,7 @@
 		start_sound = S_OR(var, NULL);	/* XXX not much of a point in doing this! */
 
 		/* undo effect of S(x) in case they are both used */
-		calldurationlimit = 0;
+		calldurationlimit = -1;
 		/* more efficient to do it like S(x) does since no advanced opts */
 		if (!play_warning && !start_sound && !end_sound && timelimit) {
 			calldurationlimit = timelimit / 1000;
@@ -1339,6 +1383,9 @@
 				ast_log(LOG_DEBUG, "ast call on peer returned %d\n", res);
 			if (option_verbose > 2)
 				ast_verbose(VERBOSE_PREFIX_3 "Couldn't call %s\n", numsubst);
+			if (tmp->chan->hangupcause) {
+				chan->hangupcause = tmp->chan->hangupcause;
+			}
 			ast_hangup(tmp->chan);
 			tmp->chan = NULL;
 			free(tmp);
@@ -1419,9 +1466,9 @@
 		/* almost done, although the 'else' block is 400 lines */
 	} else {
 		const char *number;
-		time_t end_time, answer_time = time(NULL);
 
 		strcpy(status, "ANSWER");
+		pbx_builtin_setvar_helper(chan, "DIALSTATUS", status);
 		/* Ah ha!  Someone answered within the desired timeframe.  Of course after this
 		   we will always return with -1 so that it is hung up properly after the 
 		   conversation.  */
@@ -1704,6 +1751,9 @@
 		if (!res) {
 			if (calldurationlimit > 0) {
 				peer->whentohangup = time(NULL) + calldurationlimit;
+			} else if (calldurationlimit != -1 && timelimit > 0) {
+				/* Not enough granularity to make it less, but we can't use the special value 0 */
+				peer->whentohangup = time(NULL) + 1;
 			}
 			if (!ast_strlen_zero(dtmfcalled)) { 
 				if (option_verbose > 2)
@@ -1716,7 +1766,7 @@
 				res = ast_dtmf_stream(chan,peer,dtmfcalling,250);
 			}
 		}
-		
+
 		if (!res) {
 			struct ast_bridge_config config;
 
@@ -1750,6 +1800,9 @@
 			config.warning_sound = warning_sound;
 			config.end_sound = end_sound;
 			config.start_sound = start_sound;

[... 19242 lines stripped ...]



More information about the asterisk-commits mailing list