[asterisk-commits] branch group/asterisk-imap r37878 - in
/team/group/asterisk-imap: ./ agi/ app...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue Jul 18 09:01:27 MST 2006
Author: mogorman
Date: Tue Jul 18 11:01:26 2006
New Revision: 37878
URL: http://svn.digium.com/view/asterisk?rev=37878&view=rev
Log:
Merged revisions 37492,37494,37501,37508,37514-37515,37517,37532,37547,37563-37565,37572,37586,37596,37604,37613,37629,37638,37643-37644,37652-37653,37661,37669-37670,37678,37680,37682,37692,37719,37733-37734,37744,37755,37766,37785,37809,37829-37830,37857 via svnmerge from
https://svn.digium.com/svn/asterisk/trunk
................
r37492 | russell | 2006-07-12 17:10:59 -0500 (Wed, 12 Jul 2006) | 2 lines
fix some more app_voicemail breakage
................
r37494 | kpfleming | 2006-07-12 17:42:13 -0500 (Wed, 12 Jul 2006) | 5 lines
G726-32 changes:
split support for G726-32 into RFC3551 and AAL2 packing orders, since both are in use
change "G726-32" to be RFC3551 packing order, in spite of devices that use AAL2 order with this MIME type
add ability to directly transcode between packing orders
................
r37501 | kpfleming | 2006-07-12 20:38:47 -0500 (Wed, 12 Jul 2006) | 2 lines
allow users of RTP to use G726-32 AAL2 packing even when RFC3551 packing has been requested (Sipura/Grandstream ATAs and others will need this)
................
r37508 | crichter | 2006-07-13 09:13:24 -0500 (Thu, 13 Jul 2006) | 1 line
added even more statefulness for sending out disconnect/release/release_complete messages. added support for incoming presentation/screening. fixed a bug that we generate TONE_EVENTS on hanguptone_indicatem, which caused asterisk to write blocking thread messages. added nodialtone option to prevent dialtone for always_immediate
................
r37514 | kpfleming | 2006-07-13 10:20:02 -0500 (Thu, 13 Jul 2006) | 16 lines
Merged revisions 37441-37442 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r37441 | kpfleming | 2006-07-12 10:46:56 -0500 (Wed, 12 Jul 2006) | 3 lines
fix a case where ast_lock_path() could leave a randomly-named lock file hanging around
make ast_unlock_path actually report when unlocking fails
........
r37442 | kpfleming | 2006-07-12 10:53:53 -0500 (Wed, 12 Jul 2006) | 2 lines
fix a weird case where a lock file could be left (but would happen almost never)
........
................
r37515 | kpfleming | 2006-07-13 10:37:56 -0500 (Thu, 13 Jul 2006) | 2 lines
only compare the queue entry's max penalty to the member's penalty when the queue entry actually has a non-zero penalty
................
r37517 | tilghman | 2006-07-13 10:47:30 -0500 (Thu, 13 Jul 2006) | 10 lines
Merged revisions 37516 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r37516 | tilghman | 2006-07-13 10:45:33 -0500 (Thu, 13 Jul 2006) | 2 lines
Bug 7532 - Typo in enum example
........
................
r37532 | kpfleming | 2006-07-13 11:47:20 -0500 (Thu, 13 Jul 2006) | 10 lines
Merged revisions 37531 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r37531 | kpfleming | 2006-07-13 11:44:23 -0500 (Thu, 13 Jul 2006) | 2 lines
report address of peer trying to subscribe to unknown hint
........
................
r37547 | russell | 2006-07-13 13:45:21 -0500 (Thu, 13 Jul 2006) | 10 lines
Blocked revisions 37546 via svnmerge
........
r37546 | russell | 2006-07-13 14:44:17 -0400 (Thu, 13 Jul 2006) | 3 lines
yeah, ummm... This frame pointer should not be static. This situation only
exists in 1.2 (pointed out by Constantine Filin on the asterisk-dev mailing list)
........
................
r37563 | tilghman | 2006-07-13 15:14:27 -0500 (Thu, 13 Jul 2006) | 2 lines
Whitespace fix
................
r37564 | kpfleming | 2006-07-13 15:35:41 -0500 (Thu, 13 Jul 2006) | 2 lines
actually make the non-standard G726-32 behavior available for SIP clients
................
r37565 | kpfleming | 2006-07-13 15:39:34 -0500 (Thu, 13 Jul 2006) | 2 lines
swap the G726-32 format numbers, so that IAX2 connections with prior versions of Asterisk will still work properly
................
r37572 | kpfleming | 2006-07-13 16:23:11 -0500 (Thu, 13 Jul 2006) | 10 lines
Merged revisions 37571 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r37571 | kpfleming | 2006-07-13 16:22:11 -0500 (Thu, 13 Jul 2006) | 2 lines
don't fail/abort if the message category sound file cannot be played, just generate a warning message and continue message playback
........
................
r37586 | russell | 2006-07-13 17:03:47 -0500 (Thu, 13 Jul 2006) | 2 lines
fix some typos in the conversion from the old SOONER macro to ast_tvcmp
................
r37596 | tilghman | 2006-07-14 00:42:06 -0500 (Fri, 14 Jul 2006) | 2 lines
Whitespace fix
................
r37604 | tilghman | 2006-07-14 01:03:41 -0500 (Fri, 14 Jul 2006) | 2 lines
Whitespace fixes
................
r37613 | tilghman | 2006-07-14 08:34:25 -0500 (Fri, 14 Jul 2006) | 10 lines
Merged revisions 37612 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r37612 | tilghman | 2006-07-14 08:31:11 -0500 (Fri, 14 Jul 2006) | 2 lines
Bug 7526 - previous commit broke app_sms
........
................
r37629 | north | 2006-07-14 15:14:38 -0500 (Fri, 14 Jul 2006) | 9 lines
Rename a couple variables, to be consistent with the rest of the functions
Abstract out some common code into a single function
With the recent scheduler "issues", it pointed out a few things I might have been missing,
so I added some rudimentary vrtp and rtcp stuff
General cleanup...
................
r37638 | russell | 2006-07-14 16:02:55 -0500 (Fri, 14 Jul 2006) | 2 lines
add missing unregistration of a manager action on module unload
................
r37643 | north | 2006-07-14 16:49:20 -0500 (Fri, 14 Jul 2006) | 5 lines
There was an issue with ADSI and iax2, where on an iaxy with a normal phone connected,
in vm_authenticate, it was try to start ADSI on the channel, and it WOULD because it
was "supported", according to the iaxy. There is now a config option (adsi=yes) for
this, which defaults to no. (config sample coming shortly)
................
r37644 | north | 2006-07-14 16:49:40 -0500 (Fri, 14 Jul 2006) | 2 lines
config sample for the previous, regarding ADSI
................
r37652 | kpfleming | 2006-07-15 11:39:17 -0500 (Sat, 15 Jul 2006) | 2 lines
update to autoconf 2.60 version
................
r37653 | kpfleming | 2006-07-15 11:40:05 -0500 (Sat, 15 Jul 2006) | 2 lines
use LDFLAGS and LIBS properly, and allow dependencies to provide LDFLAGS if needed (although none do today)
................
r37661 | kpfleming | 2006-07-15 14:59:35 -0500 (Sat, 15 Jul 2006) | 4 lines
more Makefile cleanup and consistency stuff
don't reuse LIBS variable from top-level Makefile (oops)
build Asterisk binary after subdirs (preparing for embedded modules)
................
r37669 | north | 2006-07-15 15:02:20 -0500 (Sat, 15 Jul 2006) | 4 lines
oops?
This should've been 5 chars..
................
r37670 | kpfleming | 2006-07-15 15:12:28 -0500 (Sat, 15 Jul 2006) | 3 lines
add comments on what special variables are for
put library path into proper variable for *BSD
................
r37678 | tilghman | 2006-07-15 16:39:26 -0500 (Sat, 15 Jul 2006) | 2 lines
Move curl version test to autoconf script
................
r37680 | kpfleming | 2006-07-15 16:41:40 -0500 (Sat, 15 Jul 2006) | 2 lines
update configure script with new curl version test
................
r37682 | north | 2006-07-15 16:56:58 -0500 (Sat, 15 Jul 2006) | 2 lines
case consistency in DISA (or is it "disa"?)
................
r37692 | tilghman | 2006-07-15 18:35:21 -0500 (Sat, 15 Jul 2006) | 12 lines
Merged revisions 37691 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r37691 | tilghman | 2006-07-15 18:29:28 -0500 (Sat, 15 Jul 2006) | 4 lines
Bug 7513 - ensure that each time we do a query, the results are returned in the
same logical order, so that when we iterate over the list, we get all results,
not some results repeated, due to insufficient sorting.
........
................
r37719 | rizzo | 2006-07-16 08:01:48 -0500 (Sun, 16 Jul 2006) | 5 lines
typo LDFAGS -> LDFLLAGS
detected by: noisy build on FreeBSD
................
r37733 | russell | 2006-07-16 14:35:09 -0500 (Sun, 16 Jul 2006) | 2 lines
malloc + memset to ast_calloc
................
r37734 | russell | 2006-07-16 14:36:29 -0500 (Sun, 16 Jul 2006) | 3 lines
add a QueueLog application that allows for custom entries in the queue_log
(issue #7368, by stevedavies with some modifications)
................
r37744 | rizzo | 2006-07-16 17:24:39 -0500 (Sun, 16 Jul 2006) | 6 lines
use a couple of variables to remove duplicate definitions
of the various rules for the NOISY/!NOISY cases.
Approved by: kevin
................
r37755 | markster | 2006-07-16 21:17:38 -0500 (Sun, 16 Jul 2006) | 2 lines
Make app_meetme's do_invite more generic.
................
r37766 | tilghman | 2006-07-17 10:56:16 -0500 (Mon, 17 Jul 2006) | 10 lines
Merged revisions 37765 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r37765 | tilghman | 2006-07-17 10:52:15 -0500 (Mon, 17 Jul 2006) | 2 lines
Overflow bad
........
................
r37785 | tilghman | 2006-07-17 11:31:43 -0500 (Mon, 17 Jul 2006) | 2 lines
H.263 frames can apparently be larger than was originally coded.
................
r37809 | tilghman | 2006-07-17 17:39:02 -0500 (Mon, 17 Jul 2006) | 9 lines
Blocked revisions 37808 via svnmerge
........
r37808 | tilghman | 2006-07-17 17:36:56 -0500 (Mon, 17 Jul 2006) | 2 lines
Backport buffer increase to 1.2
........
................
r37829 | russell | 2006-07-17 18:26:22 -0500 (Mon, 17 Jul 2006) | 10 lines
Blocked revisions 37828 via svnmerge
........
r37828 | russell | 2006-07-17 19:25:33 -0400 (Mon, 17 Jul 2006) | 3 lines
if asked to duplicate a frame that has no data, don't set the frame's data
pointer past the end of the allocatted buffer for the new frame
........
................
r37830 | russell | 2006-07-17 18:31:24 -0500 (Mon, 17 Jul 2006) | 3 lines
if asked to duplicate a frame that has no data, don't set the frame's data
pointer past the end of the buffer allocated for the new frame
................
r37857 | russell | 2006-07-17 19:43:57 -0500 (Mon, 17 Jul 2006) | 10 lines
Merged revisions 37856 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r37856 | russell | 2006-07-17 20:41:47 -0400 (Mon, 17 Jul 2006) | 2 lines
don't crash if the frame has no data, but has a src
........
................
Modified:
team/group/asterisk-imap/ (props changed)
team/group/asterisk-imap/Makefile
team/group/asterisk-imap/Makefile.moddir_rules
team/group/asterisk-imap/Makefile.rules
team/group/asterisk-imap/UPGRADE.txt
team/group/asterisk-imap/agi/Makefile
team/group/asterisk-imap/app.c
team/group/asterisk-imap/apps/Makefile
team/group/asterisk-imap/apps/app_disa.c
team/group/asterisk-imap/apps/app_meetme.c
team/group/asterisk-imap/apps/app_queue.c
team/group/asterisk-imap/apps/app_sms.c
team/group/asterisk-imap/apps/app_voicemail.c
team/group/asterisk-imap/cdr/Makefile
team/group/asterisk-imap/channel.c
team/group/asterisk-imap/channels/Makefile
team/group/asterisk-imap/channels/chan_iax2.c
team/group/asterisk-imap/channels/chan_jingle.c
team/group/asterisk-imap/channels/chan_mgcp.c
team/group/asterisk-imap/channels/chan_misdn.c
team/group/asterisk-imap/channels/chan_sip.c
team/group/asterisk-imap/channels/chan_skinny.c
team/group/asterisk-imap/channels/chan_zap.c
team/group/asterisk-imap/channels/misdn/chan_misdn_config.h
team/group/asterisk-imap/channels/misdn/isdn_lib.c
team/group/asterisk-imap/channels/misdn_config.c
team/group/asterisk-imap/codecs/Makefile
team/group/asterisk-imap/codecs/codec_g726.c
team/group/asterisk-imap/configs/iax.conf.sample
team/group/asterisk-imap/configs/misdn.conf.sample
team/group/asterisk-imap/configs/sip.conf.sample
team/group/asterisk-imap/configure
team/group/asterisk-imap/configure.ac
team/group/asterisk-imap/doc/enum.txt
team/group/asterisk-imap/enum.c
team/group/asterisk-imap/formats/Makefile
team/group/asterisk-imap/formats/format_h263.c
team/group/asterisk-imap/frame.c
team/group/asterisk-imap/funcs/Makefile
team/group/asterisk-imap/include/asterisk/frame.h
team/group/asterisk-imap/include/asterisk/rtp.h
team/group/asterisk-imap/manager.c
team/group/asterisk-imap/pbx/Makefile
team/group/asterisk-imap/res/Makefile
team/group/asterisk-imap/rtp.c
team/group/asterisk-imap/sched.c
team/group/asterisk-imap/utils/Makefile
Propchange: team/group/asterisk-imap/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/group/asterisk-imap/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/group/asterisk-imap/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul 18 11:01:26 2006
@@ -1,1 +1,1 @@
-/trunk:1-37490
+/trunk:1-37877
Modified: team/group/asterisk-imap/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/asterisk-imap/Makefile?rev=37878&r1=37877&r2=37878&view=diff
==============================================================================
--- team/group/asterisk-imap/Makefile (original)
+++ team/group/asterisk-imap/Makefile Tue Jul 18 11:01:26 2006
@@ -9,6 +9,15 @@
#
# This program is free software, distributed under the terms of
# the GNU General Public License
+#
+
+# All Makefiles use the following variables:
+#
+# LDFLAGS - linker flags (not libraries), used for all links
+# LIBS - additional libraries, at top-level for all links,
+# on a single object just for that object
+# SOLINK - linker flags used only for creating shared objects (.so files),
+# used for all .so links
#
.EXPORT_ALL_VARIABLES:
@@ -238,7 +247,7 @@
ifeq ($(OSARCH),FreeBSD)
BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
- LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
+ AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
endif # FreeBSD
ifeq ($(OSARCH),NetBSD)
@@ -311,13 +320,13 @@
endif
ifeq ($(OSARCH),Linux)
- LIBS+=-ldl -lpthread $(EDITLINE_LIB) -lm -lresolv #-lnjamd
+ AST_LIBS+=-ldl -lpthread $(EDITLINE_LIB) -lm -lresolv #-lnjamd
else
- LIBS+=$(EDITLINE_LIB) -lm
+ AST_LIBS+=$(EDITLINE_LIB) -lm
endif
ifeq ($(OSARCH),Darwin)
- LIBS+=-lresolv
+ AST_LIBS+=-lresolv
ASTCFLAGS+=-D__Darwin__
AUDIO_LIBS=-framework CoreAudio
ASTLINK=-Wl,-dynamic
@@ -332,24 +341,24 @@
ASTLINK=-Wl,-E
SOLINK=-shared -Xlinker -x
ifeq ($(findstring BSD,$(OSARCH)),BSD)
- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
+ LDFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
endif
endif
ifeq ($(OSARCH),FreeBSD)
- LIBS+=-lcrypto
+ AST_LIBS+=-lcrypto
endif
ifeq ($(OSARCH),NetBSD)
- LIBS+=-lpthread -lcrypto -lm -L$(CROSS_COMPILE_TARGET)/usr/pkg/lib $(EDITLINE_LIB)
+ AST_LIBS+=-lpthread -lcrypto -lm -L$(CROSS_COMPILE_TARGET)/usr/pkg/lib $(EDITLINE_LIB)
endif
ifeq ($(OSARCH),OpenBSD)
- LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIB)
+ AST_LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIB)
endif
ifeq ($(OSARCH),SunOS)
- LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/opt/ssl/lib -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
+ AST_LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/opt/ssl/lib -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
OBJS+=strcompat.o
ASTLINK=
SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
@@ -377,7 +386,7 @@
@echo " + make install +"
@echo " +-------------------------------------------+"
-all: cleantest config.status menuselect.makeopts depend asterisk $(SUBDIRS)
+all: cleantest config.status menuselect.makeopts depend $(SUBDIRS) asterisk
$(MOD_SUBDIRS):
@CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@
@@ -413,10 +422,10 @@
endif
editline/config.h:
- cd editline && unset CFLAGS LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
+ cd editline && unset CFLAGS AST_LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
editline/libedit.a:
- cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
+ cd editline && unset CFLAGS AST_LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
$(MAKE) -C editline libedit.a
db1-ast/libdb1.a:
@@ -492,11 +501,11 @@
fi
@rm -f include/asterisk/build.h.tmp
@$(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
- @echo " [LD] $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.1 $(LIBS) -> $@"
- @$(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a $(LIBS)
+ @echo " [LD] $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.1 $(AST_LIBS) -> $@"
+ @$(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a $(AST_LIBS)
muted: muted.o
-muted: LDFLAGS+=$(AUDIO_LIBS)
+muted: LIBS+=$(AUDIO_LIBS)
$(SUBDIRS_CLEAN_DEPEND):
@$(MAKE) -C $(@:-clean-depend=) clean-depend
@@ -892,7 +901,7 @@
@CFLAGS="-include $(ASTTOPDIR)/include/asterisk/autoconfig.h -I$(ASTTOPDIR)/include" PARENTSRC="$(ASTTOPDIR)" $(MAKE) -C menuselect menuselect
mxml/libmxml.a:
- @cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
+ @cd mxml && unset CFLAGS AST_LIBS && test -f config.h || ./configure
$(MAKE) -C mxml libmxml.a
makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml
Modified: team/group/asterisk-imap/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/group/asterisk-imap/Makefile.moddir_rules?rev=37878&r1=37877&r2=37878&view=diff
==============================================================================
--- team/group/asterisk-imap/Makefile.moddir_rules (original)
+++ team/group/asterisk-imap/Makefile.moddir_rules Tue Jul 18 11:01:26 2006
@@ -25,21 +25,23 @@
define module_so_o_template
$(1).so: $(1).o
-$(1).so: LDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LIB))
+$(1).so: LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LIB))
+$(1).so: LDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LDFLAGS))
endef
define module_so_oo_template
$(1).so: $(1).oo
-$(1).so: LDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LIB))
+$(1).so: LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LIB))
+$(1).so: LDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LDFLAGS))
endef
-$(foreach mod,$(filter-out $(CC_MODS),$(SELECTED_MODS)),$(eval $(call module_o_c_template,$(mod))))
+$(foreach mod,$(C_MODS),$(eval $(call module_o_c_template,$(mod))))
-$(foreach mod,$(filter-out $(CC_MODS),$(SELECTED_MODS)),$(eval $(call module_so_o_template,$(mod))))
+$(foreach mod,$(C_MODS),$(eval $(call module_so_o_template,$(mod))))
-$(foreach mod,$(filter $(CC_MODS),$(SELECTED_MODS)),$(eval $(call module_oo_cc_template,$(mod))))
+$(foreach mod,$(CC_MODS),$(eval $(call module_oo_cc_template,$(mod))))
-$(foreach mod,$(filter $(CC_MODS),$(SELECTED_MODS)),$(eval $(call module_so_oo_template,$(mod))))
+$(foreach mod,$(CC_MODS),$(eval $(call module_so_oo_template,$(mod))))
.PHONY: clean clean-depend depend uninstall _all
Modified: team/group/asterisk-imap/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/group/asterisk-imap/Makefile.rules?rev=37878&r1=37877&r2=37878&view=diff
==============================================================================
--- team/group/asterisk-imap/Makefile.rules (original)
+++ team/group/asterisk-imap/Makefile.rules Tue Jul 18 11:01:26 2006
@@ -11,112 +11,72 @@
# the GNU General Public License
#
+# Each command is preceded by a short comment on what to do.
+# Prefixing one or the other with @\# or @ or nothing makes the desired
+# behaviour. ECHO_PREFIX prefixes the comment, CMD_PREFIX prefixes the command.
+
ifeq ($(NOISY_BUILD),)
+ ECHO_PREFIX=@
+ CMD_PREFIX=@
+else
+ ECHO_PREFIX=@\#
+ CMD_PREFIX=
+endif
define ast_make_o_c
$(1): $(2)
- @echo " [CC] $$< -> $$@"
- @$$(CC) -o $$@ -c $$< $$(CFLAGS)
+ $(ECHO_PREFIX) echo " [CC] $$< -> $$@"
+ $(CMD_PREFIX) $$(CC) -o $$@ -c $$< $$(CFLAGS)
endef
define ast_make_oo_cc
$(1): $(2)
- @echo " [CXX] $$< -> $$@"
- @$$(CXX) -o $$@ -c $$< $$(CFLAGS)
+ $(ECHO_PREFIX) echo " [CXX] $$< -> $$@"
+ $(CMD_PREFIX) $$(CXX) -o $$@ -c $$< $$(CFLAGS)
endef
define ast_make_c_y
$(1): $(2)
- @echo " [BISON] $$< -> $$@"
- @bison -o $$@ -d --name-prefix=ast_yy $$<
+ $(ECHO_PREFIX) echo " [BISON] $$< -> $$@"
+ $(CMD_PREFIX) bison -o $$@ -d --name-prefix=ast_yy $$<
endef
define ast_make_c_fl
$(1): $(2)
- @echo " [FLEX] $$< -> $$@"
- @flex -o $$@ --full $$<
+ $(ECHO_PREFIX) echo " [FLEX] $$< -> $$@"
+ $(CMD_PREFIX) flex -o $$@ --full $$<
endef
define ast_make_so_o
$(1): $(2)
- @echo " [LD] $$^ -> $$@"
- @$$(CC) -o $$@ $$(SOLINK) $$^ $$(LDFLAGS)
+ $(ECHO_PREFIX) echo " [LD] $$^ -> $$@"
+ $(CMD_PREFIX) $$(CC) -o $$@ $$(LDFLAGS) $$(SOLINK) $$^ $$(LIBS)
endef
define ast_make_so_oo
$(1): $(2)
- @echo " [LDXX] $$^ -> $$@"
- @$$(CXX) -o $$@ $$(SOLINK) $$^ $$(LDFLAGS)
+ $(ECHO_PREFIX) echo " [LDXX] $$^ -> $$@"
+ $(CMD_PREFIX) $$(CXX) -o $$@ $$(LDFLAGS) $$(SOLINK) $$^ $$(LIBS)
endef
define ast_make_a_o
$(1): $(2)
- @echo " [AR] $$^ -> $$@"
- @$$(AR) cr $$@ $$^
- @$$(RANLIB) $$@
+ $(ECHO_PREFIX) echo " [AR] $$^ -> $$@"
+ $(CMD_PREFIX) $$(AR) cr $$@ $$^
+ $(CMD_PREFIX) $$(RANLIB) $$@
endef
define ast_make_final
$(1): $(2)
- @echo " [LD] $$^ -> $$@"
- @$$(CC) -o $$@ $$^ $$(LDFLAGS)
+ $(ECHO_PREFIX) echo " [LD] $$^ -> $$@"
+ $(CMD_PREFIX) $$(CC) -o $$@ $$(LDFLAGS) $$^ $$(LIBS)
endef
define ast_make_final_host
$(1): $(2)
- @echo " [LD] $$^ -> $$@"
- @$$(HOST_CC) -o $$@ $$^ $$(CFLAGS) $$(LDFLAGS)
+ $(ECHO_PREFIX) echo " [LD] $$^ -> $$@"
+ $(CMD_PREFIX) $$(HOST_CC) -o $$@ $$(CFLAGS) $$(LDFLAGS) $$^ $$(LIBS)
endef
-
-else
-
-define ast_make_o_c
-$(1): $(2)
- $$(CC) -o $$@ -c $$< $$(CFLAGS)
-endef
-
-define ast_make_oo_cc
-$(1): $(2)
- $$(CXX) -o $$@ -c $$< $$(CFLAGS)
-endef
-
-define ast_make_c_y
-$(1): $(2)
- bison -o $$@ -d --name-prefix=ast_yy $$<
-endef
-
-define ast_make_c_fl
-$(1): $(2)
- flex -o $$@ --full $$<
-endef
-
-define ast_make_so_o
-$(1): $(2)
- $$(CC) -o $$@ $$(SOLINK) $$^ $$(LDFLAGS)
-endef
-
-define ast_make_so_oo
-$(1): $(2)
- $$(CXX) -o $$@ $$(SOLINK) $$^ $$(LDFLAGS)
-endef
-
-define ast_make_a_o
-$(1): $(2)
- $$(AR) cr $$@ $$^
- $$(RANLIB) $$@
-endef
-
-define ast_make_final
-$(1): $(2)
- $$(CC) -o $$@ $$^ $$(LDFLAGS)
-endef
-
-define ast_make_final_host
-$(1): $(2)
- $$(HOST_CC) -o $$@ $$^ $$(CFLAGS) $$(LDFLAGS)
-endef
-
-endif
$(eval $(call ast_make_o_c,%.o,%.c))
Modified: team/group/asterisk-imap/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/group/asterisk-imap/UPGRADE.txt?rev=37878&r1=37877&r2=37878&view=diff
==============================================================================
--- team/group/asterisk-imap/UPGRADE.txt (original)
+++ team/group/asterisk-imap/UPGRADE.txt Tue Jul 18 11:01:26 2006
@@ -285,6 +285,23 @@
* Support for MFC/R2 has been removed, as it has not been functional for some
time and it has no maintainer.
+The G726-32 codec:
+
+* It has been determined that previous versions of Asterisk used the wrong codeword
+ packing order for G726-32 data. This version supports both available packing orders,
+ and can transcode between them. It also now selects the proper order when
+ negotiating with a SIP peer based on the codec name supplied in the SDP. However,
+ there are existing devices that improperly request one order and then use another;
+ Sipura and Grandstream ATAs are known to do this, and there may be others. To
+ be able to continue to use these devices with this version of Asterisk and the
+ G726-32 codec, a configuration parameter called 'g726nonstandard' has been added
+ to sip.conf, so that Asterisk can use the packing order expected by the device (even
+ though it requested a different order). In addition, the internal format number for
+ G726-32 has been changed, and the old number is now assigned to AAL2-G726-32. The
+ result of this is that this version of Asterisk will be able to interoperate over
+ IAX2 with older versions of Asterisk, as long as this version is told to allow
+ 'g726aal2' instead of 'g726' as the codec for the call.
+
Installation:
* On BSD systems, the installation directories have changed to more "FreeBSDish"
Modified: team/group/asterisk-imap/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/asterisk-imap/agi/Makefile?rev=37878&r1=37877&r2=37878&view=diff
==============================================================================
--- team/group/asterisk-imap/agi/Makefile (original)
+++ team/group/asterisk-imap/agi/Makefile Tue Jul 18 11:01:26 2006
@@ -16,7 +16,7 @@
AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
ifeq ($(OSARCH),SunOS)
- LDFLAGS+=-lsocket -lnsl ../strcompat.o
+ LIBS+=-lsocket -lnsl ../strcompat.o
endif
include $(ASTTOPDIR)/Makefile.rules
Modified: team/group/asterisk-imap/app.c
URL: http://svn.digium.com/view/asterisk/team/group/asterisk-imap/app.c?rev=37878&r1=37877&r2=37878&view=diff
==============================================================================
--- team/group/asterisk-imap/app.c (original)
+++ team/group/asterisk-imap/app.c Tue Jul 18 11:01:26 2006
@@ -931,11 +931,13 @@
start = time(NULL);
while (((res = link(fs, s)) < 0) && (errno == EEXIST) && (time(NULL) - start < 5))
usleep(1);
+
+ unlink(fs);
+
if (res) {
ast_log(LOG_WARNING, "Failed to lock path '%s': %s\n", path, strerror(errno));
return AST_LOCK_TIMEOUT;
} else {
- unlink(fs);
ast_log(LOG_DEBUG, "Locked path '%s'\n", path);
return AST_LOCK_SUCCESS;
}
@@ -944,11 +946,21 @@
int ast_unlock_path(const char *path)
{
char *s;
- if (!(s = alloca(strlen(path) + 10)))
+ int res;
+
+ if (!(s = alloca(strlen(path) + 10))) {
+ ast_log(LOG_WARNING, "Out of memory!\n");
return -1;
+ }
+
snprintf(s, strlen(path) + 9, "%s/%s", path, ".lock");
- ast_log(LOG_DEBUG, "Unlocked path '%s'\n", path);
- return unlink(s);
+
+ if ((res = unlink(s)))
+ ast_log(LOG_ERROR, "Could not unlock path '%s': %s\n", path, strerror(errno));
+ else
+ ast_log(LOG_DEBUG, "Unlocked path '%s'\n", path);
+
+ return res;
}
int ast_record_review(struct ast_channel *chan, const char *playfile, const char *recordfile, int maxtime, const char *fmt, int *duration, const char *path)
Modified: team/group/asterisk-imap/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/asterisk-imap/apps/Makefile?rev=37878&r1=37877&r2=37878&view=diff
==============================================================================
--- team/group/asterisk-imap/apps/Makefile (original)
+++ team/group/asterisk-imap/apps/Makefile Tue Jul 18 11:01:26 2006
@@ -14,7 +14,10 @@
include ../menuselect.makedeps
endif
-SELECTED_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c)))
+C_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c)))
+CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.cc,%,$(wildcard app_*.cc)))
+
+SELECTED_MODS:=$(C_MODS) $(CC_MODS)
ifneq ($(findstring ODBC_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)
@@ -31,6 +34,5 @@
include $(ASTTOPDIR)/Makefile.moddir_rules
ifeq (SunOS,$(shell uname))
-app_chanspy.so: app_chanspy.o
- $(CC) $(SOLINK) -o $@ $< -lrt
+app_chanspy.so: LIBS+=-lrt
endif
Modified: team/group/asterisk-imap/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/team/group/asterisk-imap/apps/app_disa.c?rev=37878&r1=37877&r2=37878&view=diff
==============================================================================
--- team/group/asterisk-imap/apps/app_disa.c (original)
+++ team/group/asterisk-imap/apps/app_disa.c Tue Jul 18 11:01:26 2006
@@ -54,7 +54,7 @@
static char *synopsis = "DISA (Direct Inward System Access)";
static char *descrip =
- "DISA(<numeric passcode>[|<context>]) or disa(<filename>)\n"
+ "DISA(<numeric passcode>[|<context>]) or DISA(<filename>)\n"
"The DISA, Direct Inward System Access, application allows someone from \n"
"outside the telephone switch (PBX) to obtain an \"internal\" system \n"
"dialtone and to place calls from it as if they were placing a call from \n"
@@ -133,7 +133,7 @@
);
if (ast_strlen_zero(data)) {
- ast_log(LOG_WARNING, "disa requires an argument (passcode/passcode file)\n");
+ ast_log(LOG_WARNING, "DISA requires an argument (passcode/passcode file)\n");
return -1;
}
Modified: team/group/asterisk-imap/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/group/asterisk-imap/apps/app_meetme.c?rev=37878&r1=37877&r2=37878&view=diff
==============================================================================
--- team/group/asterisk-imap/apps/app_meetme.c (original)
+++ team/group/asterisk-imap/apps/app_meetme.c Tue Jul 18 11:01:26 2006
@@ -2435,7 +2435,7 @@
}
/*! Call in stations and trunk to the SLA */
-static void do_invite(struct ast_channel *orig, struct ast_sla *sla, const char *tech, const char *dest, const char *app)
+static void do_invite(struct ast_channel *orig, const char *tech, const char *dest, const char *app, const char *data)
{
struct sla_originate_helper *slal;
pthread_attr_t attr;
@@ -2447,7 +2447,7 @@
ast_copy_string(slal->tech, tech, sizeof(slal->tech));
ast_copy_string(slal->data, dest, sizeof(slal->data));
ast_copy_string(slal->app, app, sizeof(slal->app));
- ast_copy_string(slal->appdata, sla->name, sizeof(slal->appdata));
+ ast_copy_string(slal->appdata, data, sizeof(slal->appdata));
if (orig->cid.cid_num)
ast_copy_string(slal->cid_num, orig->cid.cid_num, sizeof(slal->cid_num));
if (orig->cid.cid_name)
@@ -2460,13 +2460,13 @@
static void invite_stations(struct ast_channel *orig, struct ast_sla *sla)
{
ASTOBJ_CONTAINER_TRAVERSE(&sla->stations, 1, {
- do_invite(orig, sla,iterator->tech, iterator->dest, "SLAS");
+ do_invite(orig, iterator->tech, iterator->dest, "SLAS", sla->name);
});
}
static void invite_trunk(struct ast_channel *orig, struct ast_sla *sla)
{
- do_invite(orig, sla,sla->trunktech, sla->trunkdest, "SLAT");
+ do_invite(orig, sla->trunktech, sla->trunkdest, "SLAT", sla->name);
}
Modified: team/group/asterisk-imap/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/group/asterisk-imap/apps/app_queue.c?rev=37878&r1=37877&r2=37878&view=diff
==============================================================================
--- team/group/asterisk-imap/apps/app_queue.c (original)
+++ team/group/asterisk-imap/apps/app_queue.c Tue Jul 18 11:01:26 2006
@@ -23,18 +23,18 @@
* \author Mark Spencer <markster at digium.com>
*
* \arg Config in \ref Config_qu queues.conf
- *
+ *
* \par Development notes
* \note 2004-11-25: Persistent Dynamic Members added by:
* NetNation Communications (www.netnation.com)
* Kevin Lindsay <kevinl at netnation.com>
- *
+ *
* Each dynamic agent in each queue is now stored in the astdb.
* When asterisk is restarted, each agent will be automatically
* readded into their recorded queues. This feature can be
* configured with the 'persistent_members=<1|0>' setting in the
* '[general]' category in queues.conf. The default is on.
- *
+ *
* \note 2004-06-04: Priorities in queues added by inAccess Networks (work funded by Hellas On Line (HOL) www.hol.gr).
*
* \note These features added by David C. Troy <dave at toad.net>:
@@ -140,7 +140,7 @@
" 'h' -- allow callee to hang up by hitting *.\n"
" 'H' -- allow caller to hang up by hitting *.\n"
" 'n' -- no retries on the timeout; will exit this application and \n"
-" go to the next step.\n"
+" go to the next step.\n"
" 'r' -- ring instead of playing MOH\n"
" 't' -- allow the called user transfer the calling user\n"
" 'T' -- to allow the calling user to transfer the call.\n"
@@ -227,6 +227,13 @@
" UNPAUSED | NOTFOUND\n"
"Example: UnpauseQueueMember(|SIP/3000)\n";
+static char *app_ql = "QueueLog" ;
+static char *app_ql_synopsis = "Writes to the queue_log" ;
+static char *app_ql_descrip =
+" QueueLog(queuename|uniqueid|agent|event[|additionalinfo]):\n"
+"Allows you to write your own events into the queue log\n"
+"Example: QueueLog(101|${UNIQUEID}|${AGENT}|WENTONBREAK|600)\n";
+
/*! \brief Persistent Members astdb family */
static const char *pm_family = "/Queue/PersistentMembers";
/* The maximum length of each persistent member queue database entry */
@@ -254,7 +261,7 @@
QUEUE_FULL = 6,
};
-const struct {
+const struct {
enum queue_result id;
char *text;
} queue_results[] = {
@@ -285,37 +292,37 @@
LOCAL_USER_DECL;
struct queue_ent {
- struct call_queue *parent; /*!< What queue is our parent */
- char moh[80]; /*!< Name of musiconhold to be used */
- char announce[80]; /*!< Announcement to play for member when call is answered */
- char context[AST_MAX_CONTEXT]; /*!< Context when user exits queue */
- char digits[AST_MAX_EXTENSION]; /*!< Digits entered while in queue */
- int pos; /*!< Where we are in the queue */
- int prio; /*!< Our priority */
- int last_pos_said; /*!< Last position we told the user */
- time_t last_periodic_announce_time; /*!< The last time we played a periodic announcement */
- int last_periodic_announce_sound; /* The last periodic announcement we made */
- time_t last_pos; /*!< Last time we told the user their position */
- int opos; /*!< Where we started in the queue */
- int handled; /*!< Whether our call was handled */
- int max_penalty; /*!< Limit the members that can take this call to this penalty or lower */
- time_t start; /*!< When we started holding */
- time_t expire; /*!< When this entry should expire (time out of queue) */
- struct ast_channel *chan; /*!< Our channel */
- struct queue_ent *next; /*!< The next queue entry */
+ struct call_queue *parent; /*!< What queue is our parent */
+ char moh[80]; /*!< Name of musiconhold to be used */
+ char announce[80]; /*!< Announcement to play for member when call is answered */
+ char context[AST_MAX_CONTEXT]; /*!< Context when user exits queue */
+ char digits[AST_MAX_EXTENSION]; /*!< Digits entered while in queue */
+ int pos; /*!< Where we are in the queue */
+ int prio; /*!< Our priority */
+ int last_pos_said; /*!< Last position we told the user */
+ time_t last_periodic_announce_time; /*!< The last time we played a periodic announcement */
+ int last_periodic_announce_sound; /*!< The last periodic announcement we made */
+ time_t last_pos; /*!< Last time we told the user their position */
+ int opos; /*!< Where we started in the queue */
+ int handled; /*!< Whether our call was handled */
+ int max_penalty; /*!< Limit the members that can take this call to this penalty or lower */
+ time_t start; /*!< When we started holding */
+ time_t expire; /*!< When this entry should expire (time out of queue) */
+ struct ast_channel *chan; /*!< Our channel */
+ struct queue_ent *next; /*!< The next queue entry */
};
struct member {
- char interface[80]; /*!< Technology/Location */
- int penalty; /*!< Are we a last resort? */
- int calls; /*!< Number of calls serviced by this member */
- int dynamic; /*!< Are we dynamically added? */
- int status; /*!< Status of queue member */
- int paused; /*!< Are we paused (not accepting calls)? */
- time_t lastcall; /*!< When last successful call was hungup */
- unsigned int dead:1; /*!< Used to detect members deleted in realtime */
- unsigned int delme:1; /*!< Flag to delete entry on reload */
- struct member *next; /*!< Next member */
+ char interface[80]; /*!< Technology/Location */
+ int penalty; /*!< Are we a last resort? */
+ int calls; /*!< Number of calls serviced by this member */
+ int dynamic; /*!< Are we dynamically added? */
+ int status; /*!< Status of queue member */
+ int paused; /*!< Are we paused (not accepting calls)? */
+ time_t lastcall; /*!< When last successful call was hungup */
+ unsigned int dead:1; /*!< Used to detect members deleted in realtime */
+ unsigned int delme:1; /*!< Flag to delete entry on reload */
+ struct member *next; /*!< Next member */
};
struct member_interface {
@@ -334,10 +341,10 @@
struct call_queue {
ast_mutex_t lock;
- char name[80]; /*!< Name */
- char moh[80]; /*!< Music On Hold class to be used */
- char announce[80]; /*!< Announcement to play when call is answered */
- char context[AST_MAX_CONTEXT]; /*!< Exit context */
+ char name[80]; /*!< Name */
+ char moh[80]; /*!< Music On Hold class to be used */
+ char announce[80]; /*!< Announcement to play when call is answered */
+ char context[AST_MAX_CONTEXT]; /*!< Exit context */
unsigned int monjoin:1;
unsigned int dead:1;
unsigned int joinempty:2;
@@ -352,44 +359,44 @@
unsigned int strategy:3;
unsigned int maskmemberstatus:1;
unsigned int realtime:1;
- int announcefrequency; /*!< How often to announce their position */
- int periodicannouncefrequency; /*!< How often to play periodic announcement */
- int roundingseconds; /*!< How many seconds do we round to? */
- int holdtime; /*!< Current avg holdtime, based on recursive boxcar filter */
- int callscompleted; /*!< Number of queue calls completed */
- int callsabandoned; /*!< Number of queue calls abandoned */
- int servicelevel; /*!< seconds setting for servicelevel*/
- int callscompletedinsl; /*!< Number of calls answered with servicelevel*/
- char monfmt[8]; /*!< Format to use when recording calls */
- int montype; /*!< Monitor type Monitor vs. MixMonitor */
- char sound_next[80]; /*!< Sound file: "Your call is now first in line" (def. queue-youarenext) */
- char sound_thereare[80]; /*!< Sound file: "There are currently" (def. queue-thereare) */
- char sound_calls[80]; /*!< Sound file: "calls waiting to speak to a representative." (def. queue-callswaiting)*/
- char sound_holdtime[80]; /*!< Sound file: "The current estimated total holdtime is" (def. queue-holdtime) */
- char sound_minutes[80]; /*!< Sound file: "minutes." (def. queue-minutes) */
- char sound_lessthan[80]; /*!< Sound file: "less-than" (def. queue-lessthan) */
- char sound_seconds[80]; /*!< Sound file: "seconds." (def. queue-seconds) */
- char sound_thanks[80]; /*!< Sound file: "Thank you for your patience." (def. queue-thankyou) */
- char sound_reporthold[80]; /*!< Sound file: "Hold time" (def. queue-reporthold) */
[... 5864 lines stripped ...]
More information about the asterisk-commits
mailing list