[svn-commits] murf: branch murf/bug11210 r103735 - in /team/murf/bug11210: ./ apps/ channel...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Feb 15 16:37:06 CST 2008
Author: murf
Date: Fri Feb 15 16:37:05 2008
New Revision: 103735
URL: http://svn.digium.com/view/asterisk?view=rev&rev=103735
Log:
Merged revisions 103710-103711,103714-103716,103723,103725,103727,103729 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r103710 | mmichelson | 2008-02-14 17:53:08 -0700 (Thu, 14 Feb 2008) | 13 lines
Blocked revisions 103709 via svnmerge
........
r103709 | mmichelson | 2008-02-14 18:50:49 -0600 (Thu, 14 Feb 2008) | 6 lines
I apparently misunderstood one of the requirements of this configure change.
Now, if a source directory is specified with the --with-imap option, and a valid
source installation is not detected there, then configure will fail and will not
check for a package installation.
........
................
r103711 | mmichelson | 2008-02-14 17:59:21 -0700 (Thu, 14 Feb 2008) | 3 lines
Same changes as made to 1.4 in revision 103710
................
r103714 | mmichelson | 2008-02-15 08:08:59 -0700 (Fri, 15 Feb 2008) | 15 lines
Blocked revisions 103713 via svnmerge
........
r103713 | mmichelson | 2008-02-15 09:05:49 -0600 (Fri, 15 Feb 2008) | 8 lines
Fix a bit of wrong logic in the configure script that caused problems when trying to configure
without IMAP. Patch suggestion from phsultan, but I modified it slightly.
(closes issue #12003)
Reported by: pj
Tested by: putnopvut
........
................
r103715 | mmichelson | 2008-02-15 08:11:23 -0700 (Fri, 15 Feb 2008) | 3 lines
Merging of changes from 1.4 revision 103713.
................
r103716 | tilghman | 2008-02-15 08:45:33 -0700 (Fri, 15 Feb 2008) | 6 lines
Remove extraneous copy
(closes issue #12002)
Reported by: junky
Patches:
conf2ael.diff uploaded by junky (license 177)
................
r103723 | qwell | 2008-02-15 10:29:08 -0700 (Fri, 15 Feb 2008) | 6 lines
Fix up some doxygen issues.
(closes issue #11996)
Patches:
bug_11996_doxygen.diff uploaded by snuffy (license 35)
................
r103725 | mmichelson | 2008-02-15 10:32:43 -0700 (Fri, 15 Feb 2008) | 16 lines
Merged revisions 103722 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r103722 | mmichelson | 2008-02-15 11:26:37 -0600 (Fri, 15 Feb 2008) | 8 lines
Final round of changes for configure script logic for IMAP
Now if a directory is specified, then we will search that directory for
a source installation of the IMAP toolkit. If none is found, then we will
use that directory as the basis for detecting a package installation of
the IMAP c-client. If that check fails, then configure will fail.
........
................
r103727 | russell | 2008-02-15 11:34:42 -0700 (Fri, 15 Feb 2008) | 14 lines
Merged revisions 103726 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r103726 | russell | 2008-02-15 12:33:29 -0600 (Fri, 15 Feb 2008) | 6 lines
Don't attempt to execute the reload callback for a module that returned
AST_MODULE_LOAD_DECLINE. This fixes a crash that was reported against
chan_console in trunk.
(closes issue #11953, reported by junky, fixed by me)
........
................
r103729 | russell | 2008-02-15 12:50:47 -0700 (Fri, 15 Feb 2008) | 12 lines
Merged revisions 103728 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r103728 | russell | 2008-02-15 13:50:11 -0600 (Fri, 15 Feb 2008) | 4 lines
In the case that you try to directly reload a module has returned
AST_MODULE_LOAD_DECLINE, log a message indicating that the module is not fully
initialized and must be initialized using "module load".
........
................
Modified:
team/murf/bug11210/ (props changed)
team/murf/bug11210/apps/app_queue.c
team/murf/bug11210/channels/chan_sip.c
team/murf/bug11210/channels/chan_zap.c
team/murf/bug11210/channels/misdn/chan_misdn_config.h
team/murf/bug11210/channels/misdn/ie.c
team/murf/bug11210/channels/misdn/isdn_lib.c
team/murf/bug11210/channels/misdn/isdn_lib.h
team/murf/bug11210/channels/misdn/isdn_msg_parser.c
team/murf/bug11210/channels/misdn/portinfo.c
team/murf/bug11210/configure
team/murf/bug11210/configure.ac
team/murf/bug11210/doc/tex/imapstorage.tex
team/murf/bug11210/include/asterisk/extconf.h
team/murf/bug11210/include/asterisk/strings.h
team/murf/bug11210/include/asterisk/time.h
team/murf/bug11210/main/ast_expr2f.c
team/murf/bug11210/main/channel.c
team/murf/bug11210/main/config.c
team/murf/bug11210/main/loader.c
team/murf/bug11210/res/res_config_curl.c
team/murf/bug11210/res/res_config_ldap.c
team/murf/bug11210/res/res_phoneprov.c
team/murf/bug11210/utils/conf2ael.c
Propchange: team/murf/bug11210/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/murf/bug11210/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/murf/bug11210/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 15 16:37:05 2008
@@ -1,1 +1,1 @@
-/trunk:1-103707
+/trunk:1-103734
Modified: team/murf/bug11210/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/apps/app_queue.c?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/apps/app_queue.c (original)
+++ team/murf/bug11210/apps/app_queue.c Fri Feb 15 16:37:05 2008
@@ -2975,6 +2975,7 @@
*
* \param[in] qe the queue_ent structure which corresponds to the caller attempting to reach members
* \param[in] options the options passed as the third parameter to the Queue() application
+ * \param[in] announceoverride filename to play to user when waiting
* \param[in] url the url passed as the fourth parameter to the Queue() application
* \param[in,out] tries the number of times we have tried calling queue members
* \param[out] noption set if the call to Queue() has the 'n' option set.
Modified: team/murf/bug11210/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/channels/chan_sip.c?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/channels/chan_sip.c (original)
+++ team/murf/bug11210/channels/chan_sip.c Fri Feb 15 16:37:05 2008
@@ -374,7 +374,7 @@
/*! \brief States for outbound registrations (with register= lines in sip.conf */
enum sipregistrystate {
REG_STATE_UNREGISTERED = 0, /*!< We are not registred
- * \noteInitial state. We should have a timeout scheduled for the initial
+ * \note Initial state. We should have a timeout scheduled for the initial
* (or next) registration transmission, calling sip_reregister
*/
@@ -594,7 +594,7 @@
/*! \brief Standard SIP and TLS port from RFC 3261. DO NOT CHANGE THIS */
#define STANDARD_SIP_PORT 5060
#define STANDARD_TLS_PORT 5061
-/* Note: in many SIP headers, absence of a port number implies port 5060,
+/*! \note in many SIP headers, absence of a port number implies port 5060,
* and this is why we cannot change the above constant.
* There is a limited number of places in asterisk where we could,
* in principle, use a different "default" port number, but
@@ -738,8 +738,8 @@
/*@}*/
-/*! Object counters @{
- * \bug These counters are not handled in a thread-safe way. ast_atomic_fetchadd_int()
+/*! \name Object counters @{
+ * \bug These counters are not handled in a thread-safe way ast_atomic_fetchadd_int()
* should be used to modify these values. */
static int suserobjs = 0; /*!< Static users */
static int ruserobjs = 0; /*!< Realtime users */
@@ -1793,8 +1793,8 @@
};
/*---------------------------- Forward declarations of functions in chan_sip.c */
-/*! \note This is added to help splitting up chan_sip.c into several files
- in coming releases */
+/* Note: This is added to help splitting up chan_sip.c into several files
+ in coming releases. */
/*--- PBX interface functions */
static struct ast_channel *sip_request_call(const char *type, int format, void *data, int *cause);
@@ -18980,7 +18980,8 @@
/*! \brief Get Max or Min SE (session timer expiry)
- \param max if true, get max se, otherwise min se
+ * \param p pointer to the SIP dialog
+ * \param max if true, get max se, otherwise min se
*/
int st_get_se(struct sip_pvt *p, int max)
{
@@ -19035,7 +19036,7 @@
/*! \brief Get the entity (UAC or UAS) that's acting as the session-timer refresher
- \param sip_pvt pointer to the SIP dialog
+ * \param p pointer to the SIP dialog
*/
enum st_refresher st_get_refresher(struct sip_pvt *p)
{
@@ -19066,7 +19067,7 @@
/*! \brief Get the session-timer mode
- \param sip_pvt pointer to the SIP dialog
+ * \param p pointer to the SIP dialog
*/
enum st_mode st_get_mode(struct sip_pvt *p)
{
@@ -19296,12 +19297,14 @@
}
/*! \brief PBX interface function -build SIP pvt structure
- SIP calls initiated by the PBX arrive here
-
- SIP Dial string syntax
- SIP/exten at host!dnid
- or SIP/host/exten!dnid
- or SIP/host!dnid
+ * SIP calls initiated by the PBX arrive here.
+ *
+ * \verbatim
+ * SIP Dial string syntax
+ * SIP/exten at host!dnid
+ * or SIP/host/exten!dnid
+ * or SIP/host!dnid
+ * \endverbatim
*/
static struct ast_channel *sip_request_call(const char *type, int format, void *data, int *cause)
{
Modified: team/murf/bug11210/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/channels/chan_zap.c?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/channels/chan_zap.c (original)
+++ team/murf/bug11210/channels/chan_zap.c Fri Feb 15 16:37:05 2008
@@ -6041,15 +6041,14 @@
return 0;
}
-/*! enable or disable the chan_zap Do-Not-Disturb mode for a Zaptel channel
- * @zapchan "Physical" Zaptel channel (e.g: Zap/5)
- * @on: 1 to enable, 0 to disable
+/*! \brief enable or disable the chan_zap Do-Not-Disturb mode for a Zaptel channel
+ * \param zapchan "Physical" Zaptel channel (e.g: Zap/5)
+ * \param on 1 to enable, 0 to disable
*
* chan_zap has a DND (Do Not Disturb) mode for each zapchan (physical
* zaptel channel). Use this to enable or disable it.
*
- * \fixme the use of the word "channel" for those zapchans is really
- * confusing.
+ * \bug the use of the word "channel" for those zapchans is really confusing.
*/
static void zap_dnd(struct zt_pvt *zapchan, int on)
{
Modified: team/murf/bug11210/channels/misdn/chan_misdn_config.h
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/channels/misdn/chan_misdn_config.h?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/channels/misdn/chan_misdn_config.h (original)
+++ team/murf/bug11210/channels/misdn/chan_misdn_config.h Fri Feb 15 16:37:05 2008
@@ -11,8 +11,8 @@
* the GNU General Public License
*/
-/*! \file \brief
- * Interface to mISDN - Config
+/*! \file
+ * \brief Interface to mISDN - Config
* \author Christian Richter <crich at beronet.com>
*/
Modified: team/murf/bug11210/channels/misdn/ie.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/channels/misdn/ie.c?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/channels/misdn/ie.c (original)
+++ team/murf/bug11210/channels/misdn/ie.c Fri Feb 15 16:37:05 2008
@@ -15,8 +15,8 @@
* the GNU General Public License
*/
-/*! \file \brief
- * Interface to mISDN
+/*! \file
+ * \brief Interface to mISDN
* \author Christian Richter <crich at beronet.com>
*/
Modified: team/murf/bug11210/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/channels/misdn/isdn_lib.c?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/channels/misdn/isdn_lib.c (original)
+++ team/murf/bug11210/channels/misdn/isdn_lib.c Fri Feb 15 16:37:05 2008
@@ -11,8 +11,8 @@
* the GNU General Public License
*/
-/*! \file \brief
- * Interface to mISDN
+/*! \file
+ * \brief Interface to mISDN
* \author Christian Richter <crich at beronet.com>
*/
Modified: team/murf/bug11210/channels/misdn/isdn_lib.h
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/channels/misdn/isdn_lib.h?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/channels/misdn/isdn_lib.h (original)
+++ team/murf/bug11210/channels/misdn/isdn_lib.h Fri Feb 15 16:37:05 2008
@@ -11,9 +11,8 @@
* the GNU General Public License
*/
-/*! \file \brief
- *
- * Interface to mISDN
+/*! \file
+ * \brief Interface to mISDN
*
* \author Christian Richter <crich at beronet.com>
*/
Modified: team/murf/bug11210/channels/misdn/isdn_msg_parser.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/channels/misdn/isdn_msg_parser.c?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/channels/misdn/isdn_msg_parser.c (original)
+++ team/murf/bug11210/channels/misdn/isdn_msg_parser.c Fri Feb 15 16:37:05 2008
@@ -11,8 +11,8 @@
* the GNU General Public License
*/
-/*! \file \brief
- * Interface to mISDN - message parser
+/*! \file
+ * \brief Interface to mISDN - message parser
* \author Christian Richter <crich at beronet.com>
*/
Modified: team/murf/bug11210/channels/misdn/portinfo.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/channels/misdn/portinfo.c?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/channels/misdn/portinfo.c (original)
+++ team/murf/bug11210/channels/misdn/portinfo.c Fri Feb 15 16:37:05 2008
@@ -1,5 +1,5 @@
-/*! \file \brief
- * Interface to mISDN - ???
+/*! \file
+ * \brief Interface to mISDN - port info
* \author Christian Richter <crich at beronet.com>
*/
Modified: team/murf/bug11210/configure.ac
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/configure.ac?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/configure.ac (original)
+++ team/murf/bug11210/configure.ac Fri Feb 15 16:37:05 2008
@@ -648,11 +648,13 @@
AST_EXT_LIB_CHECK([IKSEMEL], [iksemel], [iks_start_sasl], [iksemel.h])
if test "${USE_IMAP_TK}" != "no"; then
+ saved_cppflags="${CPPFLAGS}"
+ saved_libs="${LIBS}"
+ switch_to_system_on_failure="no"
if test "${IMAP_TK_DIR}" = ""; then
IMAP_TK_DIR=`pwd`"/../imap-2004g"
+ switch_to_system_on_failure="yes"
fi
- saved_cppflags="${CPPFLAGS}"
- saved_libs="${LIBS}"
if test "${IMAP_TK_DIR}" != "system"; then
AC_MSG_CHECKING(for UW IMAP Toolkit c-client library)
if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
@@ -776,23 +778,139 @@
fi
CPPFLAGS="${saved_cppflags}"
LIBS="${saved_libs}"
- if test "${ac_cv_imap_tk}" = "yes"; then
- AC_MSG_RESULT(yes)
- IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}`
- IMAP_TK_INCLUDE="${imap_include}"
- PBX_IMAP_TK=1
- AC_DEFINE([HAVE_IMAP_TK], 1, [Define if your system has the UW IMAP Toolkit c-client library.])
- if test "${ac_cv_imap_tk2006}" = "yes"; then
- AC_DEFINE([HAVE_IMAP_TK2006], 1, [Define if your system has the UW IMAP Toolkit c-client library version 2006 or greater.])
- fi
- else
+ if test "${ac_cv_imap_tk}" = "no"; then
AC_MSG_RESULT(no)
- IMAP_TK_DIR="system"
+ if test "${switch_to_system_on_failure}" = "yes"; then
+ IMAP_TK_DIR="system"
+ else #This means they specified a directory. Search for a package installation there too
+ AC_MSG_CHECKING([for system c-client library...])
+ CPPFLAGS="${saved_cppflags}"
+ LIBS="${saved_libs}"
+ imap_include="-I${IMAP_TK_DIR}/include"
+ imap_ldflags="-I${IMAP_TK_DIR}/lib"
+ imap_libs="-lc-client"
+ CPPFLAGS="${CPPFLAGS} ${imap_include}"
+ LIBS="${LIBS} ${imap_libs} ${imap_ldflags}"
+ AC_LINK_IFELSE(
+ AC_LANG_PROGRAM(
+ [#include "c-client.h"
+ void mm_searched (MAILSTREAM *stream,unsigned long number)
+ {
+ }
+ void mm_exists (MAILSTREAM *stream,unsigned long number)
+ {
+ }
+ void mm_expunged (MAILSTREAM *stream,unsigned long number)
+ {
+ }
+ void mm_flags (MAILSTREAM *stream,unsigned long number)
+ {
+ }
+ void mm_notify (MAILSTREAM *stream,char *string,long errflg)
+ {
+ }
+ void mm_list (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes)
+ {
+ }
+ void mm_lsub (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes)
+ {
+ }
+ void mm_status (MAILSTREAM *stream,char *mailbox,MAILSTATUS *status)
+ {
+ }
+ void mm_log (char *string,long errflg)
+ {
+ }
+ void mm_dlog (char *string)
+ {
+ }
+ void mm_login (NETMBX *mb,char *user,char *pwd,long trial)
+ {
+ }
+ void mm_critical (MAILSTREAM *stream)
+ {
+ }
+ void mm_nocritical (MAILSTREAM *stream)
+ {
+ }
+ long mm_diskerror (MAILSTREAM *stream,long errcode,long serious)
+ {
+ }
+ void mm_fatal (char *string)
+ {
+ }],
+ [
+ MAILSTREAM *foo = mail_open(NULL, "", 0);
+ ]
+ ),
+ [ac_cv_imap_tk="yes"],
+ [ac_cv_imap_tk="no"]
+ )
+ if test "${ac_cv_imap_tk}" = "yes"; then
+ AC_LINK_IFELSE(
+ AC_LANG_PROGRAM(
+ [#include "c-client.h"
+ void mm_searched (MAILSTREAM *stream,unsigned long number)
+ {
+ }
+ void mm_exists (MAILSTREAM *stream,unsigned long number)
+ {
+ }
+ void mm_expunged (MAILSTREAM *stream,unsigned long number)
+ {
+ }
+ void mm_flags (MAILSTREAM *stream,unsigned long number)
+ {
+ }
+ void mm_notify (MAILSTREAM *stream,char *string,long errflg)
+ {
+ }
+ void mm_list (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes)
+ {
+ }
+ void mm_lsub (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes)
+ {
+ }
+ void mm_status (MAILSTREAM *stream,char *mailbox,MAILSTATUS *status)
+ {
+ }
+ void mm_log (char *string,long errflg)
+ {
+ }
+ void mm_dlog (char *string)
+ {
+ }
+ void mm_login (NETMBX *mb,char *user,char *pwd,long trial)
+ {
+ }
+ void mm_critical (MAILSTREAM *stream)
+ {
+ }
+ void mm_nocritical (MAILSTREAM *stream)
+ {
+ }
+ long mm_diskerror (MAILSTREAM *stream,long errcode,long serious)
+ {
+ }
+ void mm_fatal (char *string)
+ {
+ }],
+ [
+ long check = mail_expunge_full(NULL, "", 0);
+ ]
+ ),
+ [ac_cv_imap_tk2006="yes"],
+ [ac_cv_imap_tk2006="no"]
+ )
+ fi
+ fi
fi
fi
if test "${IMAP_TK_DIR}" = "system"; then
#We will enter here if user specified "system" or if any of above checks failed
AC_MSG_CHECKING([for system c-client library...])
+ CPPFLAGS="${saved_cppflags}"
+ LIBS="${saved_libs}"
imap_ldflags=""
imap_libs="-lc-client"
imap_include="-DUSE_SYSTEM_IMAP" #Try the imap directory first
@@ -1034,21 +1152,21 @@
)
fi
fi
- if test "${ac_cv_imap_tk}" = "yes"; then
- AC_MSG_RESULT(yes)
- CPPFLAGS="${saved_cppflags}"
- LIBS="${saved_libs}"
- IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}`
- IMAP_TK_INCLUDE="${imap_include}"
- PBX_IMAP_TK=1
- AC_DEFINE([HAVE_IMAP_TK], 1, [Define if your system has the UW IMAP Toolkit c-client library.])
- if test "${ac_cv_imap_tk2006}" = "yes"; then
- AC_DEFINE([HAVE_IMAP_TK2006], 1, [Define if your system has the UW IMAP Toolkit c-client library version 2006 or greater.])
- fi
- else
- AC_MSG_RESULT(no)
+ fi
+ if test "${ac_cv_imap_tk}" = "yes"; then
+ AC_MSG_RESULT(yes)
+ IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}`
+ IMAP_TK_INCLUDE="${imap_include}"
+ PBX_IMAP_TK=1
+ AC_DEFINE([HAVE_IMAP_TK], 1, [Define if your system has the UW IMAP Toolkit c-client library.])
+ if test "${ac_cv_imap_tk2006}" = "yes"; then
+ AC_DEFINE([HAVE_IMAP_TK2006], 1, [Define if your system has the UW IMAP Toolkit c-client library version 2006 or greater.])
fi
+ else
+ AC_MSG_RESULT(no)
fi
+ CPPFLAGS="${saved_cppflags}"
+ LIBS="${saved_libs}"
fi
AST_EXT_LIB_CHECK([JACK], [jack], [jack_activate], [jack/jack.h])
Modified: team/murf/bug11210/doc/tex/imapstorage.tex
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/doc/tex/imapstorage.tex?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/doc/tex/imapstorage.tex (original)
+++ team/murf/bug11210/doc/tex/imapstorage.tex Fri Feb 15 16:37:05 2008
@@ -55,12 +55,16 @@
\subsubsection{Compiling Asterisk}
Configure with ./configure --with-imap=/usr/src/imap
-or where ever you built thfe UWashington IMAP Toolkit.
+or where ever you built thfe UWashington IMAP Toolkit. This directory
+will be searched for a source installation. If no source installation is
+found there, then a package installation of the IMAP c-client will be
+searched for in this directory. If one is not found, then configure will fail.
A second configure option is to not specify a directory (i.e.
./configure --with-imap). This will assume that you have the
imap-2004g source installed in the .. directory relative to the
-Asterisk source.
+Asterisk source. If you do not have this source, then configure will
+default to the "system" option defined in the next paragraph
A third option is ./configure --with-imap=system. This will assume
that you have installed a dynamically linked version of the c-client
@@ -68,9 +72,6 @@
attempt to link agains -lc-client and will search for c-client headers
in your include path starting with the imap directory, and upon failure,
in the c-client directory.
-
-Note that if you attempt one of the first two configuration options for
-IMAP and it fails, the "system" option will be automatically attempted.
When you run 'make menuselect', choose 'Voicemail Build Options' and the
IMAP\_STORAGE option should be available for selection.
Modified: team/murf/bug11210/include/asterisk/extconf.h
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/include/asterisk/extconf.h?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/include/asterisk/extconf.h (original)
+++ team/murf/bug11210/include/asterisk/extconf.h Fri Feb 15 16:37:05 2008
@@ -15,8 +15,9 @@
* the GNU General Public License Version 2. See the LICENSE file
* at the top of the source tree.
*/
-/*! \file External configuration handlers (realtime and static configuration)
- * \author Steve Murphy <murf at digium.com>
+/*! \file
+ * \brief External configuration handlers (realtime and static configuration)
+ * \author Steve Murphy <murf at digium.com>
*
*/
Modified: team/murf/bug11210/include/asterisk/strings.h
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/include/asterisk/strings.h?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/include/asterisk/strings.h (original)
+++ team/murf/bug11210/include/asterisk/strings.h Fri Feb 15 16:37:05 2008
@@ -148,16 +148,15 @@
char *ast_strip_quoted(char *s, const char *beg_quotes, const char *end_quotes);
/*!
- \brief Strip backslash for "escaped" semicolons.
- \brief s The string to be stripped (will be modified).
+ \brief Strip backslash for "escaped" semicolons,
+ the string to be stripped (will be modified).
\return The stripped string.
*/
char *ast_unescape_semicolon(char *s);
/*!
- \brief Convert some C escape sequences (\b\f\n\r\t) into the
- equivalent characters.
- \brief s The string to be converted (will be modified).
+ \brief Convert some C escape sequences \verbatim (\b\f\n\r\t) \endverbatim into the
+ equivalent characters. The string to be converted (will be modified).
\return The converted string.
*/
char *ast_unescape_c(char *s);
Modified: team/murf/bug11210/include/asterisk/time.h
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/include/asterisk/time.h?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/include/asterisk/time.h (original)
+++ team/murf/bug11210/include/asterisk/time.h Fri Feb 15 16:37:05 2008
@@ -57,8 +57,9 @@
/*!
* \brief Computes the difference (in microseconds) between two \c struct \c timeval instances.
- * \param end the end of the time period
- * \param start the beginning of the time period
+ * \param ast_tvdiff_sec
+ * \arg end the end of the time period
+ * \arg start the beginning of the time period
* \return the difference in microseconds
*/
AST_INLINE_API(
Modified: team/murf/bug11210/main/ast_expr2f.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/main/ast_expr2f.c?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/main/ast_expr2f.c (original)
+++ team/murf/bug11210/main/ast_expr2f.c Fri Feb 15 16:37:05 2008
@@ -1301,12 +1301,13 @@
} /* end of scanning one token */
} /* end of ast_yylex */
-/* yy_get_next_buffer - try to read in a new buffer
+/*!
+ * \brief yy_get_next_buffer - try to read in a new buffer
*
* Returns a code representing an action:
- * EOB_ACT_LAST_MATCH -
- * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- * EOB_ACT_END_OF_FILE - end of file
+ * \retval EOB_ACT_LAST_MATCH -
+ * \retval EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ * \retval EOB_ACT_END_OF_FILE - end of file
*/
static int yy_get_next_buffer (yyscan_t yyscanner)
{
@@ -1433,7 +1434,7 @@
return ret_val;
}
-/* yy_get_previous_state - get the state just before the EOB char was reached */
+/*! \brief yy_get_previous_state - get the state just before the EOB char was reached */
static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
{
@@ -1463,7 +1464,7 @@
return yy_current_state;
}
-/* yy_try_NUL_trans - try to make a transition on the NUL character
+/*! \brief yy_try_NUL_trans - try to make a transition on the NUL character.
*
* synopsis
* next_state = yy_try_NUL_trans( current_state );
@@ -1605,10 +1606,11 @@
}
#endif /* ifndef YY_NO_INPUT */
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * @param yyscanner The scanner object.
- * @note This function does not reset the start condition to @c INITIAL .
+/*!
+ * \brief Immediately switch to a different input stream.
+ * \param input_file A readable stream.
+ * \param yyscanner The scanner object.
+ * \note This function does not reset the start condition to @c INITIAL .
*/
void ast_yyrestart (FILE * input_file , yyscan_t yyscanner)
{
@@ -1624,9 +1626,10 @@
ast_yy_load_buffer_state(yyscanner );
}
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * @param yyscanner The scanner object.
+/*!
+ * \brief Switch to a different input buffer.
+ * \param new_buffer The new input buffer.
+ * \param yyscanner The scanner object.
*/
void ast_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
{
@@ -1669,11 +1672,12 @@
yyg->yy_hold_char = *yyg->yy_c_buf_p;
}
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * @param yyscanner The scanner object.
- * @return the allocated buffer state.
+/*!
+ * \brief Allocate and initialize an input buffer state.
+ * \param file A readable stream.
+ * \param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * \param yyscanner The scanner object.
+ * \return the allocated buffer state.
*/
YY_BUFFER_STATE ast_yy_create_buffer (FILE * file, int size , yyscan_t yyscanner)
{
@@ -1699,9 +1703,10 @@
return b;
}
-/** Destroy the buffer.
- * @param b a buffer created with ast_yy_create_buffer()
- * @param yyscanner The scanner object.
+/*!
+ * \brief Destroy the buffer.
+ * \param b a buffer created with ast_yy_create_buffer()
+ * \param yyscanner The scanner object.
*/
void ast_yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner)
{
@@ -1723,8 +1728,9 @@
extern int isatty (int );
#endif /* __cplusplus */
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
+/*!
+ * \brief Initializes or reinitializes a buffer.
+ * \note This function is sometimes called more than once on the same buffer,
* such as during a ast_yyrestart() or at EOF.
*/
static void ast_yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner)
@@ -1752,9 +1758,10 @@
errno = oerrno;
}
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * @param yyscanner The scanner object.
+/*!
+ * \brief Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * \param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * \param yyscanner The scanner object.
*/
void ast_yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner)
{
@@ -1780,11 +1787,12 @@
ast_yy_load_buffer_state(yyscanner );
}
-/** Pushes the new state onto the stack. The new state becomes
+/*!
+ * \brief Pushes the new state onto the stack. The new state becomes
* the current state. This function will allocate the stack
* if necessary.
- * @param new_buffer The new state.
- * @param yyscanner The scanner object.
+ * \param new_buffer The new state.
+ * \param yyscanner The scanner object.
*/
void ast_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
{
@@ -1813,9 +1821,10 @@
yyg->yy_did_buffer_switch_on_eof = 1;
}
-/** Removes and deletes the top of the stack, if present.
+/*!
+ * \brief Removes and deletes the top of the stack, if present.
* The next element becomes the new top.
- * @param yyscanner The scanner object.
+ * \param yyscanner The scanner object.
*/
void ast_yypop_buffer_state (yyscan_t yyscanner)
{
@@ -1877,11 +1886,12 @@
}
}
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object.
+/*!
+ * \brief Setup the input buffer state to scan directly from a user-specified character buffer.
+ * \param base the character buffer
+ * \param size the size in bytes of the character buffer
+ * \param yyscanner The scanner object.
+ * \return the newly allocated buffer state object.
*/
YY_BUFFER_STATE ast_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner)
{
@@ -1912,12 +1922,13 @@
return b;
}
-/** Setup the input buffer state to scan a string. The next call to ast_yylex() will
- * scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
- * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
+/*!
+ * \brief Setup the input buffer state to scan a string. The next call to ast_yylex() will
+ * scan from a \e copy of \a str.
+ * \param yystr a NUL-terminated string to scan
+ * \param yyscanner The scanner object.
+ * \return the newly allocated buffer state object.
+ * \note If you want to scan bytes that may contain NUL values, then use
* ast_yy_scan_bytes() instead.
*/
YY_BUFFER_STATE ast_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)
@@ -1926,12 +1937,13 @@
return ast_yy_scan_bytes(yystr,strlen(yystr) ,yyscanner);
}
-/** Setup the input buffer state to scan the given bytes. The next call to ast_yylex() will
- * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
- * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object.
+/*!
+ * \brief Setup the input buffer state to scan the given bytes. The next call to ast_yylex() will
+ * scan from a \e copy of \a bytes.
+ * \param yybytes the byte buffer to scan
+ * \param _yybytes_len the number of bytes in the buffer pointed to by \a bytes.
+ * \param yyscanner The scanner object.
+ * \return the newly allocated buffer state object.
*/
YY_BUFFER_STATE ast_yy_scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner)
{
@@ -1992,8 +2004,9 @@
/* Accessor methods (get/set functions) to struct members. */
-/** Get the user-defined data for this scanner.
- * @param yyscanner The scanner object.
+/*!
+ * \brief Get the user-defined data for this scanner.
+ * \param yyscanner The scanner object.
*/
YY_EXTRA_TYPE ast_yyget_extra (yyscan_t yyscanner)
{
@@ -2001,8 +2014,9 @@
return yyextra;
}
-/** Get the current line number.
- * @param yyscanner The scanner object.
+/*!
+ * \brief Get the current line number.
+ * \param yyscanner The scanner object.
*/
int ast_yyget_lineno (yyscan_t yyscanner)
{
@@ -2014,8 +2028,9 @@
return yylineno;
}
-/** Get the current column number.
- * @param yyscanner The scanner object.
+/*!
+ * \brief Get the current column number.
+ * \param yyscanner The scanner object.
*/
int ast_yyget_column (yyscan_t yyscanner)
{
@@ -2027,8 +2042,9 @@
return yycolumn;
}
-/** Get the input stream.
- * @param yyscanner The scanner object.
+/*!
+ * \brief Get the input stream.
+ * \param yyscanner The scanner object.
*/
FILE *ast_yyget_in (yyscan_t yyscanner)
{
@@ -2036,8 +2052,9 @@
return yyin;
}
-/** Get the output stream.
- * @param yyscanner The scanner object.
+/*!
+ * \brief Get the output stream.
+ * \param yyscanner The scanner object.
*/
FILE *ast_yyget_out (yyscan_t yyscanner)
{
@@ -2045,8 +2062,9 @@
return yyout;
}
-/** Get the length of the current token.
- * @param yyscanner The scanner object.
+/*!
+ * \brief Get the length of the current token.
+ * \param yyscanner The scanner object.
*/
int ast_yyget_leng (yyscan_t yyscanner)
{
@@ -2054,8 +2072,9 @@
return yyleng;
}
-/** Get the current token.
- * @param yyscanner The scanner object.
+/*!
+ * \brief Get the current token.
+ * \param yyscanner The scanner object.
*/
char *ast_yyget_text (yyscan_t yyscanner)
@@ -2064,9 +2083,10 @@
return yytext;
}
-/** Set the user-defined data. This data is never touched by the scanner.
- * @param user_defined The data to be associated with this scanner.
- * @param yyscanner The scanner object.
+/*!
+ * \brief Set the user-defined data. This data is never touched by the scanner.
+ * \param user_defined The data to be associated with this scanner.
+ * \param yyscanner The scanner object.
*/
void ast_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner)
{
@@ -2074,9 +2094,10 @@
yyextra = user_defined ;
}
-/** Set the current line number.
- * @param line_number
- * @param yyscanner The scanner object.
+/*!
+ * \brief Set the current line number.
+ * \param line_number
+ * \param yyscanner The scanner object.
*/
void ast_yyset_lineno (int line_number , yyscan_t yyscanner)
{
@@ -2089,9 +2110,10 @@
yylineno = line_number;
}
-/** Set the current column.
- * @param line_number
- * @param yyscanner The scanner object.
+/*!
+ * \brief Set the current column.
+ * \param column_no
+ * \param yyscanner The scanner object.
*/
void ast_yyset_column (int column_no , yyscan_t yyscanner)
{
@@ -2104,11 +2126,12 @@
yycolumn = column_no;
}
-/** Set the input stream. This does not discard the current
+/*!
+ * \brief Set the input stream. This does not discard the current
* input buffer.
- * @param in_str A readable stream.
- * @param yyscanner The scanner object.
- * @see ast_yy_switch_to_buffer
+ * \param in_str A readable stream.
+ * \param yyscanner The scanner object.
+ * \see ast_yy_switch_to_buffer
*/
void ast_yyset_in (FILE * in_str , yyscan_t yyscanner)
{
@@ -2162,9 +2185,10 @@
/* User-visible API */
-/* ast_yylex_init is special because it creates the scanner itself, so it is
- * the ONLY reentrant function that doesn't take the scanner as the last argument.
- * That's why we explicitly handle the declaration, instead of using our macros.
+/*! \brief ast_yylex_init is special because it creates the scanner itself.
+ *
+ * It is the ONLY reentrant function that doesn't take the scanner as the last argument.
+ * \note That's why we explicitly handle the declaration, instead of using our macros.
*/
int ast_yylex_init(yyscan_t* ptr_yy_globals)
Modified: team/murf/bug11210/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/main/channel.c?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/main/channel.c (original)
+++ team/murf/bug11210/main/channel.c Fri Feb 15 16:37:05 2008
@@ -4059,7 +4059,10 @@
}
/*! \brief Send manager event for bridge link and unlink events.
- \param type 1 for core, 2 for native
+ * \param onoff Link/Unlinked
+ * \param type 1 for core, 2 for native
+ * \param c0 first channel in bridge
+ * \param c1 second channel in bridge
*/
static void manager_bridge_event(int onoff, int type, struct ast_channel *c0, struct ast_channel *c1)
{
Modified: team/murf/bug11210/main/config.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/main/config.c?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/main/config.c (original)
+++ team/murf/bug11210/main/config.c Fri Feb 15 16:37:05 2008
@@ -907,9 +907,11 @@
}
/*! \brief parse one line in the configuration.
+ * \verbatim
* We can have a category header [foo](...)
* a directive #include / #exec
* or a regular line name = value
+ * \endverbatim
*/
static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
char *buf, int lineno, const char *configfile, struct ast_flags flags,
Modified: team/murf/bug11210/main/loader.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/main/loader.c?view=diff&rev=103735&r1=103734&r2=103735
==============================================================================
--- team/murf/bug11210/main/loader.c (original)
+++ team/murf/bug11210/main/loader.c Fri Feb 15 16:37:05 2008
@@ -589,8 +589,16 @@
if (name && resource_name_match(name, cur->resource))
continue;
- if (!(cur->flags.running || cur->flags.declined))
- continue;
+ if (!cur->flags.running || cur->flags.declined) {
+ if (!name)
+ continue;
+ ast_log(LOG_NOTICE, "The module '%s' was not properly initialized. "
+ "Before reloading the module, you must run \"module load %s\" "
+ "and fix whatever is preventing the module from being initialized.\n",
+ name, name);
[... 85 lines stripped ...]
More information about the svn-commits
mailing list