[asterisk-commits] file: branch file/p2prtpbridging r41099 - in
/team/file/p2prtpbridging: ./ ag...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Aug 25 10:05:20 MST 2006
Author: file
Date: Fri Aug 25 12:05:19 2006
New Revision: 41099
URL: http://svn.digium.com/view/asterisk?rev=41099&view=rev
Log:
Merged revisions 40812,40815,40818-40820,40826,40832-40833,40837,40853-40854,40863-40864,40866,40877,40904,40928,40946,40949,40953,40955,40960,40964,40968,40972,40980-40981,40988,40990,40993,40995,41009,41015,41023,41026,41034,41054,41067-41068,41087-41088 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r40812 | file | 2006-08-21 21:01:39 -0400 (Mon, 21 Aug 2006) | 2 lines
Fix up the props a bit
................
r40815 | file | 2006-08-21 21:57:40 -0400 (Mon, 21 Aug 2006) | 2 lines
Sorry, but this does not resemble malloc... so GCC was ignoring the attribute and throwing a warning.
................
r40818 | file | 2006-08-21 22:15:34 -0400 (Mon, 21 Aug 2006) | 2 lines
Make doxygen work with the new location of files that now reside in main
................
r40819 | file | 2006-08-21 22:24:46 -0400 (Mon, 21 Aug 2006) | 2 lines
Make a warning about an unused function & variable go away on the stand alone AEL build.
................
r40820 | file | 2006-08-21 22:30:38 -0400 (Mon, 21 Aug 2006) | 2 lines
Another compile time warning bites the dust
................
r40826 | tilghman | 2006-08-21 23:01:49 -0400 (Mon, 21 Aug 2006) | 9 lines
Blocked revisions 40821 via svnmerge
........
r40821 | tilghman | 2006-08-21 21:59:37 -0500 (Mon, 21 Aug 2006) | 2 lines
Bug 7779 - Using initstate(3) means that we cannot unload this module once loaded.
........
................
r40832 | qwell | 2006-08-22 01:24:50 -0400 (Tue, 22 Aug 2006) | 2 lines
a couple Solaris tweaks, to help build properly.
................
r40833 | qwell | 2006-08-22 01:34:44 -0400 (Tue, 22 Aug 2006) | 4 lines
Solaris didn't like this.
Let's just go ahead and make this match every other uintXX_t in Asterisk.
................
r40837 | kpfleming | 2006-08-22 12:32:41 -0400 (Tue, 22 Aug 2006) | 2 lines
remove requirement for libtasn1, which appears to be a Debian thing
................
r40853 | kpfleming | 2006-08-22 17:45:15 -0400 (Tue, 22 Aug 2006) | 2 lines
add a new include file for out-of-tree modules that need to know where things are located
................
r40854 | kpfleming | 2006-08-22 17:57:16 -0400 (Tue, 22 Aug 2006) | 2 lines
when loadable modules are disabled, if someone tries to load a module that does not exist, don't dereference a NULL pointer, just stop trying to load it...
................
r40863 | kpfleming | 2006-08-22 19:06:13 -0400 (Tue, 22 Aug 2006) | 2 lines
minor improvements
................
r40864 | kpfleming | 2006-08-22 19:07:11 -0400 (Tue, 22 Aug 2006) | 2 lines
make platforms that use mutexes in stdio.h happy
................
r40866 | kpfleming | 2006-08-22 19:55:16 -0400 (Tue, 22 Aug 2006) | 2 lines
generate a message when a module cannot be found and loadable modules are disabled
................
r40877 | russell | 2006-08-22 23:07:34 -0400 (Tue, 22 Aug 2006) | 2 lines
merge menuselect_build ... most of the changes happened in menuselect
................
r40904 | tilghman | 2006-08-23 12:14:18 -0400 (Wed, 23 Aug 2006) | 10 lines
Merged revisions 40901 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r40901 | tilghman | 2006-08-23 11:05:26 -0500 (Wed, 23 Aug 2006) | 2 lines
Revert last change - breaks retrieval of builtin variables
........
................
r40928 | russell | 2006-08-23 13:44:33 -0400 (Wed, 23 Aug 2006) | 2 lines
remove svnmerge-integrated property
................
r40946 | qwell | 2006-08-23 14:51:39 -0400 (Wed, 23 Aug 2006) | 2 lines
move the "muted" svn:ignore to the utils/ directory
................
r40949 | kpfleming | 2006-08-23 15:28:13 -0400 (Wed, 23 Aug 2006) | 3 lines
use RTLD_NOLOAD if it's available to make loading dynamic modules a little faster and less resource-intensive
also, keep trying to dlclose() a module until it actually goes away, since it may have other modules it brought in when it was loaded (thanks PCadach for pointing this problem out to me)
................
r40953 | file | 2006-08-23 16:22:18 -0400 (Wed, 23 Aug 2006) | 2 lines
Free the filename so we don't have a memory leak. (reported by PCadach in #asterisk-bugs)
................
r40955 | file | 2006-08-23 16:39:23 -0400 (Wed, 23 Aug 2006) | 2 lines
Add a lasting legacy from 1082... a Macro to do a pre acknowledgement message with option to reject. Thanks to patbaker82 for this. (issue #1082 reported by damin)
................
r40960 | oej | 2006-08-23 17:19:21 -0400 (Wed, 23 Aug 2006) | 2 lines
Fixing a comment
................
r40964 | qwell | 2006-08-23 21:21:41 -0400 (Wed, 23 Aug 2006) | 8 lines
Okay, there are 3 reasons why I'm doing this.
1) Solaris sed doesn't have -r, which means things like \s and \S don't work.
2) GNU sed version 4.1.2 failed on a very simple test
echo "Test Test" | sed -r -e 's/\s/x/g'
should have returned "TestxxxTest", but did not (however, 4.1.4 did?).
3) The CFLAGS were never set, so that entire line actually did nothing. Now it's useful again.
................
r40968 | file | 2006-08-24 11:44:24 -0400 (Thu, 24 Aug 2006) | 2 lines
Documentation updates (thanks Shaun for the speechrec.txt one!)
................
r40972 | file | 2006-08-24 12:46:13 -0400 (Thu, 24 Aug 2006) | 10 lines
Merged revisions 40971 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r40971 | file | 2006-08-24 12:44:41 -0400 (Thu, 24 Aug 2006) | 2 lines
Minor documentation fix to add the 'dynamic' dialplan option from angler
........
................
r40980 | file | 2006-08-24 13:13:57 -0400 (Thu, 24 Aug 2006) | 10 lines
Merged revisions 40979 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r40979 | file | 2006-08-24 13:13:04 -0400 (Thu, 24 Aug 2006) | 2 lines
I can type english. Honest. Thanks Kenny.
........
................
r40981 | mattf | 2006-08-24 13:24:33 -0400 (Thu, 24 Aug 2006) | 2 lines
Revert stupid RTLD_NOLOAD change that breaks module loading on some systems.
................
r40988 | oej | 2006-08-24 14:49:35 -0400 (Thu, 24 Aug 2006) | 2 lines
Deprecate USERAGENT
................
r40990 | russell | 2006-08-24 14:57:46 -0400 (Thu, 24 Aug 2006) | 2 lines
remove CFLAGS that aren't needed anymore
................
r40993 | russell | 2006-08-24 15:07:01 -0400 (Thu, 24 Aug 2006) | 2 lines
fix codec_gsm build for powerpc
................
r40995 | russell | 2006-08-24 15:53:43 -0400 (Thu, 24 Aug 2006) | 19 lines
Merged revisions 40994 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r40994 | russell | 2006-08-24 15:41:26 -0400 (Thu, 24 Aug 2006) | 11 lines
Fix a few issues related to the handling of channel variables
- in pbx_builtin_serialize_variables(), the variable list traversal would stop
on a variables with empty name/values, which is not appropriate
- When removing the GROUP variables, use AST_LIST_REMOVE_CURRENT instead of
AST_LIST_REMOVE
- During masquerading, when copying the variables list from one channel to the
other, using AST_LIST_INSERT_TAIL is not valid for appending a whole list.
It leaves the tail pointer of the list invalid. Introduce a new macro,
AST_LIST_APPEND_LIST that appends a list properly.
(issue #7802, softins)
........
................
r41009 | qwell | 2006-08-24 17:30:34 -0400 (Thu, 24 Aug 2006) | 2 lines
Fix a small typo I found.
................
r41015 | qwell | 2006-08-24 18:17:12 -0400 (Thu, 24 Aug 2006) | 5 lines
As per the comments in this file..
The last patch was slightly wrong. This'll get it for sure.
Solaris (and some others) don't have sed -r. perl -p is equivalent
................
r41023 | russell | 2006-08-24 20:13:03 -0400 (Thu, 24 Aug 2006) | 2 lines
get cflags for libcurl as well as libs (patch from qwell)
................
r41026 | qwell | 2006-08-24 20:52:19 -0400 (Thu, 24 Aug 2006) | 2 lines
This is a bit safer on some versions of sed.
................
r41034 | russell | 2006-08-24 22:55:00 -0400 (Thu, 24 Aug 2006) | 2 lines
don't seg fault when using dbsecret
................
r41054 | kpfleming | 2006-08-25 10:14:27 -0400 (Fri, 25 Aug 2006) | 2 lines
remove documentation of 'global' section in modules.conf, since it is no longer needed or supported
................
r41067 | mattf | 2006-08-25 11:14:42 -0400 (Fri, 25 Aug 2006) | 2 lines
Don't send proceeding twice (#7800)
................
r41068 | mattf | 2006-08-25 11:20:16 -0400 (Fri, 25 Aug 2006) | 2 lines
Note to self, always compile before committing.
................
r41087 | kpfleming | 2006-08-25 12:14:00 -0400 (Fri, 25 Aug 2006) | 3 lines
instead of reverting this supposedly 'stupid' change, let's try to get it working properly
also eliminate a warning from dlopen() because some flags were missing on the second dlopen() call
................
r41088 | russell | 2006-08-25 12:19:58 -0400 (Fri, 25 Aug 2006) | 4 lines
we use autoconf 2.60.
Note that this only affects people regenerating the configure script.
................
Added:
team/file/p2prtpbridging/include/asterisk/paths.h
- copied unchanged from r41088, trunk/include/asterisk/paths.h
Modified:
team/file/p2prtpbridging/ (props changed)
team/file/p2prtpbridging/Makefile
team/file/p2prtpbridging/UPGRADE.txt
team/file/p2prtpbridging/agi/Makefile
team/file/p2prtpbridging/apps/app_speech_utils.c
team/file/p2prtpbridging/bootstrap.sh
team/file/p2prtpbridging/build_tools/make_buildopts_h
team/file/p2prtpbridging/build_tools/make_version
team/file/p2prtpbridging/build_tools/mkpkgconfig
team/file/p2prtpbridging/channels/chan_iax2.c
team/file/p2prtpbridging/channels/chan_zap.c
team/file/p2prtpbridging/codecs/gsm/Makefile
team/file/p2prtpbridging/configs/modules.conf.sample
team/file/p2prtpbridging/configs/zapata.conf.sample
team/file/p2prtpbridging/configure
team/file/p2prtpbridging/configure.ac
team/file/p2prtpbridging/contrib/asterisk-ng-doxygen
team/file/p2prtpbridging/doc/queues-with-callback-members.txt
team/file/p2prtpbridging/doc/speechrec.txt
team/file/p2prtpbridging/include/asterisk.h
team/file/p2prtpbridging/include/asterisk/autoconfig.h.in
team/file/p2prtpbridging/include/asterisk/linkedlists.h
team/file/p2prtpbridging/include/asterisk/utils.h
team/file/p2prtpbridging/main/asterisk.c
team/file/p2prtpbridging/main/channel.c
team/file/p2prtpbridging/main/chanvars.c
team/file/p2prtpbridging/main/db1-ast/Makefile
team/file/p2prtpbridging/main/editline/Makefile.in
team/file/p2prtpbridging/main/file.c
team/file/p2prtpbridging/main/loader.c
team/file/p2prtpbridging/main/pbx.c
team/file/p2prtpbridging/makeopts.in
team/file/p2prtpbridging/pbx/pbx_ael.c
team/file/p2prtpbridging/res/res_agi.c
team/file/p2prtpbridging/res/res_musiconhold.c
team/file/p2prtpbridging/utils/ (props changed)
team/file/p2prtpbridging/utils/muted.c
Propchange: team/file/p2prtpbridging/
------------------------------------------------------------------------------
automerge = paleezsir
Propchange: team/file/p2prtpbridging/
('automerge-email' removed)
Propchange: team/file/p2prtpbridging/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/file/p2prtpbridging/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/file/p2prtpbridging/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Fri Aug 25 12:05:19 2006
@@ -1,2 +1,1 @@
-menuselect http://svn.digium.com/svn/menuselect/trunk
-mxml http://svn.digium.com/svn/mxml/trunk
+menuselect http://svn.digium.com/svn/menuselect/branches/1.0
Propchange: team/file/p2prtpbridging/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Aug 25 12:05:19 2006
@@ -21,5 +21,4 @@
config.log
menuselect-tree
autom4te.cache
-muted
makeopts.embed_rules
Propchange: team/file/p2prtpbridging/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 25 12:05:19 2006
@@ -1,1 +1,1 @@
-/trunk:1-40808
+/trunk:1-41088
Modified: team/file/p2prtpbridging/Makefile
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/Makefile?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/Makefile (original)
+++ team/file/p2prtpbridging/Makefile Fri Aug 25 12:05:19 2006
@@ -177,7 +177,7 @@
endif
ifeq ($(OSARCH),SunOS)
- ASTCFLAGS+=-Wcast-align -DSOLARIS -Iinclude/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
+ ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
endif
ASTERISKVERSION:=$(shell build_tools/make_version .)
@@ -319,10 +319,9 @@
dist-clean: distclean
distclean: clean
- @$(MAKE) -C mxml clean
@$(MAKE) -C menuselect dist-clean
@$(MAKE) -C sounds dist-clean
- rm -f menuselect.makeopts makeopts makeopts.xml menuselect.makedeps
+ rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
rm -f makeopts.embed_rules
rm -f config.log config.status
rm -rf autom4te.cache
@@ -332,7 +331,7 @@
rm -f build_tools/menuselect-deps
datafiles: all
- if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
# Should static HTTP be installed during make samples or even with its own target ala
# webvoicemail? There are portions here that *could* be customized but might also be
# improved a lot. I'll put it here for now.
@@ -646,12 +645,8 @@
menuselect: menuselect/menuselect menuselect-tree
- at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || 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 mxml/libmxml.a
- @CFLAGS="-include $(ASTTOPDIR)/include/asterisk/autoconfig.h -I$(ASTTOPDIR)/include" PARENTSRC="$(ASTTOPDIR)" $(MAKE) -C menuselect CC="$(HOST_CC)" menuselect
-
-mxml/libmxml.a:
- @cd mxml && unset CC CFLAGS LDFLAGS && test -f config.h || ./configure --build=$(BUILD_PLATFORM) --host=$(BUILD_PLATFORM)
- $(MAKE) -C mxml libmxml.a
+menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
+ @PARENTSRC="$(ASTTOPDIR)" $(MAKE) -C menuselect CC="$(HOST_CC)"
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 ..."
Modified: team/file/p2prtpbridging/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/UPGRADE.txt?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/UPGRADE.txt (original)
+++ team/file/p2prtpbridging/UPGRADE.txt Fri Aug 25 12:05:19 2006
@@ -298,6 +298,10 @@
option in sip.conf is removed to osp.conf as authpolicy. allowguest option
in sip.conf cannot be set as osp anymore.
+* The $SIPUSERAGENT dialplan variable is deprecated and will be removed
+ in coming versions of Asterisk. Please use the dialplan function
+ SIPCHANINFO(useragent) instead.
+
The Zap channel:
* Support for MFC/R2 has been removed, as it has not been functional for some
Modified: team/file/p2prtpbridging/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/agi/Makefile?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/agi/Makefile (original)
+++ team/file/p2prtpbridging/agi/Makefile Fri Aug 25 12:05:19 2006
@@ -16,7 +16,7 @@
AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
ifeq ($(OSARCH),SunOS)
- LIBS+=-lsocket -lnsl ../strcompat.o
+ LIBS+=-lsocket -lnsl ../main/strcompat.o
endif
include $(ASTTOPDIR)/Makefile.rules
Modified: team/file/p2prtpbridging/apps/app_speech_utils.c
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/apps/app_speech_utils.c?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/apps/app_speech_utils.c (original)
+++ team/file/p2prtpbridging/apps/app_speech_utils.c Fri Aug 25 12:05:19 2006
@@ -64,8 +64,7 @@
"Once they stop talking the processing sound is played to indicate the speech recognition engine is working.\n"
"Once results are available the application returns and results (score and text) are available using dialplan functions.\n"
"The first text and score are ${SPEECH_TEXT(0)} AND ${SPEECH_SCORE(0)} while the second are ${SPEECH_TEXT(1)} and ${SPEECH_SCORE(1)}.\n"
-"This may change in the future, however, to use a dialplan function instead of dialplan variables. Note it is possible to have more then one result.\n"
- "The first argument is the sound file and the second is the timeout. Note the timeout will only start once the sound file has stopped playing.\n";
+"The first argument is the sound file and the second is the timeout. Note the timeout will only start once the sound file has stopped playing.\n";
static char *speechdeactivategrammar_descrip =
"SpeechDeactivateGrammar(Grammar Name)\n"
Modified: team/file/p2prtpbridging/bootstrap.sh
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/bootstrap.sh?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/bootstrap.sh (original)
+++ team/file/p2prtpbridging/bootstrap.sh Fri Aug 25 12:05:19 2006
@@ -12,17 +12,17 @@
uname -s | grep -q FreeBSD
if [ $? = 0 ]
then
- check_for_app autoconf259
- check_for_app autoheader259
+ check_for_app autoconf260
+ check_for_app autoheader260
check_for_app automake19
check_for_app aclocal19
echo "Generating the configure script ..."
aclocal19 2>/dev/null
- autoconf259
- autoheader259
+ autoconf260
+ autoheader260
automake19 --add-missing --copy 2>/dev/null
else
- AUTOCONF_VERSION=2.59
+ AUTOCONF_VERSION=2.60
AUTOMAKE_VERSION=1.9
export AUTOCONF_VERSION
export AUTOMAKE_VERSION
Modified: team/file/p2prtpbridging/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/build_tools/make_buildopts_h?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/build_tools/make_buildopts_h (original)
+++ team/file/p2prtpbridging/build_tools/make_buildopts_h Fri Aug 25 12:05:19 2006
@@ -7,7 +7,7 @@
*/
END
-TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed s/MENUSELECT_CFLAGS\=//g | sed s/-D//g`
+TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
for x in ${TMP}; do
echo "#define ${x} 1"
done
Modified: team/file/p2prtpbridging/build_tools/make_version
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/build_tools/make_version?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/build_tools/make_version (original)
+++ team/file/p2prtpbridging/build_tools/make_version Fri Aug 25 12:05:19 2006
@@ -5,7 +5,7 @@
elif [ -f ${1}/.svnrevision ]; then
echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision`
elif [ -d .svn ]; then
- PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asterisk/:: | sed -e 's:/: :g'`
+ PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
BRANCH=0
TEAM=0
Modified: team/file/p2prtpbridging/build_tools/mkpkgconfig
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/build_tools/mkpkgconfig?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/build_tools/mkpkgconfig (original)
+++ team/file/p2prtpbridging/build_tools/mkpkgconfig Fri Aug 25 12:05:19 2006
@@ -13,13 +13,20 @@
exit
fi
+#Solaris (and some others) don't have sed -r. perl -p is equivalent
+if [[ `echo "xxx" | sed -r 's/x/y/g' 2>/dev/null | grep -c "yyy"` != 0 ]]; then
+ EXTREGEX="sed -r -e"
+else
+ EXTREGEX="perl -pe"
+fi
+
## Clean out CFLAGS for the spec file.
-LOCAL_CFLAGS=`echo $CFLAGS | sed -e 's/\s*-pipe\s*//g' | sed -e 's/-[Wmp]\S*\s*//g' | \
- sed -r -e 's/-I(include|\.\.\/include) //g' | \
- sed -e 's/-DINSTALL_PREFIX=\S* //g' | \
- sed -r -e 's/-DASTERISK_VERSION=\S* //g' | \
- sed -r -e 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'`
+LOCAL_CFLAGS=`echo $CFLAGS | ${EXTREGEX} 's/\s*-pipe\s*//g' | ${EXTREGEX} 's/-[Wmp]\S*\s*//g' | \
+ ${EXTREGEX} 's/-I(include|\.\.\/include) //g' | \
+ ${EXTREGEX} 's/-DINSTALL_PREFIX=\S* //g' | \
+ ${EXTREGEX} 's/-DASTERISK_VERSION=\S* //g' | \
+ ${EXTREGEX} 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'`
cat <<EOF > $PPATH/asterisk.pc
Modified: team/file/p2prtpbridging/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/channels/chan_iax2.c?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/channels/chan_iax2.c (original)
+++ team/file/p2prtpbridging/channels/chan_iax2.c Fri Aug 25 12:05:19 2006
@@ -4743,19 +4743,21 @@
/* Keep this check last */
if (!ast_strlen_zero(user->dbsecret)) {
char *family, *key=NULL;
+ char buf[80];
family = ast_strdupa(user->dbsecret);
key = strchr(family, '/');
if (key) {
*key = '\0';
key++;
}
- if (!key || ast_db_get(family, key, (char*)iaxs[callno]->secret, sizeof(iaxs[callno]->secret))) {
+ if (!key || ast_db_get(family, key, buf, sizeof(buf))) {
ast_log(LOG_WARNING, "Unable to retrieve database password for family/key '%s'!\n", user->dbsecret);
if (ast_test_flag(user, IAX_TEMPONLY)) {
destroy_user(user);
user = NULL;
}
- }
+ } else
+ ast_string_field_set(iaxs[callno], secret, buf);
} else
ast_string_field_set(iaxs[callno], secret, user->secret);
res = 0;
Modified: team/file/p2prtpbridging/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/channels/chan_zap.c?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/channels/chan_zap.c (original)
+++ team/file/p2prtpbridging/channels/chan_zap.c Fri Aug 25 12:05:19 2006
@@ -8628,10 +8628,11 @@
res = set_actual_gain(pri->pvts[chanpos]->subs[SUB_REAL].zfd, 0, pri->pvts[chanpos]->rxgain, pri->pvts[chanpos]->txgain, law);
if (res < 0)
ast_log(LOG_WARNING, "Unable to set gains on channel %d\n", pri->pvts[chanpos]->channel);
- if (e->ring.complete || !pri->overlapdial)
+ if (e->ring.complete || !pri->overlapdial) {
/* Just announce proceeding */
+ pri->pvts[chanpos]->proceeding = 1;
pri_proceeding(pri->pri, e->ring.call, PVT_TO_CHANNEL(pri->pvts[chanpos]), 0);
- else {
+ } else {
if (pri->switchtype != PRI_SWITCH_GR303_TMC)
pri_need_more_info(pri->pri, e->ring.call, PVT_TO_CHANNEL(pri->pvts[chanpos]), 1);
else
Modified: team/file/p2prtpbridging/codecs/gsm/Makefile
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/codecs/gsm/Makefile?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/codecs/gsm/Makefile (original)
+++ team/file/p2prtpbridging/codecs/gsm/Makefile Fri Aug 25 12:05:19 2006
@@ -38,7 +38,7 @@
######### probably require gcc.
ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
-ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm ppc ppc64 ia64 s390 bfin ))
+ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm ppc powerpc ppc64 ia64 s390 bfin ))
ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
OPTIMIZE+=-march=$(PROC)
endif
Modified: team/file/p2prtpbridging/configs/modules.conf.sample
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/configs/modules.conf.sample?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/configs/modules.conf.sample (original)
+++ team/file/p2prtpbridging/configs/modules.conf.sample Fri Aug 25 12:05:19 2006
@@ -36,8 +36,3 @@
;
noload => chan_alsa.so
;noload => chan_oss.so
-;
-; Module names listed in "global" section will have symbols globally
-; exported to modules loaded after them.
-;
-[global]
Modified: team/file/p2prtpbridging/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/configs/zapata.conf.sample?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/configs/zapata.conf.sample (original)
+++ team/file/p2prtpbridging/configs/zapata.conf.sample Fri Aug 25 12:05:19 2006
@@ -73,6 +73,7 @@
; local: Local ISDN
; national: National ISDN
; international: International ISDN
+; dynamic: Dynamically selects the appropriate dialplan
;
;pridialplan=national
;
@@ -83,6 +84,7 @@
; local: Local ISDN
; national: National ISDN
; international: International ISDN
+; dynamic: Dynamically selects the appropriate dialplan
;
;prilocaldialplan=national
;
Modified: team/file/p2prtpbridging/configure
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/configure?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/configure (original)
+++ team/file/p2prtpbridging/configure Fri Aug 25 12:05:19 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 40722 .
+# From configure.ac Revision: 40949 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.60.
#
@@ -810,7 +810,8 @@
GTK_LIB
CURL
PBX_CURL
-CURLLIB
+CURL_INCLUDE
+CURL_LIB
LTLIBOBJS'
ac_subst_files=''
ac_precious_vars='build_alias
@@ -13654,6 +13655,76 @@
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
+{ echo "$as_me:$LINENO: checking checking for RTLD_NOLOAD" >&5
+echo $ECHO_N "checking checking for RTLD_NOLOAD... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <dlfcn.h>
+int
+main ()
+{
+int foo = RTLD_NOLOAD;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_RTLD_NOLOAD 1
+_ACEOF
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
{ echo "$as_me:$LINENO: checking checking for compiler 'attribute pure' support" >&5
echo $ECHO_N "checking checking for compiler 'attribute pure' support... $ECHO_C" >&6; }
@@ -16621,7 +16692,7 @@
fi
if test "${PBX_GNUTLS}" = 1; then
- IKSEMEL_LIB="${IKSEMEL_LIB} -lgnutls -ltasn1 -lz -lgcrypt -lnsl -lgpg-error"
+ IKSEMEL_LIB="${IKSEMEL_LIB} -lgnutls -lz -lgcrypt -lnsl -lgpg-error"
fi
fi
@@ -29371,7 +29442,8 @@
# check for version
if test "${host_os}" = "SunOS"; then
if [ 0x`curl-config --vernum` -ge 0x70907 ]; then
- CURLLIB=$(${CURL} --libs)
+ CURL_INCLUDE=$(${CURL} --cflags)
+ CURL_LIB=$(${CURL} --libs)
PBX_CURL=1
cat >>confdefs.h <<\_ACEOF
@@ -29381,7 +29453,8 @@
fi
else
if [[ 0x`curl-config --vernum` -ge 0x70907 ]]; then
- CURLLIB=$(${CURL} --libs)
+ CURL_INCLUDE=$(${CURL} --cflags)
+ CURL_LIB=$(${CURL} --libs)
PBX_CURL=1
cat >>confdefs.h <<\_ACEOF
@@ -29391,6 +29464,7 @@
fi
fi
fi
+
@@ -30290,11 +30364,12 @@
GTK_LIB!$GTK_LIB$ac_delim
CURL!$CURL$ac_delim
PBX_CURL!$PBX_CURL$ac_delim
-CURLLIB!$CURLLIB$ac_delim
+CURL_INCLUDE!$CURL_INCLUDE$ac_delim
+CURL_LIB!$CURL_LIB$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: team/file/p2prtpbridging/configure.ac
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/configure.ac?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/configure.ac (original)
+++ team/file/p2prtpbridging/configure.ac Fri Aug 25 12:05:19 2006
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)
+AC_PREREQ(2.60)
m4_define([PBX_VERSION],
m4_bpatsubst(m4_esyscmd([build_tools/make_version .]),
@@ -237,6 +237,15 @@
AC_MSG_RESULT(no)
)
+AC_MSG_CHECKING(checking for RTLD_NOLOAD)
+AC_LINK_IFELSE(
+ AC_LANG_PROGRAM([#include <dlfcn.h>],
+ [int foo = RTLD_NOLOAD;]),
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_RTLD_NOLOAD], 1, [Define to 1 if your system has a dynamic linker that supports RTLD_NOLOAD.]),
+ AC_MSG_RESULT(no)
+)
+
AST_GCC_ATTRIBUTE(pure)
AST_GCC_ATTRIBUTE(malloc)
AST_GCC_ATTRIBUTE(const)
@@ -294,7 +303,7 @@
if test "${PBX_IKSEMEL}" = 1; then
AST_EXT_LIB_CHECK([GNUTLS], [gnutls], [gnutls_bye])
if test "${PBX_GNUTLS}" = 1; then
- IKSEMEL_LIB="${IKSEMEL_LIB} -lgnutls -ltasn1 -lz -lgcrypt -lnsl -lgpg-error"
+ IKSEMEL_LIB="${IKSEMEL_LIB} -lgnutls -lz -lgcrypt -lnsl -lgpg-error"
fi
fi
@@ -908,20 +917,23 @@
# check for version
if test "${host_os}" = "SunOS"; then
if [[ 0x`curl-config --vernum` -ge 0x70907 ]]; then
- CURLLIB=$(${CURL} --libs)
+ CURL_INCLUDE=$(${CURL} --cflags)
+ CURL_LIB=$(${CURL} --libs)
PBX_CURL=1
AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.])
fi
else
if [[[ 0x`curl-config --vernum` -ge 0x70907 ]]]; then
- CURLLIB=$(${CURL} --libs)
+ CURL_INCLUDE=$(${CURL} --cflags)
+ CURL_LIB=$(${CURL} --libs)
PBX_CURL=1
AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.])
fi
fi
fi
AC_SUBST(PBX_CURL)
-AC_SUBST(CURLLIB)
+AC_SUBST(CURL_INCLUDE)
+AC_SUBST(CURL_LIB)
AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
AC_OUTPUT
Modified: team/file/p2prtpbridging/contrib/asterisk-ng-doxygen
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/contrib/asterisk-ng-doxygen?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/contrib/asterisk-ng-doxygen (original)
+++ team/file/p2prtpbridging/contrib/asterisk-ng-doxygen Fri Aug 25 12:05:19 2006
@@ -446,11 +446,12 @@
# with spaces.
INPUT = ./ \
+ main \
include \
include/asterisk \
channels \
funcs \
- stdtime \
+ main/stdtime \
apps \
cdr \
codecs \
Modified: team/file/p2prtpbridging/doc/queues-with-callback-members.txt
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/doc/queues-with-callback-members.txt?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/doc/queues-with-callback-members.txt (original)
+++ team/file/p2prtpbridging/doc/queues-with-callback-members.txt Fri Aug 25 12:05:19 2006
@@ -495,7 +495,27 @@
"1" for that group. If GROUP_COUNT returns 1, then the busy()
is returned without actually trying to dial the agent.
-
+================ Pre Acknowledgement Message
+
+If you would like to have a pre acknowledge message with option to reject the message
+you can use the following dialplan Macro as a base with the 'M' dial argument.
+
+[macro-screen]
+exten=>s,1,Wait(.25)
+exten=>s,2,Read(ACCEPT|screen-callee-options|1)
+exten=>s,3,Gotoif($[${ACCEPT} = 1] ?50)
+exten=>s,4,Gotoif($[${ACCEPT} = 2] ?30)
+exten=>s,5,Gotoif($[${ACCEPT} = 3] ?40)
+exten=>s,6,Gotoif($[${ACCEPT} = 4] ?30:30)
+exten=>s,30,Set(MACRO_RESULT=CONTINUE)
+exten=>s,40,Read(TEXTEN|custom/screen-exten|)
+exten=>s,41,Gotoif($[${LEN(${TEXTEN})} = 3]?42:45)
+exten=>s,42,Set(MACRO_RESULT=GOTO:from-internal^${TEXTEN}^1)
+exten=>s,45,Gotoif($[${TEXTEN} = 0] ?46:4)
+exten=>s,46,Set(MACRO_RESULT=CONTINUE)
+exten=>s,50,Playback(after-the-tone)
+exten=>s,51,Playback(connected)
+exten=>s,52,Playback(beep)
================ Caveats
Modified: team/file/p2prtpbridging/doc/speechrec.txt
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/doc/speechrec.txt?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/doc/speechrec.txt (original)
+++ team/file/p2prtpbridging/doc/speechrec.txt Fri Aug 25 12:05:19 2006
@@ -169,7 +169,7 @@
exten => s,7,Set(CONFIRM=${SPEECH_TEXT(0)})
exten => s,8,GotoIf($["${SPEECH_TEXT(0)}" = "1"]?9:10)
exten => s,9,Set(CONFIRM=yes)
- exten => s,10,Set(${CONFIRMED}=${OLDTEXT0})
+ exten => s,10,Set(CONFIRMED=${OLDTEXT0})
exten => s,11,SpeechDeactivateGrammar(yes_no)
* The Asterisk Speech Recognition C API
Modified: team/file/p2prtpbridging/include/asterisk.h
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/include/asterisk.h?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/include/asterisk.h (original)
+++ team/file/p2prtpbridging/include/asterisk.h Fri Aug 25 12:05:19 2006
@@ -22,7 +22,7 @@
#include "asterisk/compat.h"
-#include <limits.h>
+#include "asterisk/paths.h"
#define DEFAULT_LANGUAGE "en"
Modified: team/file/p2prtpbridging/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/include/asterisk/autoconfig.h.in?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/include/asterisk/autoconfig.h.in (original)
+++ team/file/p2prtpbridging/include/asterisk/autoconfig.h.in Fri Aug 25 12:05:19 2006
@@ -269,6 +269,10 @@
/* Define to 1 if you have the `rint' function. */
#undef HAVE_RINT
+
+/* Define to 1 if your system has a dynamic linker that supports RTLD_NOLOAD.
+ */
+#undef HAVE_RTLD_NOLOAD
/* Define to 1 if you have the `select' function. */
#undef HAVE_SELECT
Modified: team/file/p2prtpbridging/include/asterisk/linkedlists.h
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/include/asterisk/linkedlists.h?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/include/asterisk/linkedlists.h (original)
+++ team/file/p2prtpbridging/include/asterisk/linkedlists.h Fri Aug 25 12:05:19 2006
@@ -462,6 +462,23 @@
} while (0)
/*!
+ \brief Appends a whole list to the tail of a list.
+ \param head This is a pointer to the list head structure
+ \param list This is a pointer to the list to be appended.
+ \param field This is the name of the field (declared using AST_LIST_ENTRY())
+ used to link entries of this list together.
+ */
+#define AST_LIST_APPEND_LIST(head, list, field) do { \
+ if (!(head)->first) { \
+ (head)->first = (list)->first; \
+ (head)->last = (list)->last; \
+ } else { \
+ (head)->last->field.next = (list)->first; \
+ (head)->last = (list)->last; \
+ } \
+} while (0)
+
+/*!
\brief Removes and returns the head entry from a list.
\param head This is a pointer to the list head structure
\param field This is the name of the field (declared using AST_LIST_ENTRY())
Modified: team/file/p2prtpbridging/include/asterisk/utils.h
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/include/asterisk/utils.h?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/include/asterisk/utils.h (original)
+++ team/file/p2prtpbridging/include/asterisk/utils.h Fri Aug 25 12:05:19 2006
@@ -433,7 +433,7 @@
_ast_asprintf((ret), __FILE__, __LINE__, __PRETTY_FUNCTION__, fmt, __VA_ARGS__)
AST_INLINE_API(
-int attribute_malloc _ast_asprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, ...),
+int _ast_asprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, ...),
{
int res;
va_list ap;
@@ -459,7 +459,7 @@
_ast_vasprintf((ret), __FILE__, __LINE__, __PRETTY_FUNCTION__, (fmt), (ap))
AST_INLINE_API(
-int attribute_malloc _ast_vasprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, va_list ap),
+int _ast_vasprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, va_list ap),
{
int res;
Modified: team/file/p2prtpbridging/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/main/asterisk.c?rev=41099&r1=41098&r2=41099&view=diff
==============================================================================
--- team/file/p2prtpbridging/main/asterisk.c (original)
+++ team/file/p2prtpbridging/main/asterisk.c Fri Aug 25 12:05:19 2006
@@ -405,7 +405,7 @@
#if defined(__FreeBSD__)
#include <machine/cpufunc.h>
#elif defined(linux)
-static __inline u_int64_t
[... 391 lines stripped ...]
More information about the asterisk-commits
mailing list