[asterisk-commits] murf: branch murf/bug8423-1.4 r48696 - in
/team/murf/bug8423-1.4: ./ agi/ app...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Wed Dec 20 19:46:06 MST 2006
Author: murf
Date: Wed Dec 20 20:46:04 2006
New Revision: 48696
URL: http://svn.digium.com/view/asterisk?view=rev&rev=48696
Log:
Merged revisions 48349,48357,48362-48363,48372,48375,48377,48379,48381-48382,48391,48396,48399,48401,48404,48427,48435,48461,48472,48478,48481,48487,48502,48504,48506,48513,48521,48525,48528,48548,48554,48561,48564,48566,48571,48577,48583,48585-48586,48592,48596,48637 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48349 | murf | 2006-12-07 08:33:32 -0700 (Thu, 07 Dec 2006) | 1 line
Here lies the fixes that killed bug 8423 -- OriginateSuccess and OriginateError incomplete channel name. May it rest in peace.
................
r48357 | russell | 2006-12-07 11:17:28 -0700 (Thu, 07 Dec 2006) | 11 lines
Merged revisions 48356 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48356 | russell | 2006-12-07 13:14:13 -0500 (Thu, 07 Dec 2006) | 3 lines
Ensure that the file position is not incremented beyond the total number of
files available for playback. (issue #8539, ulogic)
........
................
r48362 | russell | 2006-12-09 08:47:01 -0700 (Sat, 09 Dec 2006) | 13 lines
Blocked revisions 48361 via svnmerge
........
r48361 | russell | 2006-12-09 10:45:37 -0500 (Sat, 09 Dec 2006) | 6 lines
Use locking when accessing the registrations list. This list is not actually
used very often, so the likelihood of there being a problem is pretty small,
but still possible. For example, if the CLI command to list the registrations
was called at the same time that a reload was occurring and the registrations
list was getting destroyed and rebuilt, a crash could occur.
........
................
r48363 | russell | 2006-12-09 08:59:42 -0700 (Sat, 09 Dec 2006) | 8 lines
Use locking when accessing the registrations list. This list is not actually
used very often, so the likelihood of there being a problem is pretty small,
but still possible. For example, if the CLI command to list the registrations
was called at the same time that a reload was occurring and the registrations
list was getting destroyed and rebuilt, a crash could occur.
In passing, go ahead and convert this list to use the linked list macros.
................
r48372 | murf | 2006-12-09 20:04:18 -0700 (Sat, 09 Dec 2006) | 9 lines
Merged revisions 48371 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48371 | murf | 2006-12-09 19:14:13 -0700 (Sat, 09 Dec 2006) | 1 line
This version applies the patch suggested by stevens in bug 7836 (make inbound channel RINGING state consistent with other channels).
........
................
r48375 | tilghman | 2006-12-10 17:47:21 -0700 (Sun, 10 Dec 2006) | 13 lines
Merged revisions 48374 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48374 | tilghman | 2006-12-10 18:33:59 -0600 (Sun, 10 Dec 2006) | 5 lines
When doing a fork() and exec(), two problems existed (Issue 8086):
1) Ignored signals stayed ignored after the exec().
2) Signals could possibly fire between the fork() and exec(), causing Asterisk
signal handlers within the child to execute, which caused nasty race conditions.
........
................
r48377 | file | 2006-12-10 21:57:38 -0700 (Sun, 10 Dec 2006) | 2 lines
Don't access the conference structure after it has been freed.
................
r48379 | file | 2006-12-10 22:30:01 -0700 (Sun, 10 Dec 2006) | 2 lines
Use the correct API call to say a device state changed. (Yes, I'm a nub.)
................
r48381 | file | 2006-12-10 22:36:45 -0700 (Sun, 10 Dec 2006) | 2 lines
Merge in my latest RTP changes. Break out RTP and RTCP callback functions so they no longer share a common one.
................
r48382 | tilghman | 2006-12-10 22:37:09 -0700 (Sun, 10 Dec 2006) | 2 lines
STRFTIME() does not actually require an argument (issue 8540)
................
r48391 | file | 2006-12-11 14:31:23 -0700 (Mon, 11 Dec 2006) | 2 lines
Return non-existant callerid handling to that which it was before. In 1.4 and trunk callerid can be allocated but not have any contents so we have to use ast_strlen_zero before passing it to the relevant functions. (issue #8567 reported by pabelanger)
................
r48396 | mogorman | 2006-12-11 15:11:35 -0700 (Mon, 11 Dec 2006) | 12 lines
Merged revisions 48394 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.2
........
r48394 | mogorman | 2006-12-11 15:55:43 -0600 (Mon, 11 Dec 2006) | 4 lines
app_externalivr needs a real silence file, and additional
changes to add silence files into core instead of extra
patch provided by bug 8177 with minor additions.
........
................
r48399 | mogorman | 2006-12-11 16:02:10 -0700 (Mon, 11 Dec 2006) | 2 lines
new sounds package with 100% more silence
................
r48401 | file | 2006-12-11 21:13:48 -0700 (Mon, 11 Dec 2006) | 2 lines
Use S_OR in my previous app_voicemail. This is the way it should have been done.
................
r48404 | kpfleming | 2006-12-11 22:18:11 -0700 (Mon, 11 Dec 2006) | 2 lines
block addition of silence files... not needed here
................
r48427 | kpfleming | 2006-12-12 16:18:14 -0700 (Tue, 12 Dec 2006) | 2 lines
when making a release, we can always use wget and we can't run the configure script to find that out...
................
r48435 | murf | 2006-12-12 21:31:12 -0700 (Tue, 12 Dec 2006) | 1 line
a block to keep 48434 out of 1.4; the code works fine here
................
r48461 | file | 2006-12-13 20:33:30 -0700 (Wed, 13 Dec 2006) | 2 lines
Remove direct RTCP bridging. I've come to the conclusion that we should handle this through the core and not just forward it on. Should solve a few bugs.
................
r48472 | file | 2006-12-14 10:36:12 -0700 (Thu, 14 Dec 2006) | 2 lines
Payload values on the RTP structure can change AFTER a bridge has started. This comes from the packet handling of the SIP response when indication that it was answered has been sent. Therefore we need to protect this data with a lock when we read/write. (issue #8232 reported by tgrman)
................
r48478 | file | 2006-12-14 23:28:05 -0700 (Thu, 14 Dec 2006) | 2 lines
Use a wakeup variable so that we don't wait on IO indefinitely if packets need to be retransmitted.
................
r48481 | oej | 2006-12-15 03:18:04 -0700 (Fri, 15 Dec 2006) | 2 lines
Update to latest IANA spec
................
r48487 | oej | 2006-12-15 03:55:41 -0700 (Fri, 15 Dec 2006) | 2 lines
Issue #8592 - treat 504 as 503 (imported from 1.2)
................
r48502 | file | 2006-12-15 12:24:15 -0700 (Fri, 15 Dec 2006) | 2 lines
Lock network retransmission queue in all places that it is used.
................
r48504 | file | 2006-12-15 12:38:51 -0700 (Fri, 15 Dec 2006) | 2 lines
Hold call structure lock in places where a qualify or peer action can destroy it.
................
r48506 | file | 2006-12-15 12:55:28 -0700 (Fri, 15 Dec 2006) | 2 lines
Turn payload_lock into bridge_lock and make it encompass all RTP structure contents that may relate to bridge information, including who we are bridged to.
................
r48513 | kpfleming | 2006-12-15 21:25:09 -0700 (Fri, 15 Dec 2006) | 2 lines
instead of initializing the curl library every time the CURL() function is invoked, do it only once per thread (this allows multiple calls to CURL() in the dialplan for a channel to run much more quickly, and also to re-use connections to the server) (thanks to JerJer for frequently complaining about this performance problem)
................
r48521 | kpfleming | 2006-12-16 13:12:41 -0700 (Sat, 16 Dec 2006) | 2 lines
since we really, really have to have autoconfig.h included before all other headers (especially system headers), the Makefile will now force it to happen (this will fix build problems with files like ast_expr2f.c, where we can't control the inclusion order in the file itself)
................
r48525 | kpfleming | 2006-12-16 14:14:34 -0700 (Sat, 16 Dec 2006) | 2 lines
simplify dependency tracking system, using the compiler's built-in method for generating them, and only doing dependency tracking if developer mode is enabled via the configure script
................
r48528 | kpfleming | 2006-12-16 14:34:41 -0700 (Sat, 16 Dec 2006) | 2 lines
use m4 quoting for AC_MSG_NOTICE calls, to keep these calls from thinking they have multiple arguments
................
r48548 | kpfleming | 2006-12-17 11:33:24 -0700 (Sun, 17 Dec 2006) | 2 lines
need an additional argument here to make the downloads actually occur
................
r48554 | kpfleming | 2006-12-18 04:59:24 -0700 (Mon, 18 Dec 2006) | 3 lines
remove some now-unnecessary explicit includes of autoconfig.h
clean up per-file dependencies during 'make clean'
................
r48561 | qwell | 2006-12-18 09:55:46 -0700 (Mon, 18 Dec 2006) | 2 lines
ctrl-w != w (nano search)
................
r48564 | file | 2006-12-18 10:15:49 -0700 (Mon, 18 Dec 2006) | 2 lines
Put thread into proper list if we abort handling due to an error, and also hold the lock while putting it back into the proper idle list so we don't prematurely get a signal. (issue #8604 reported by arkadia)
................
r48566 | rizzo | 2006-12-18 10:23:29 -0700 (Mon, 18 Dec 2006) | 11 lines
unbreak the macro used for incrementing the frame counters.
I don't know when the bug was introduced, but with the typical usage
c->fin = FRAMECOUNT_INC(c->fin)
the frame counters stay to 0.
affects trunk as well (fix coming).
................
r48571 | file | 2006-12-18 20:46:12 -0700 (Mon, 18 Dec 2006) | 2 lines
Use env -i to start a fresh environment when going to build menuselect. This is more portable then using unset. (issue #8543 reported by jtodd)
................
r48577 | kpfleming | 2006-12-19 07:57:09 -0700 (Tue, 19 Dec 2006) | 2 lines
use the proper variable type for these unixODBC API calls, eliminating warnings on 64-bit platforms that use the 'new' 64-bit types for ODBC API calls
................
r48583 | rizzo | 2006-12-19 14:03:02 -0700 (Tue, 19 Dec 2006) | 6 lines
fix a bogus datalen in the frames generated by app_sms
(causing noisy output if you listen to the output!)
This affects trunk as well, whereas 1.2 is ok.
................
r48585 | file | 2006-12-19 14:12:07 -0700 (Tue, 19 Dec 2006) | 10 lines
Merged revisions 48584 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48584 | file | 2006-12-19 16:10:26 -0500 (Tue, 19 Dec 2006) | 2 lines
Free localuser structure when we fail to dial (issue #8612 reported by rizzo)
........
................
r48586 | kpfleming | 2006-12-19 14:28:04 -0700 (Tue, 19 Dec 2006) | 2 lines
suppress compiler warnings in this module until it can be improved
................
r48592 | file | 2006-12-19 15:00:57 -0700 (Tue, 19 Dec 2006) | 2 lines
find is not the same as bind when it comes to documentation. (issue #8626 reported by johann8384)
................
r48596 | file | 2006-12-19 16:04:30 -0700 (Tue, 19 Dec 2006) | 2 lines
Pass 'vms' pointer to record_and_review so it is then passed to the IMAP store file function. (issue #8614 reported by punknow)
................
r48637 | file | 2006-12-19 19:56:09 -0700 (Tue, 19 Dec 2006) | 2 lines
vms doesn't exist on non-IMAP storage builds.
................
Removed:
team/murf/bug8423-1.4/build_tools/mkdep
Modified:
team/murf/bug8423-1.4/ (props changed)
team/murf/bug8423-1.4/CHANGES
team/murf/bug8423-1.4/Makefile
team/murf/bug8423-1.4/Makefile.moddir_rules
team/murf/bug8423-1.4/Makefile.rules
team/murf/bug8423-1.4/acinclude.m4
team/murf/bug8423-1.4/agi/ (props changed)
team/murf/bug8423-1.4/agi/Makefile
team/murf/bug8423-1.4/apps/ (props changed)
team/murf/bug8423-1.4/apps/app_dial.c
team/murf/bug8423-1.4/apps/app_externalivr.c
team/murf/bug8423-1.4/apps/app_festival.c
team/murf/bug8423-1.4/apps/app_ices.c
team/murf/bug8423-1.4/apps/app_meetme.c
team/murf/bug8423-1.4/apps/app_mp3.c
team/murf/bug8423-1.4/apps/app_nbscat.c
team/murf/bug8423-1.4/apps/app_sms.c
team/murf/bug8423-1.4/apps/app_voicemail.c
team/murf/bug8423-1.4/apps/app_zapras.c
team/murf/bug8423-1.4/build_tools/prep_tarball
team/murf/bug8423-1.4/cdr/ (props changed)
team/murf/bug8423-1.4/channels/ (props changed)
team/murf/bug8423-1.4/channels/Makefile
team/murf/bug8423-1.4/channels/chan_iax2.c
team/murf/bug8423-1.4/channels/chan_sip.c
team/murf/bug8423-1.4/channels/chan_zap.c
team/murf/bug8423-1.4/codecs/ (props changed)
team/murf/bug8423-1.4/codecs/gsm/ (props changed)
team/murf/bug8423-1.4/codecs/gsm/Makefile
team/murf/bug8423-1.4/codecs/ilbc/ (props changed)
team/murf/bug8423-1.4/codecs/ilbc/Makefile
team/murf/bug8423-1.4/codecs/lpc10/ (props changed)
team/murf/bug8423-1.4/codecs/lpc10/Makefile
team/murf/bug8423-1.4/configure
team/murf/bug8423-1.4/configure.ac
team/murf/bug8423-1.4/doc/snmp.txt
team/murf/bug8423-1.4/formats/ (props changed)
team/murf/bug8423-1.4/funcs/ (props changed)
team/murf/bug8423-1.4/funcs/func_curl.c
team/murf/bug8423-1.4/funcs/func_odbc.c
team/murf/bug8423-1.4/funcs/func_strings.c
team/murf/bug8423-1.4/include/asterisk.h
team/murf/bug8423-1.4/include/asterisk/autoconfig.h.in
team/murf/bug8423-1.4/include/asterisk/channel.h
team/murf/bug8423-1.4/include/asterisk/rtp.h
team/murf/bug8423-1.4/main/ (props changed)
team/murf/bug8423-1.4/main/Makefile
team/murf/bug8423-1.4/main/db1-ast/ (props changed)
team/murf/bug8423-1.4/main/rtp.c
team/murf/bug8423-1.4/main/stdtime/localtime.c
team/murf/bug8423-1.4/pbx/ (props changed)
team/murf/bug8423-1.4/res/ (props changed)
team/murf/bug8423-1.4/res/res_agi.c
team/murf/bug8423-1.4/res/res_config_odbc.c
team/murf/bug8423-1.4/res/res_musiconhold.c
team/murf/bug8423-1.4/sounds/Makefile
team/murf/bug8423-1.4/utils/ (props changed)
team/murf/bug8423-1.4/utils/Makefile
team/murf/bug8423-1.4/utils/ael_main.c
team/murf/bug8423-1.4/utils/astman.c
team/murf/bug8423-1.4/utils/smsq.c
Propchange: team/murf/bug8423-1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/murf/bug8423-1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/murf/bug8423-1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec 20 20:46:04 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-48347
+/branches/1.4:1-48695
Modified: team/murf/bug8423-1.4/CHANGES
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/CHANGES?view=diff&rev=48696&r1=48695&r2=48696
==============================================================================
--- team/murf/bug8423-1.4/CHANGES (original)
+++ team/murf/bug8423-1.4/CHANGES Wed Dec 20 20:46:04 2006
@@ -338,4 +338,4 @@
* New Utils:
1. aelparse -- compile .ael files outside of asterisk
* New manager events:
- 1. OriginateResponse event replaces OriginateSuccess and OriginateFailure
+ 1. OriginateResponse event comes to replace OriginateSuccess and OriginateFailure
Modified: team/murf/bug8423-1.4/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/Makefile?view=diff&rev=48696&r1=48695&r2=48696
==============================================================================
--- team/murf/bug8423-1.4/Makefile (original)
+++ team/murf/bug8423-1.4/Makefile Wed Dec 20 20:46:04 2006
@@ -181,6 +181,8 @@
ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
+
ifeq ($(AST_DEVMODE),yes)
ASTCFLAGS+=-Werror -Wunused
endif
@@ -237,10 +239,6 @@
SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
-SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
-MOD_SUBDIRS_DEPEND:=$(MOD_SUBDIRS:%=%-depend)
-OTHER_SUBDIRS_DEPEND:=$(OTHER_SUBDIRS:%=%-depend)
-SUBDIRS_DEPEND:=$(OTHER_SUBDIRS_DEPEND) $(MOD_SUBDIRS_DEPEND)
SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
@@ -304,7 +302,7 @@
@$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LDFLAGS)
@$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LIBS)
-$(SUBDIRS): depend makeopts.embed_rules
+$(SUBDIRS): include/asterisk/version.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
# ensure that all module subdirectories are processed before 'main' during
# a parallel build, since if there are modules selected to be embedded the
@@ -339,19 +337,13 @@
fi
@rm -f $@.tmp
-$(SUBDIRS_CLEAN_DEPEND):
- @$(MAKE) --no-print-directory -C $(@:-clean-depend=) clean-depend
-
$(SUBDIRS_CLEAN):
@$(MAKE) --no-print-directory -C $(@:-clean=) clean
-clean-depend: $(SUBDIRS_CLEAN_DEPEND)
-
-clean: $(SUBDIRS_CLEAN) clean-depend
+clean: $(SUBDIRS_CLEAN)
rm -f defaults.h
rm -f include/asterisk/build.h
rm -f include/asterisk/version.h
- rm -f .depend
@$(MAKE) -C menuselect clean
cp -f .cleancount .lastclean
@@ -395,7 +387,6 @@
grep ^C update.out | cut -b4- ; \
fi ; \
rm -f update.out; \
- $(MAKE) clean-depend; \
else \
echo "Not under version control"; \
fi
@@ -627,14 +618,6 @@
echo "We could not install init scripts for your operating system."; \
fi
-$(MOD_SUBDIRS_DEPEND):
- @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) --no-print-directory -C $(@:-depend=) depend
-
-$(OTHER_SUBDIRS_DEPEND):
- @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) --no-print-directory -C $(@:-depend=) depend
-
-depend: include/asterisk/version.h include/asterisk/buildopts.h defaults.h $(SUBDIRS_DEPEND)
-
sounds:
$(MAKE) -C sounds all
@@ -688,10 +671,10 @@
- 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!"
menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
- @unset CC LD AR RANLIB && $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+ @env -i && $(MAKE) -C menuselect 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
@echo "Generating input for menuselect ..."
@build_tools/prep_moduledeps > $@
-.PHONY: menuselect main sounds clean clean-depend dist-clean distclean all prereqs depend cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_CLEAN_DEPEND) $(SUBDIRS_DEPEND) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
+.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)
Modified: team/murf/bug8423-1.4/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/Makefile.moddir_rules?view=diff&rev=48696&r1=48695&r2=48696
==============================================================================
--- team/murf/bug8423-1.4/Makefile.moddir_rules (original)
+++ team/murf/bug8423-1.4/Makefile.moddir_rules Wed Dec 20 20:46:04 2006
@@ -40,7 +40,7 @@
modules.link: $(addsuffix .o,$(filter $(EMBEDDED_MODS),$(C_MODS)))
modules.link: $(addsuffix .oo,$(filter $(EMBEDDED_MODS),$(CC_MODS)))
-.PHONY: clean clean-depend depend uninstall _all
+.PHONY: clean uninstall _all
ifneq ($(LOADABLE_MODS),)
_all: $(LOADABLE_MODS:%=%.so)
@@ -67,11 +67,9 @@
@for file in $(patsubst %,$(SUBDIR)/%,$(filter %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
@for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
-clean-depend::
- rm -f .depend
-
-clean:: clean-depend
+clean::
rm -f *.so *.o *.oo
+ rm -f .*.o.d .*.oo.d
rm -f modules.link
install:: all
@@ -79,11 +77,6 @@
uninstall::
-ifneq ($(wildcard .depend),)
- include .depend
+ifneq ($(wildcard .*.d),)
+ include .*.d
endif
-
-depend: .depend
-
-.depend:
- ../build_tools/mkdep $(ASTCFLAGS) `ls *.c *.cc 2> /dev/null`
Modified: team/murf/bug8423-1.4/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/Makefile.rules?view=diff&rev=48696&r1=48695&r2=48696
==============================================================================
--- team/murf/bug8423-1.4/Makefile.rules (original)
+++ team/murf/bug8423-1.4/Makefile.rules Wed Dec 20 20:46:04 2006
@@ -38,11 +38,19 @@
%.o: %.c
$(ECHO_PREFIX) echo " [CC] $< -> $@"
+ifeq ($(AST_DEVMODE),yes)
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+else
$(CMD_PREFIX) $(CC) -o $@ -c $< $(ASTCFLAGS)
+endif
%.oo: %.cc
$(ECHO_PREFIX) echo " [CXX] $< -> $@"
+ifeq ($(AST_DEVMODE),yes)
+ $(CMD_PREFIX) $(CXX) -o $@ -c $< $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+else
$(CMD_PREFIX) $(CXX) -o $@ -c $< $(ASTCFLAGS)
+endif
%.c: %.y
$(ECHO_PREFIX) echo " [BISON] $< -> $@"
Modified: team/murf/bug8423-1.4/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/acinclude.m4?view=diff&rev=48696&r1=48695&r2=48696
==============================================================================
--- team/murf/bug8423-1.4/acinclude.m4 (original)
+++ team/murf/bug8423-1.4/acinclude.m4 Wed Dec 20 20:46:04 2006
@@ -69,10 +69,10 @@
if test "x${$1_HEADER_FOUND}" = "x0" ; then
if test ! -z "${$1_MANDATORY}" ;
then
- AC_MSG_NOTICE( ***)
- AC_MSG_NOTICE( *** It appears that you do not have the $2 development package installed.)
- AC_MSG_NOTICE( *** Please install it to include ${$1_DESCRIP} support, or re-run configure)
- AC_MSG_NOTICE( *** without explicitly specifying --with-${$1_OPTION})
+ AC_MSG_NOTICE([***])
+ AC_MSG_NOTICE([*** It appears that you do not have the $2 development package installed.])
+ AC_MSG_NOTICE([*** Please install it to include ${$1_DESCRIP} support, or re-run configure])
+ AC_MSG_NOTICE([*** without explicitly specifying --with-${$1_OPTION}])
exit 1
fi
$1_LIB=""
@@ -84,10 +84,10 @@
fi
elif test ! -z "${$1_MANDATORY}";
then
- AC_MSG_NOTICE(***)
- AC_MSG_NOTICE(*** The ${$1_DESCRIP} installation on this system appears to be broken.)
- AC_MSG_NOTICE(*** Either correct the installation, or run configure)
- AC_MSG_NOTICE(*** without explicitly specifying --with-${$1_OPTION})
+ AC_MSG_NOTICE([***])
+ AC_MSG_NOTICE([*** The ${$1_DESCRIP} installation on this system appears to be broken.])
+ AC_MSG_NOTICE([*** Either correct the installation, or run configure])
+ AC_MSG_NOTICE([*** without explicitly specifying --with-${$1_OPTION}])
exit 1
fi
fi
Propchange: team/murf/bug8423-1.4/agi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Dec 20 20:46:04 2006
@@ -1,4 +1,4 @@
eagi-test
eagi-sphinx-test
-.depend
+*.d
strcompat.c
Modified: team/murf/bug8423-1.4/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/agi/Makefile?view=diff&rev=48696&r1=48695&r2=48696
==============================================================================
--- team/murf/bug8423-1.4/agi/Makefile (original)
+++ team/murf/bug8423-1.4/agi/Makefile Wed Dec 20 20:46:04 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-.PHONY: clean clean-depend all depend uninstall
+.PHONY: clean all uninstall
AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
@@ -37,18 +37,11 @@
uninstall:
for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done
-clean-depend:
- rm -f .depend
-
-clean: clean-depend
+clean:
rm -f *.so *.o look eagi-test eagi-sphinx-test
+ rm -f .*.o.d .*.oo.d
rm -f strcompat.c
-ifneq ($(wildcard .depend),)
- include .depend
+ifneq ($(wildcard .*.d),)
+ include .*.d
endif
-
-depend: .depend
-
-.depend:
- ../build_tools/mkdep $(CFLAGS) `ls *.c`
Propchange: team/murf/bug8423-1.4/apps/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Dec 20 20:46:04 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
*.a
*.so
modules.link
Modified: team/murf/bug8423-1.4/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/apps/app_dial.c?view=diff&rev=48696&r1=48695&r2=48696
==============================================================================
--- team/murf/bug8423-1.4/apps/app_dial.c (original)
+++ team/murf/bug8423-1.4/apps/app_dial.c Wed Dec 20 20:46:04 2006
@@ -1082,6 +1082,7 @@
HANDLE_CAUSE(cause, chan);
if (!rest) /* we are on the last destination */
chan->hangupcause = cause;
+ free(tmp);
continue;
}
pbx_builtin_setvar_helper(tmp->chan, "DIALEDPEERNUMBER", numsubst);
@@ -1125,6 +1126,7 @@
}
if (!tmp->chan) {
HANDLE_CAUSE(cause, chan);
+ free(tmp);
continue;
}
}
@@ -1194,6 +1196,7 @@
ast_verbose(VERBOSE_PREFIX_3 "Couldn't call %s\n", numsubst);
ast_hangup(tmp->chan);
tmp->chan = NULL;
+ free(tmp);
continue;
} else {
senddialevent(chan, tmp->chan);
Modified: team/murf/bug8423-1.4/apps/app_externalivr.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/apps/app_externalivr.c?view=diff&rev=48696&r1=48695&r2=48696
==============================================================================
--- team/murf/bug8423-1.4/apps/app_externalivr.c (original)
+++ team/murf/bug8423-1.4/apps/app_externalivr.c Wed Dec 20 20:46:04 2006
@@ -40,6 +40,7 @@
#include <string.h>
#include <unistd.h>
#include <errno.h>
+#include <signal.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
@@ -152,7 +153,7 @@
if (state->current) {
file_to_stream = state->current->filename;
} else {
- file_to_stream = "silence-10";
+ file_to_stream = "silence/10";
u->playing_silence = 1;
}
@@ -261,9 +262,13 @@
.finishlist = AST_LIST_HEAD_INIT_VALUE,
};
struct ivr_localuser *u = &foo;
+ sigset_t fullset, oldset;
lu = ast_module_user_add(chan);
-
+
+ sigfillset(&fullset);
+ pthread_sigmask(SIG_BLOCK, &fullset, &oldset);
+
u->abort_current_sound = 0;
u->chan = chan;
@@ -311,6 +316,9 @@
if (!pid) {
/* child process */
int i;
+
+ signal(SIGPIPE, SIG_DFL);
+ pthread_sigmask(SIG_UNBLOCK, &fullset, NULL);
if (ast_opt_high_priority)
ast_set_priority(0);
@@ -334,6 +342,8 @@
int ready_fd;
int waitfds[2] = { child_errors_fd, child_commands_fd };
struct ast_channel *rchan;
+
+ pthread_sigmask(SIG_SETMASK, &oldset, NULL);
close(child_stdin[0]);
child_stdin[0] = 0;
Modified: team/murf/bug8423-1.4/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/apps/app_festival.c?view=diff&rev=48696&r1=48695&r2=48696
==============================================================================
--- team/murf/bug8423-1.4/apps/app_festival.c (original)
+++ team/murf/bug8423-1.4/apps/app_festival.c Wed Dec 20 20:46:04 2006
@@ -130,19 +130,26 @@
#ifdef __PPC__
char c;
#endif
+ sigset_t fullset, oldset;
+
+ sigfillset(&fullset);
+ pthread_sigmask(SIG_BLOCK, &fullset, &oldset);
res = fork();
if (res < 0)
ast_log(LOG_WARNING, "Fork failed\n");
- if (res)
+ if (res) {
+ pthread_sigmask(SIG_SETMASK, &oldset, NULL);
return res;
+ }
for (x=0;x<256;x++) {
if (x != fd)
close(x);
}
if (ast_opt_high_priority)
ast_set_priority(0);
-
+ signal(SIGPIPE, SIG_DFL);
+ pthread_sigmask(SIG_UNBLOCK, &fullset, NULL);
/*IAS */
#ifdef __PPC__
for( x=0; x<length; x+=2)
Modified: team/murf/bug8423-1.4/apps/app_ices.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/apps/app_ices.c?view=diff&rev=48696&r1=48695&r2=48696
==============================================================================
--- team/murf/bug8423-1.4/apps/app_ices.c (original)
+++ team/murf/bug8423-1.4/apps/app_ices.c Wed Dec 20 20:46:04 2006
@@ -65,15 +65,27 @@
{
int res;
int x;
+ sigset_t fullset, oldset;
+
+ sigfillset(&fullset);
+ pthread_sigmask(SIG_BLOCK, &fullset, &oldset);
+
res = fork();
if (res < 0)
ast_log(LOG_WARNING, "Fork failed\n");
- if (res)
+ if (res) {
+ pthread_sigmask(SIG_SETMASK, &oldset, NULL);
return res;
+ }
+
+ /* Stop ignoring PIPE */
+ signal(SIGPIPE, SIG_DFL);
+ pthread_sigmask(SIG_UNBLOCK, &fullset, NULL);
+
if (ast_opt_high_priority)
ast_set_priority(0);
dup2(fd, STDIN_FILENO);
- for (x=STDERR_FILENO + 1;x<256;x++) {
+ for (x=STDERR_FILENO + 1;x<1024;x++) {
if ((x != STDIN_FILENO) && (x != STDOUT_FILENO))
close(x);
}
@@ -84,7 +96,7 @@
/* As a last-ditch effort, try to use PATH */
execlp("ices", "ices", filename, (char *)NULL);
ast_log(LOG_WARNING, "Execute of ices failed\n");
- return -1;
+ _exit(0);
}
static int ices_exec(struct ast_channel *chan, void *data)
Modified: team/murf/bug8423-1.4/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/apps/app_meetme.c?view=diff&rev=48696&r1=48695&r2=48696
==============================================================================
--- team/murf/bug8423-1.4/apps/app_meetme.c (original)
+++ team/murf/bug8423-1.4/apps/app_meetme.c Wed Dec 20 20:46:04 2006
@@ -1927,6 +1927,13 @@
conf->markedusers--;
/* Remove ourselves from the list */
AST_LIST_REMOVE(&conf->userlist, user, list);
+
+ /* Change any states */
+ if (!conf->users)
+ ast_device_state_changed("meetme:%s", conf->confno);
+ if (confflags & (CONFFLAG_SLA_STATION|CONFFLAG_SLA_TRUNK))
+ ast_device_state_changed("SLA:%s", conf->confno + 4);
+
if (AST_LIST_EMPTY(&conf->userlist)) {
/* close this one when no more users and no references*/
if (!conf->refcount)
@@ -1935,12 +1942,6 @@
/* Return the number of seconds the user was in the conf */
snprintf(meetmesecs, sizeof(meetmesecs), "%d", (int) (time(NULL) - user->jointime));
pbx_builtin_setvar_helper(chan, "MEETMESECS", meetmesecs);
-
- /* This device changed state now */
- if (!conf->users) /* If there are no more members */
- ast_device_state_changed("meetme:%s", conf->confno);
- if (confflags & (CONFFLAG_SLA_STATION|CONFFLAG_SLA_TRUNK))
- ast_device_state_changed("SLA:%s", conf->confno + 4);
}
free(user);
AST_LIST_UNLOCK(&confs);
Modified: team/murf/bug8423-1.4/apps/app_mp3.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/apps/app_mp3.c?view=diff&rev=48696&r1=48695&r2=48696
==============================================================================
--- team/murf/bug8423-1.4/apps/app_mp3.c (original)
+++ team/murf/bug8423-1.4/apps/app_mp3.c Wed Dec 20 20:46:04 2006
@@ -64,15 +64,25 @@
{
int res;
int x;
+ sigset_t fullset, oldset;
+
+ sigfillset(&fullset);
+ pthread_sigmask(SIG_BLOCK, &fullset, &oldset);
+
res = fork();
if (res < 0)
ast_log(LOG_WARNING, "Fork failed\n");
- if (res)
+ if (res) {
+ pthread_sigmask(SIG_SETMASK, &oldset, NULL);
return res;
+ }
if (ast_opt_high_priority)
ast_set_priority(0);
+ signal(SIGPIPE, SIG_DFL);
+ pthread_sigmask(SIG_UNBLOCK, &fullset, NULL);
+
dup2(fd, STDOUT_FILENO);
- for (x=0;x<256;x++) {
+ for (x=STDERR_FILENO + 1;x<256;x++) {
if (x != STDOUT_FILENO)
close(x);
}
@@ -94,7 +104,7 @@
execlp("mpg123", "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
}
ast_log(LOG_WARNING, "Execute of mpg123 failed\n");
- return -1;
+ _exit(0);
}
static int timed_read(int fd, void *data, int datalen, int timeout)
Modified: team/murf/bug8423-1.4/apps/app_nbscat.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/apps/app_nbscat.c?view=diff&rev=48696&r1=48695&r2=48696
==============================================================================
--- team/murf/bug8423-1.4/apps/app_nbscat.c (original)
+++ team/murf/bug8423-1.4/apps/app_nbscat.c Wed Dec 20 20:46:04 2006
@@ -68,16 +68,26 @@
{
int res;
int x;
+ sigset_t fullset, oldset;
+
+ sigfillset(&fullset);
+ pthread_sigmask(SIG_BLOCK, &fullset, &oldset);
+
res = fork();
if (res < 0)
ast_log(LOG_WARNING, "Fork failed\n");
- if (res)
+ if (res) {
+ pthread_sigmask(SIG_SETMASK, &oldset, NULL);
return res;
+ }
+ signal(SIGPIPE, SIG_DFL);
+ pthread_sigmask(SIG_UNBLOCK, &fullset, NULL);
+
if (ast_opt_high_priority)
ast_set_priority(0);
dup2(fd, STDOUT_FILENO);
- for (x=0;x<256;x++) {
+ for (x = STDERR_FILENO + 1; x < 1024; x++) {
if (x != STDOUT_FILENO)
close(x);
}
@@ -85,7 +95,7 @@
execl(NBSCAT, "nbscat8k", "-d", (char *)NULL);
execl(LOCAL_NBSCAT, "nbscat8k", "-d", (char *)NULL);
ast_log(LOG_WARNING, "Execute of nbscat8k failed\n");
- return -1;
+ _exit(0);
}
static int timed_read(int fd, void *data, int datalen)
Modified: team/murf/bug8423-1.4/apps/app_sms.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/apps/app_sms.c?view=diff&rev=48696&r1=48695&r2=48696
==============================================================================
--- team/murf/bug8423-1.4/apps/app_sms.c (original)
+++ team/murf/bug8423-1.4/apps/app_sms.c Wed Dec 20 20:46:04 2006
@@ -1198,7 +1198,7 @@
#else
f.subclass = AST_FORMAT_SLINEAR;
#endif
- f.datalen = len;
+ f.datalen = samples * SAMPLE2LEN;
f.offset = AST_FRIENDLY_OFFSET;
f.mallocd = 0;
f.data = buf;
Modified: team/murf/bug8423-1.4/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/apps/app_voicemail.c?view=diff&rev=48696&r1=48695&r2=48696
==============================================================================
--- team/murf/bug8423-1.4/apps/app_voicemail.c (original)
+++ team/murf/bug8423-1.4/apps/app_voicemail.c Wed Dec 20 20:46:04 2006
@@ -358,7 +358,7 @@
static int dialout(struct ast_channel *chan, struct ast_vm_user *vmu, char *num, char *outgoing_context);
static int play_record_review(struct ast_channel *chan, char *playfile, char *recordfile, int maxtime,
char *fmt, int outsidecaller, struct ast_vm_user *vmu, int *duration, const char *unlockdir,
- signed char record_gain);
+ signed char record_gain, struct vm_state *vms);
static int vm_tempgreeting(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, char *fmtc, signed char record_gain);
static int vm_play_folder_name(struct ast_channel *chan, char *mbox);
static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu, int msgnum, long duration, char *fmt, char *cidnum, char *cidname);
@@ -2407,7 +2407,7 @@
ast_log(LOG_WARNING, "Unable to store '%s' (can't create temporary file)\n", fn);
return -1;
} else {
- make_email_file(p, myserveremail, vmu, msgnum, vmu->context, vmu->mailbox, chan->cid.cid_num, chan->cid.cid_name, fn, fmt, duration, 1, chan, NULL, 1);
+ make_email_file(p, myserveremail, vmu, msgnum, vmu->context, vmu->mailbox, S_OR(chan->cid.cid_num, NULL), S_OR(chan->cid.cid_name, NULL), fn, fmt, duration, 1, chan, NULL, 1);
/* read mail file to memory */
len = ftell(p);
rewind(p);
@@ -2641,7 +2641,7 @@
ast_log(LOG_ERROR, "Recipient mailbox %s@%s is full\n", recip->mailbox, recip->context);
}
ast_unlock_path(todir);
- notify_new_message(chan, recip, recipmsgnum, duration, fmt, chan->cid.cid_num, chan->cid.cid_name);
+ notify_new_message(chan, recip, recipmsgnum, duration, fmt, S_OR(chan->cid.cid_num, NULL), S_OR(chan->cid.cid_name, NULL));
return 0;
}
@@ -3058,13 +3058,17 @@
chan->exten,
chan->priority,
chan->name,
- ast_callerid_merge(callerid, sizeof(callerid), chan->cid.cid_name, chan->cid.cid_num, "Unknown"),
+ ast_callerid_merge(callerid, sizeof(callerid), S_OR(chan->cid.cid_name, NULL), S_OR(chan->cid.cid_num, NULL), "Unknown"),
date, (long)time(NULL),
category ? category : "");
} else
ast_log(LOG_WARNING, "Error opening text file for output\n");
- res = play_record_review(chan, NULL, tmptxtfile, vmmaxmessage, fmt, 1, vmu, &duration, NULL, options->record_gain);
-
+#ifdef IMAP_STORAGE
+ res = play_record_review(chan, NULL, tmptxtfile, vmmaxmessage, fmt, 1, vmu, &duration, NULL, options->record_gain, vms);
+#else
+ res = play_record_review(chan, NULL, tmptxtfile, vmmaxmessage, fmt, 1, vmu, &duration, NULL, options->record_gain, NULL);
+#endif
+
if (txt) {
if (duration < vmminmessage) {
if (option_verbose > 2)
@@ -3124,7 +3128,7 @@
#endif
if (ast_fileexists(fn, NULL, NULL)) {
STORE(dir, vmu->mailbox, vmu->context, msgnum, chan, vmu, fmt, duration, vms);
- notify_new_message(chan, vmu, msgnum, duration, fmt, chan->cid.cid_num, chan->cid.cid_name);
+ notify_new_message(chan, vmu, msgnum, duration, fmt, S_OR(chan->cid.cid_num, NULL), S_OR(chan->cid.cid_name, NULL));
DISPOSE(dir, msgnum);
}
}
@@ -3917,7 +3921,6 @@
char *temp;
char todir[256];
int todircount=0;
- int duration;
#endif
char username[70]="";
int res = 0, cmd = 0;
@@ -4117,7 +4120,7 @@
int attach_user_voicemail = ast_test_flag((&globalflags), VM_ATTACH);
attach_user_voicemail = ast_test_flag(vmtmp, VM_ATTACH);
/* NULL category for IMAP storage */
- sendmail(myserveremail, vmtmp, todircount, vmtmp->context, vmtmp->mailbox, chan->cid.cid_num, chan->cid.cid_name, vms->fn, fmt, duration, attach_user_voicemail, chan, NULL);
+ sendmail(myserveremail, vmtmp, todircount, vmtmp->context, vmtmp->mailbox, S_OR(chan->cid.cid_num, NULL), S_OR(chan->cid.cid_name, NULL), vms->fn, fmt, duration, attach_user_voicemail, chan, NULL);
#else
copy_message(chan, sender, 0, curmsg, duration, vmtmp, fmt);
#endif
@@ -5682,7 +5685,7 @@
/* If forcename is set, have the user record their name */
if (ast_test_flag(vmu, VM_FORCENAME)) {
snprintf(prefile,sizeof(prefile), "%s%s/%s/greet", VM_SPOOL_DIR, vmu->context, vms->username);
- cmd = play_record_review(chan,"vm-rec-name",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain);
+ cmd = play_record_review(chan,"vm-rec-name",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
if (cmd < 0 || cmd == 't' || cmd == '#')
return cmd;
}
@@ -5690,11 +5693,11 @@
/* If forcegreetings is set, have the user record their greetings */
if (ast_test_flag(vmu, VM_FORCEGREET)) {
snprintf(prefile,sizeof(prefile), "%s%s/%s/unavail", VM_SPOOL_DIR, vmu->context, vms->username);
- cmd = play_record_review(chan,"vm-rec-unv",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain);
+ cmd = play_record_review(chan,"vm-rec-unv",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
if (cmd < 0 || cmd == 't' || cmd == '#')
return cmd;
snprintf(prefile,sizeof(prefile), "%s%s/%s/busy", VM_SPOOL_DIR, vmu->context, vms->username);
- cmd = play_record_review(chan,"vm-rec-busy",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain);
+ cmd = play_record_review(chan,"vm-rec-busy",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
if (cmd < 0 || cmd == 't' || cmd == '#')
return cmd;
}
@@ -5728,15 +5731,15 @@
switch (cmd) {
[... 11542 lines stripped ...]
More information about the asterisk-commits
mailing list