[asterisk-commits] murf: branch murf/323work r41048 - in
/team/murf/323work: ./ apps/ build_tool...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Aug 25 06:13:03 MST 2006
Author: murf
Date: Fri Aug 25 08:13:03 2006
New Revision: 41048
URL: http://svn.digium.com/view/asterisk?rev=41048&view=rev
Log:
Merged revisions 40928,40946,40949,40953,40955,40960,40964,40968,40972,40980-40981,40988,40990,40993,40995,41009,41015,41023,41026,41034 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r40928 | russell | 2006-08-23 11:44:33 -0600 (Wed, 23 Aug 2006) | 2 lines
remove svnmerge-integrated property
................
r40946 | qwell | 2006-08-23 12:51:39 -0600 (Wed, 23 Aug 2006) | 2 lines
move the "muted" svn:ignore to the utils/ directory
................
r40949 | kpfleming | 2006-08-23 13:28:13 -0600 (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 14:22:18 -0600 (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 14:39:23 -0600 (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 15:19:21 -0600 (Wed, 23 Aug 2006) | 2 lines
Fixing a comment
................
r40964 | qwell | 2006-08-23 19:21:41 -0600 (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 09:44:24 -0600 (Thu, 24 Aug 2006) | 2 lines
Documentation updates (thanks Shaun for the speechrec.txt one!)
................
r40972 | file | 2006-08-24 10:46:13 -0600 (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 11:13:57 -0600 (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 11:24:33 -0600 (Thu, 24 Aug 2006) | 2 lines
Revert stupid RTLD_NOLOAD change that breaks module loading on some systems.
................
r40988 | oej | 2006-08-24 12:49:35 -0600 (Thu, 24 Aug 2006) | 2 lines
Deprecate USERAGENT
................
r40990 | russell | 2006-08-24 12:57:46 -0600 (Thu, 24 Aug 2006) | 2 lines
remove CFLAGS that aren't needed anymore
................
r40993 | russell | 2006-08-24 13:07:01 -0600 (Thu, 24 Aug 2006) | 2 lines
fix codec_gsm build for powerpc
................
r40995 | russell | 2006-08-24 13:53:43 -0600 (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 15:30:34 -0600 (Thu, 24 Aug 2006) | 2 lines
Fix a small typo I found.
................
r41015 | qwell | 2006-08-24 16:17:12 -0600 (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 18:13:03 -0600 (Thu, 24 Aug 2006) | 2 lines
get cflags for libcurl as well as libs (patch from qwell)
................
r41026 | qwell | 2006-08-24 18:52:19 -0600 (Thu, 24 Aug 2006) | 2 lines
This is a bit safer on some versions of sed.
................
r41034 | russell | 2006-08-24 20:55:00 -0600 (Thu, 24 Aug 2006) | 2 lines
don't seg fault when using dbsecret
................
Modified:
team/murf/323work/ (props changed)
team/murf/323work/Makefile
team/murf/323work/UPGRADE.txt
team/murf/323work/apps/app_speech_utils.c
team/murf/323work/build_tools/make_buildopts_h
team/murf/323work/build_tools/mkpkgconfig
team/murf/323work/channels/chan_iax2.c
team/murf/323work/codecs/gsm/Makefile
team/murf/323work/configs/zapata.conf.sample
team/murf/323work/configure
team/murf/323work/configure.ac
team/murf/323work/doc/queues-with-callback-members.txt
team/murf/323work/doc/speechrec.txt
team/murf/323work/include/asterisk/autoconfig.h.in
team/murf/323work/include/asterisk/linkedlists.h
team/murf/323work/include/asterisk/paths.h
team/murf/323work/main/channel.c
team/murf/323work/main/file.c
team/murf/323work/main/loader.c
team/murf/323work/main/pbx.c
team/murf/323work/makeopts.in
team/murf/323work/res/res_musiconhold.c
team/murf/323work/utils/ (props changed)
Propchange: team/murf/323work/
------------------------------------------------------------------------------
automerge = please
Propchange: team/murf/323work/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/murf/323work/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Aug 25 08:13:03 2006
@@ -21,5 +21,4 @@
config.log
menuselect-tree
autom4te.cache
-muted
makeopts.embed_rules
Propchange: team/murf/323work/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 25 08:13:03 2006
@@ -1,1 +1,1 @@
-/trunk:1-40911
+/trunk:1-41047
Modified: team/murf/323work/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/323work/Makefile?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/Makefile (original)
+++ team/murf/323work/Makefile Fri Aug 25 08:13:03 2006
@@ -331,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,7 +646,7 @@
- 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
- @CFLAGS="-include $(ASTTOPDIR)/include/asterisk/autoconfig.h -I$(ASTTOPDIR)/include" PARENTSRC="$(ASTTOPDIR)" $(MAKE) -C menuselect CC="$(HOST_CC)"
+ @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/murf/323work/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/murf/323work/UPGRADE.txt?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/UPGRADE.txt (original)
+++ team/murf/323work/UPGRADE.txt Fri Aug 25 08:13:03 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/murf/323work/apps/app_speech_utils.c
URL: http://svn.digium.com/view/asterisk/team/murf/323work/apps/app_speech_utils.c?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/apps/app_speech_utils.c (original)
+++ team/murf/323work/apps/app_speech_utils.c Fri Aug 25 08:13:03 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/murf/323work/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/team/murf/323work/build_tools/make_buildopts_h?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/build_tools/make_buildopts_h (original)
+++ team/murf/323work/build_tools/make_buildopts_h Fri Aug 25 08:13:03 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/murf/323work/build_tools/mkpkgconfig
URL: http://svn.digium.com/view/asterisk/team/murf/323work/build_tools/mkpkgconfig?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/build_tools/mkpkgconfig (original)
+++ team/murf/323work/build_tools/mkpkgconfig Fri Aug 25 08:13:03 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/murf/323work/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/murf/323work/channels/chan_iax2.c?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/channels/chan_iax2.c (original)
+++ team/murf/323work/channels/chan_iax2.c Fri Aug 25 08:13:03 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/murf/323work/codecs/gsm/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/323work/codecs/gsm/Makefile?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/codecs/gsm/Makefile (original)
+++ team/murf/323work/codecs/gsm/Makefile Fri Aug 25 08:13:03 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/murf/323work/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/team/murf/323work/configs/zapata.conf.sample?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/configs/zapata.conf.sample (original)
+++ team/murf/323work/configs/zapata.conf.sample Fri Aug 25 08:13:03 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/murf/323work/configure
URL: http://svn.digium.com/view/asterisk/team/murf/323work/configure?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/configure (original)
+++ team/murf/323work/configure Fri Aug 25 08:13:03 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 40790 .
+# 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
@@ -13640,6 +13641,76 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_NINIT 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 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
@@ -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/murf/323work/configure.ac
URL: http://svn.digium.com/view/asterisk/team/murf/323work/configure.ac?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/configure.ac (original)
+++ team/murf/323work/configure.ac Fri Aug 25 08:13:03 2006
@@ -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)
@@ -927,20 +936,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/murf/323work/doc/queues-with-callback-members.txt
URL: http://svn.digium.com/view/asterisk/team/murf/323work/doc/queues-with-callback-members.txt?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/doc/queues-with-callback-members.txt (original)
+++ team/murf/323work/doc/queues-with-callback-members.txt Fri Aug 25 08:13:03 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/murf/323work/doc/speechrec.txt
URL: http://svn.digium.com/view/asterisk/team/murf/323work/doc/speechrec.txt?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/doc/speechrec.txt (original)
+++ team/murf/323work/doc/speechrec.txt Fri Aug 25 08:13:03 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/murf/323work/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/team/murf/323work/include/asterisk/autoconfig.h.in?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/include/asterisk/autoconfig.h.in (original)
+++ team/murf/323work/include/asterisk/autoconfig.h.in Fri Aug 25 08:13:03 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/murf/323work/include/asterisk/linkedlists.h
URL: http://svn.digium.com/view/asterisk/team/murf/323work/include/asterisk/linkedlists.h?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/include/asterisk/linkedlists.h (original)
+++ team/murf/323work/include/asterisk/linkedlists.h Fri Aug 25 08:13:03 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/murf/323work/include/asterisk/paths.h
URL: http://svn.digium.com/view/asterisk/team/murf/323work/include/asterisk/paths.h?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/include/asterisk/paths.h (original)
+++ team/murf/323work/include/asterisk/paths.h Fri Aug 25 08:13:03 2006
@@ -12,7 +12,7 @@
*/
/*! \file
- * \brief Asterisk main include file. File version handling, generic pbx functions.
+ * \brief Asterisk file paths, configured in asterisk.conf
*/
#ifndef _ASTERISK_PATHS_H
Modified: team/murf/323work/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/murf/323work/main/channel.c?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/main/channel.c (original)
+++ team/murf/323work/main/channel.c Fri Aug 25 08:13:03 2006
@@ -3046,7 +3046,7 @@
AST_LIST_TRAVERSE_SAFE_BEGIN(&original->varshead, varptr, entries) {
if (!strncmp(ast_var_name(varptr), GROUP_CATEGORY_PREFIX, strlen(GROUP_CATEGORY_PREFIX))) {
- AST_LIST_REMOVE(&original->varshead, varptr, entries);
+ AST_LIST_REMOVE_CURRENT(&original->varshead, entries);
ast_var_delete(varptr);
}
}
@@ -3055,7 +3055,7 @@
/* Append variables from clone channel into original channel */
/* XXX Is this always correct? We have to in order to keep MACROS working XXX */
if (AST_LIST_FIRST(&clone->varshead))
- AST_LIST_INSERT_TAIL(&original->varshead, AST_LIST_FIRST(&clone->varshead), entries);
+ AST_LIST_APPEND_LIST(&original->varshead, &clone->varshead, entries);
}
/*!
Modified: team/murf/323work/main/file.c
URL: http://svn.digium.com/view/asterisk/team/murf/323work/main/file.c?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/main/file.c (original)
+++ team/murf/323work/main/file.c Fri Aug 25 08:13:03 2006
@@ -417,6 +417,7 @@
chan->stream = s;
else
chan->vstream = s;
+ free(fn);
break;
}
switch (action) {
Modified: team/murf/323work/main/loader.c
URL: http://svn.digium.com/view/asterisk/team/murf/323work/main/loader.c?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/main/loader.c (original)
+++ team/murf/323work/main/loader.c Fri Aug 25 08:13:03 2006
@@ -324,7 +324,7 @@
static void unload_dynamic_module(struct ast_module *mod)
{
if (mod->lib)
- dlclose(mod->lib);
+ while (!dlclose(mod->lib));
/* WARNING: the structure pointed to by mod is now gone! */
}
@@ -368,7 +368,7 @@
*/
if (resource_being_loaded != (mod = AST_LIST_LAST(&module_list))) {
/* no, it did not, so close it and return */
- dlclose(lib);
+ while (!dlclose(lib));
/* note that the module's destructor will call ast_module_unregister(),
which will free the structure we allocated in resource_being_loaded */
return NULL;
@@ -376,15 +376,19 @@
wants_global = ast_test_flag(mod->info, AST_MODFLAG_GLOBAL_SYMBOLS);
- /* we are done with this first load, so clean up and start over */
-
- dlclose(lib);
- resource_being_loaded = NULL;
-
/* if we are being asked only to load modules that provide global symbols,
and this one does not, then close it and return */
- if (global_symbols_only && !wants_global)
+ if (global_symbols_only && !wants_global) {
+ while (!dlclose(lib));
return NULL;
+ }
+
+ /* if the system supports RTLD_NOLOAD, we can just 'promote' the flags
+ on the already-opened library to what we want... if not, we have to
+ close it and start over
+ */
+ while (!dlclose(lib));
+ resource_being_loaded = NULL;
/* start the load process again */
@@ -402,6 +406,7 @@
/* since the module was successfully opened, and it registered itself
the previous time we did that, we're going to assume it worked this
time too :) */
+
AST_LIST_LAST(&module_list)->lib = lib;
resource_being_loaded = NULL;
Modified: team/murf/323work/main/pbx.c
URL: http://svn.digium.com/view/asterisk/team/murf/323work/main/pbx.c?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/main/pbx.c (original)
+++ team/murf/323work/main/pbx.c Fri Aug 25 08:13:03 2006
@@ -5360,9 +5360,9 @@
memset(buf, 0, size);
AST_LIST_TRAVERSE(&chan->varshead, variables, entries) {
- if(variables &&
- (var=ast_var_name(variables)) && (val=ast_var_value(variables)) &&
- !ast_strlen_zero(var) && !ast_strlen_zero(val)) {
+ if ((var=ast_var_name(variables)) && (val=ast_var_value(variables))
+ /* && !ast_strlen_zero(var) && !ast_strlen_zero(val) */
+ ) {
if (ast_build_string(&buf, &size, "%s=%s\n", var, val)) {
ast_log(LOG_ERROR, "Data Buffer Size Exceeded!\n");
break;
Modified: team/murf/323work/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/murf/323work/makeopts.in?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/makeopts.in (original)
+++ team/murf/323work/makeopts.in Fri Aug 25 08:13:03 2006
@@ -53,7 +53,8 @@
ASOUND_INCLUDE=@ALSA_INCLUDE@
ASOUND_LIB=@ALSA_LIB@
-CURL_LIB=@CURLLIB@
+CURL_INCLUDE=@CURL_INCLUDE@
+CURL_LIB=@CURL_LIB@
CURSES_INCLUDE=@CURSES_INCLUDE@
CURSES_LIB=@CURSES_LIB@
Modified: team/murf/323work/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/team/murf/323work/res/res_musiconhold.c?rev=41048&r1=41047&r2=41048&view=diff
==============================================================================
--- team/murf/323work/res/res_musiconhold.c (original)
+++ team/murf/323work/res/res_musiconhold.c Fri Aug 25 08:13:03 2006
@@ -762,7 +762,7 @@
files_DIR = opendir(class->dir);
if (!files_DIR) {
- ast_log(LOG_WARNING, "Cannot open dir %s or dir does not exist", class->dir);
+ ast_log(LOG_WARNING, "Cannot open dir %s or dir does not exist\n", class->dir);
return -1;
}
Propchange: team/murf/323work/utils/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Aug 25 08:13:03 2006
@@ -5,3 +5,4 @@
check_expr
streamplayer
aelparse
+muted
More information about the asterisk-commits
mailing list