[asterisk-commits] seanbright: branch group/asterisk-cpp r173167 - in /team/group/asterisk-cpp: ...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Feb 3 09:58:04 CST 2009
Author: seanbright
Date: Tue Feb 3 09:58:04 2009
New Revision: 173167
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=173167
Log:
Merged revisions 172890,172894,172929,172963,173028,173047,173067,173104,173130 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r172890 | murf | 2009-02-02 12:37:15 -0500 (Mon, 02 Feb 2009) | 41 lines
This change allows the disconnect feature (as in "one-touch" in features.c)
to be used within the dial app, before a call is bridged.
Many thanks to sobomax for submitting this patch.
Quoting from bug 11582:
"So the goal of the patch was to use the user configured feature code during the
call setup phase. The original ast_feature_interpret() function is not well suited
for this purpose as it uses much call bridge specific data and doesn't separate a
detection of feature from a feature handler call. So a new function ast_feature_detect()
has been extracted off the ast_feature_interpret() function but keeping the original
logic intact except some insignificant changes to locking.
"Having created the ast_feature_detect() function the possibility to use feature detection
in almost any place of the asterisk code. So a call to this function has been added to
wait_for_answer() function of app_dial.so module. This code doesn't call the feature handler
however and uses old call leg disconnect logic to make the changes as small and simple as
possible to prevent unexpected problems. A disconnect feature currently is the only one
supported during call setup as other features as call parking and call transfer don't make much
sense during call setup. However if need in some of the features would arise it is much easier to
implement as the infrastructure changes are already in place with this patch."
I have cleaned up the patch somewhat, and verified that the existing functionality is not
harmed, and that the new functionality works. Terry has committed his stuff, and there were
no conflicts (see 14274).
(closes issue #11583)
Reported by: sobomax
Patches:
patch-apps__app_dial.c uploaded by sobomax (license 359)
patch-include__asterisk__features.h uploaded by sobomax (license 359)
patch-res__res_features.c uploaded by sobomax (license 359)
enable-features-during-call-setup.diff uploaded by sobomax (license 359)
11583.newdiff uploaded by murf (license 17)
enable-features-during-call-setup-1.diff uploaded by sobomax (license 359)
11583.latest-patch uploaded by murf (license 17)
Tested by: sobomax, murf
................
r172894 | lmadsen | 2009-02-02 13:13:40 -0500 (Mon, 02 Feb 2009) | 7 lines
Update the res_ldap.conf file with a better working example.
(closes issue #13861)
Reported by: scramatte
Patches:
__20080110-res_ldap.conf-2.patch uploaded by blitzrage (license 10)
Tested by: jcovert
................
r172929 | murf | 2009-02-02 14:02:24 -0500 (Mon, 02 Feb 2009) | 7 lines
This reverts the changes I made for 11583; will
reviewboard this before committing again...
reopened 11583 until all Russell's issues are
resolved.
................
r172963 | rmudgett | 2009-02-02 15:40:27 -0500 (Mon, 02 Feb 2009) | 18 lines
Recorded merge of revisions 172962 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r172962 | rmudgett | 2009-02-02 14:28:54 -0600 (Mon, 02 Feb 2009) | 11 lines
channels/chan_dahdi.c
* Added doxygen comments to the major dahdi structures.
* Fixed PRI using an incorrect string value if the extension
delimiter is not present in the Dial() function.
* Fixed some uninitialized string variables on FXS ports.
configs/chan_dahdi.conf.sample
* Updated some documentation.
These changes are already in trunk -r172400
........
................
r173028 | mmichelson | 2009-02-02 18:10:47 -0500 (Mon, 02 Feb 2009) | 9 lines
Add a CLI command to log out a manager user
(closes issue #13877)
Reported by: eliel
Patches:
cli_manager_logout.patch.txt uploaded by eliel (license 64)
Tested by: eliel, putnopvut
................
r173047 | mmichelson | 2009-02-02 18:21:33 -0500 (Mon, 02 Feb 2009) | 4 lines
Reverting commit number 173028 as there are some
potential issues
................
r173067 | twilson | 2009-02-02 18:57:25 -0500 (Mon, 02 Feb 2009) | 9 lines
Merged revisions 173066 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r173066 | twilson | 2009-02-02 17:48:06 -0600 (Mon, 02 Feb 2009) | 2 lines
Fix a feature inheritance bug I added after code review
........
................
r173104 | tilghman | 2009-02-02 19:24:52 -0500 (Mon, 02 Feb 2009) | 12 lines
Merged revisions 173070 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r173070 | tilghman | 2009-02-02 18:15:59 -0600 (Mon, 02 Feb 2009) | 5 lines
Add warning to standard config, that globals may be overridden by other
dialplan configuration files.
(closes issue #14388)
Reported by: macli
........
................
r173130 | tilghman | 2009-02-02 19:29:49 -0500 (Mon, 02 Feb 2009) | 2 lines
Make OS X compile cleanly with app_stack
................
Modified:
team/group/asterisk-cpp/ (props changed)
team/group/asterisk-cpp/apps/app_stack.c
team/group/asterisk-cpp/configs/extensions.conf.sample
team/group/asterisk-cpp/configs/res_ldap.conf.sample
team/group/asterisk-cpp/configure
team/group/asterisk-cpp/configure.ac
team/group/asterisk-cpp/include/asterisk/autoconfig.h.in
team/group/asterisk-cpp/include/asterisk/compiler.h
team/group/asterisk-cpp/include/asterisk/optional_api.h
team/group/asterisk-cpp/main/features.c
team/group/asterisk-cpp/main/xml.c
Propchange: team/group/asterisk-cpp/
------------------------------------------------------------------------------
automerge = mmhmm
Propchange: team/group/asterisk-cpp/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/asterisk-cpp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb 3 09:58:04 2009
@@ -1,1 +1,1 @@
-/trunk:1-172861
+/trunk:1-173166
Modified: team/group/asterisk-cpp/apps/app_stack.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/apps/app_stack.c?view=diff&rev=173167&r1=173166&r2=173167
==============================================================================
--- team/group/asterisk-cpp/apps/app_stack.c (original)
+++ team/group/asterisk-cpp/apps/app_stack.c Tue Feb 3 09:58:04 2009
@@ -640,7 +640,7 @@
{
struct ast_context *con;
- if (ast_agi_unregister(ast_module_info->self, &gosub_agi_command) == 1) {
+ if (ast_agi_unregister && ast_agi_unregister(ast_module_info->self, &gosub_agi_command) == 1) {
if ((con = ast_context_find("app_stack_gosub_virtual_context"))) {
ast_context_remove_extension2(con, "s", 1, NULL, 0);
ast_context_destroy(con, "app_stack"); /* leave nothing behind */
@@ -661,7 +661,7 @@
{
struct ast_context *con;
- if (ast_agi_register(ast_module_info->self, &gosub_agi_command) == 1) {
+ if (ast_agi_register && ast_agi_register(ast_module_info->self, &gosub_agi_command) == 1) {
if (!(con = ast_context_find_or_create(NULL, NULL, "app_stack_gosub_virtual_context", "app_stack"))) {
ast_log(LOG_ERROR, "Virtual context 'app_stack_gosub_virtual_context' does not exist and unable to create\n");
return AST_MODULE_LOAD_DECLINE;
Modified: team/group/asterisk-cpp/configs/extensions.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/configs/extensions.conf.sample?view=diff&rev=173167&r1=173166&r2=173167
==============================================================================
--- team/group/asterisk-cpp/configs/extensions.conf.sample (original)
+++ team/group/asterisk-cpp/configs/extensions.conf.sample Tue Feb 3 09:58:04 2009
@@ -137,7 +137,13 @@
;
TRUNKMSD=1 ; MSD digits to strip (usually 1 or 0)
;TRUNK=IAX2/user:pass at provider
-
+;
+; WARNING WARNING WARNING WARNING
+; If you load any other extension configuration engine, such as pbx_ael.so,
+; your global variables may be overridden by that file. Please take care to
+; use only one location to set global variables, and you will likely save
+; yourself a ton of grief.
+; WARNING WARNING WARNING WARNING
;
; Any category other than "General" and "Globals" represent
; extension contexts, which are collections of extensions.
Modified: team/group/asterisk-cpp/configs/res_ldap.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/configs/res_ldap.conf.sample?view=diff&rev=173167&r1=173166&r2=173167
==============================================================================
--- team/group/asterisk-cpp/configs/res_ldap.conf.sample (original)
+++ team/group/asterisk-cpp/configs/res_ldap.conf.sample Tue Feb 3 09:58:04 2009
@@ -56,7 +56,7 @@
; Sip Users Table
;
[sip]
-name = uid
+name = cn
amaflags = AstAccountAMAFlags
callgroup = AstAccountCallGroup
callerid = AstAccountCallerID
@@ -91,7 +91,7 @@
ipaddr = AstAccountIPAddress
defaultuser = AstAccountDefaultUser
regserver = AstAccountRegistrationServer
-additionalFilter=(objectClass=AstAccountSIP)
+additionalFilter=(objectClass=AsteriskSIPUser)
;
; IAX Users Table
Modified: team/group/asterisk-cpp/configure.ac
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/configure.ac?view=diff&rev=173167&r1=173166&r2=173167
==============================================================================
--- team/group/asterisk-cpp/configure.ac (original)
+++ team/group/asterisk-cpp/configure.ac Tue Feb 3 09:58:04 2009
@@ -174,14 +174,18 @@
AC_PATH_PROG([LN], [ln], :)
AC_PATH_PROG([DOT], [dot], :)
AC_PATH_PROG([WGET], [wget], :)
+AC_PATH_PROG([CURL], [curl], :)
AC_PATH_PROG([RUBBER], [rubber], :)
AC_PATH_PROG([KPATHSEA], [kpsewhich], :)
AC_PATH_PROG([XMLSTARLET], [xmlstarlet], :)
if test "${WGET}" != ":" ; then
DOWNLOAD=${WGET}
+else if test "${CURL}" != ":" ; then
+ DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\""
else
AC_PATH_PROG([FETCH], [fetch], [:])
DOWNLOAD=${FETCH}
+fi
fi
AC_SUBST(DOWNLOAD)
@@ -481,6 +485,7 @@
AST_GCC_ATTRIBUTE(sentinel)
AST_GCC_ATTRIBUTE(warn_unused_result)
AST_GCC_ATTRIBUTE(weak)
+AST_GCC_ATTRIBUTE(weak_import)
AST_GCC_ATTRIBUTE(alias, [alias("foo")])
AC_MSG_CHECKING(for -ffunction-sections support)
Modified: team/group/asterisk-cpp/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/include/asterisk/autoconfig.h.in?view=diff&rev=173167&r1=173166&r2=173167
==============================================================================
--- team/group/asterisk-cpp/include/asterisk/autoconfig.h.in (original)
+++ team/group/asterisk-cpp/include/asterisk/autoconfig.h.in Tue Feb 3 09:58:04 2009
@@ -122,6 +122,9 @@
/* Define to 1 if your GCC C compiler supports the 'weak' attribute. */
#undef HAVE_ATTRIBUTE_weak
+
+/* Define to 1 if your GCC C compiler supports the 'weak_import' attribute. */
+#undef HAVE_ATTRIBUTE_weak_import
/* Define this to indicate the ${BKTR_DESCRIP} library */
#undef HAVE_BKTR
Modified: team/group/asterisk-cpp/include/asterisk/compiler.h
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/include/asterisk/compiler.h?view=diff&rev=173167&r1=173166&r2=173167
==============================================================================
--- team/group/asterisk-cpp/include/asterisk/compiler.h (original)
+++ team/group/asterisk-cpp/include/asterisk/compiler.h Tue Feb 3 09:58:04 2009
@@ -74,4 +74,10 @@
#define attribute_weak
#endif
+#ifdef HAVE_ATTRIBUTE_weak_import
+#define attribute_weak_import __attribute__((weak_import))
+#else
+#define attribute_weak_import
+#endif
+
#endif /* _ASTERISK_COMPILER_H */
Modified: team/group/asterisk-cpp/include/asterisk/optional_api.h
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/include/asterisk/optional_api.h?view=diff&rev=173167&r1=173166&r2=173167
==============================================================================
--- team/group/asterisk-cpp/include/asterisk/optional_api.h (original)
+++ team/group/asterisk-cpp/include/asterisk/optional_api.h Tue Feb 3 09:58:04 2009
@@ -83,7 +83,10 @@
*/
#define AST_OPTIONAL_API_UNAVAILABLE INT_MIN
-#if defined(HAVE_ATTRIBUTE_weak) && defined(HAVE_ATTRIBUTE_alias) && !defined(AST_API_MODULE)
+#if defined(HAVE_ATTRIBUTE_weak_import) && !defined(AST_API_MODULE)
+#define AST_OPTIONAL_API(result, name, proto, stub) result name proto __attribute__((weak_import));
+#define AST_OPTIONAL_API_ATTR(result, attr, name, proto, stub) result name proto __attribute__((weak_import,attr));
+#elif defined(HAVE_ATTRIBUTE_weak) && defined(HAVE_ATTRIBUTE_alias) && !defined(AST_API_MODULE) && !defined(HAVE_ATTRIBUTE_weak_import)
#define AST_OPTIONAL_API(result, name, proto, stub) \
static result __##name proto stub; \
result __attribute__((weak, alias("__" __stringify(name)))) name proto;
Modified: team/group/asterisk-cpp/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/main/features.c?view=diff&rev=173167&r1=173166&r2=173167
==============================================================================
--- team/group/asterisk-cpp/main/features.c (original)
+++ team/group/asterisk-cpp/main/features.c Tue Feb 3 09:58:04 2009
@@ -2321,6 +2321,10 @@
ast_channel_lock(caller);
ast_channel_datastore_add(caller, ds_caller_features);
ast_channel_unlock(caller);
+ } else {
+ /* If we don't return here, then when we do a builtin_atxfer we will copy the disconnect
+ * flags over from the atxfer to the caller */
+ return;
}
ast_channel_lock(callee);
Modified: team/group/asterisk-cpp/main/xml.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/main/xml.c?view=diff&rev=173167&r1=173166&r2=173167
==============================================================================
--- team/group/asterisk-cpp/main/xml.c (original)
+++ team/group/asterisk-cpp/main/xml.c Tue Feb 3 09:58:04 2009
@@ -27,6 +27,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#if defined(HAVE_LIBXML2)
+#define _POSIX_C_SOURCE 200112L
#include <libxml/parser.h>
#include <libxml/tree.h>
/* libxml2 ast_xml implementation. */
More information about the asterisk-commits
mailing list