[asterisk-commits] russell: branch russell/chan_console r67059 - in
/team/russell/chan_console: ...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Jun 4 09:21:39 MST 2007
Author: russell
Date: Mon Jun 4 11:21:38 2007
New Revision: 67059
URL: http://svn.digium.com/view/asterisk?view=rev&rev=67059
Log:
Merged revisions 67016-67017,67019,67022-67024,67029 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r67016 | russell | 2007-06-04 10:14:52 -0500 (Mon, 04 Jun 2007) | 3 lines
Fix a couple of places where "tos" was used instead of "cos".
(issue #9540, patch by IgorG)
................
r67017 | russell | 2007-06-04 10:26:43 -0500 (Mon, 04 Jun 2007) | 3 lines
Fix some compiler warnings in C++ modules.
(issue #9866, reported by osk, patch by Corydon76)
................
r67019 | russell | 2007-06-04 10:29:00 -0500 (Mon, 04 Jun 2007) | 10 lines
Blocked revisions 67018 via svnmerge
........
r67018 | russell | 2007-06-04 10:28:33 -0500 (Mon, 04 Jun 2007) | 3 lines
Fix some compiler warnings in C++ modules.
(issue #9866, reported by osk, patch by Corydon76)
........
................
r67022 | russell | 2007-06-04 10:50:46 -0500 (Mon, 04 Jun 2007) | 15 lines
Merged revisions 67020 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r67020 | russell | 2007-06-04 10:47:40 -0500 (Mon, 04 Jun 2007) | 7 lines
Resolve a deadlock in chan_iax2. When handling an implicit ACK to a frame that
was marked as the final transmission for a call, don't call iax2_destroy() for
that call while the global frame queue is still locked. There is a very nice
explanation of the deadlock in the report.
(issue #9663, thorough report and patch from stevedavies, additional positive
test reports from mihai and joff_oconnell)
........
................
r67023 | tilghman | 2007-06-04 10:53:15 -0500 (Mon, 04 Jun 2007) | 10 lines
Merged revisions 67021 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r67021 | tilghman | 2007-06-04 10:50:16 -0500 (Mon, 04 Jun 2007) | 2 lines
Issue 9739 - Malformed jid causes a crash
........
................
r67024 | russell | 2007-06-04 10:56:13 -0500 (Mon, 04 Jun 2007) | 3 lines
Change javadoc style code documentation to the same format we use elsewhere.
(issue #9864, patch from snuffy)
................
r67029 | russell | 2007-06-04 11:03:19 -0500 (Mon, 04 Jun 2007) | 14 lines
Merged revisions 67026 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r67026 | russell | 2007-06-04 11:02:31 -0500 (Mon, 04 Jun 2007) | 6 lines
Change the configure script to build a test program against libcurl to make
sure the results from curl-config can be used to compile successfully. This is
intended to help prevent a situation where you are cross compiling, and the
configure script finds the curl library installed on the host.
(issue #9865, reported and patched by zandbelt)
........
................
Modified:
team/russell/chan_console/ (props changed)
team/russell/chan_console/channels/chan_iax2.c
team/russell/chan_console/channels/chan_sip.c
team/russell/chan_console/configure
team/russell/chan_console/configure.ac
team/russell/chan_console/include/asterisk/stringfields.h
team/russell/chan_console/main/app.c
team/russell/chan_console/main/ast_expr2f.c
team/russell/chan_console/main/netsock.c
team/russell/chan_console/pbx/ael/ael_lex.c
team/russell/chan_console/res/res_jabber.c
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
automerge = *
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 4 11:21:38 2007
@@ -1,1 +1,1 @@
-/trunk:1-67012
+/trunk:1-67057
Modified: team/russell/chan_console/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_iax2.c?view=diff&rev=67059&r1=67058&r2=67059
==============================================================================
--- team/russell/chan_console/channels/chan_iax2.c (original)
+++ team/russell/chan_console/channels/chan_iax2.c Mon Jun 4 11:21:38 2007
@@ -6844,6 +6844,7 @@
((f.subclass != IAX_COMMAND_INVAL) ||
(f.frametype != AST_FRAME_IAX))) {
unsigned char x;
+ int call_to_destroy;
/* XXX This code is not very efficient. Surely there is a better way which still
properly handles boundary conditions? XXX */
/* First we have to qualify that the ACKed value is within our window */
@@ -6857,20 +6858,23 @@
/* Ack the packet with the given timestamp */
if (option_debug && iaxdebug)
ast_log(LOG_DEBUG, "Cancelling transmission of packet %d\n", x);
+ call_to_destroy = 0;
AST_LIST_LOCK(&queue);
AST_LIST_TRAVERSE(&queue, cur, list) {
/* If it's our call, and our timestamp, mark -1 retries */
if ((fr->callno == cur->callno) && (x == cur->oseqno)) {
cur->retries = -1;
/* Destroy call if this is the end */
- if (cur->final) {
- if (iaxdebug && option_debug)
- ast_log(LOG_DEBUG, "Really destroying %d, having been acked on final message\n", fr->callno);
- iax2_destroy(fr->callno);
- }
+ if (cur->final)
+ call_to_destroy = fr->callno;
}
}
AST_LIST_UNLOCK(&queue);
+ if (call_to_destroy) {
+ if (iaxdebug && option_debug)
+ ast_log(LOG_DEBUG, "Really destroying %d, having been acked on final message\n", call_to_destroy);
+ iax2_destroy(call_to_destroy);
+ }
}
/* Note how much we've received acknowledgement for */
if (iaxs[fr->callno])
Modified: team/russell/chan_console/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_sip.c?view=diff&rev=67059&r1=67058&r2=67059
==============================================================================
--- team/russell/chan_console/channels/chan_sip.c (original)
+++ team/russell/chan_console/channels/chan_sip.c Mon Jun 4 11:21:38 2007
@@ -17771,7 +17771,7 @@
ast_verbose(VERBOSE_PREFIX_2 "SIP Listening on %s:%d\n",
ast_inet_ntoa(bindaddr.sin_addr), ntohs(bindaddr.sin_port));
- ast_netsock_set_qos(sipsock, global_tos_sip, global_tos_sip);
+ ast_netsock_set_qos(sipsock, global_tos_sip, global_cos_sip);
}
}
}
Modified: team/russell/chan_console/configure
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/configure?view=diff&rev=67059&r1=67058&r2=67059
==============================================================================
--- team/russell/chan_console/configure (original)
+++ team/russell/chan_console/configure Mon Jun 4 11:21:38 2007
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 61643 .
+# From configure.ac Revision: 66722 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
@@ -35730,12 +35730,71 @@
if test $(printf "%d" 0x$(${CURL_CONFIG} --vernum)) -ge $(printf "%d" 0x070907); then
CURL_INCLUDE=$(${CURL_CONFIG} --cflags)
CURL_LIB=$(${CURL_CONFIG} --libs)
- PBX_CURL=1
+
+ { echo "$as_me:$LINENO: checking for curl_version() in curl/curl.h" >&5
+echo $ECHO_N "checking for curl_version() in curl/curl.h... $ECHO_C" >&6; }
+ saved_cppflags="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} ${CURL_INCLUDE}"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <curl/curl.h>
+int
+main ()
+{
+curl_version();
+ ;
+ return 0;
+}
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+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_compile") 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); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ ac_cv_curl_h="yes"
+
+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; }
+ ac_cv_curl_h="no"
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CPPFLAGS="${saved_cppflags}"
+ if test "${ac_cv_curl_h}" = "yes"; then
+ PBX_CURL=1
cat >>confdefs.h <<\_ACEOF
#define HAVE_CURL 1
_ACEOF
+ fi
fi
fi
fi
Modified: team/russell/chan_console/configure.ac
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/configure.ac?view=diff&rev=67059&r1=67058&r2=67059
==============================================================================
--- team/russell/chan_console/configure.ac (original)
+++ team/russell/chan_console/configure.ac Mon Jun 4 11:21:38 2007
@@ -1019,8 +1019,27 @@
if test $(printf "%d" 0x$(${CURL_CONFIG} --vernum)) -ge $(printf "%d" 0x070907); then
CURL_INCLUDE=$(${CURL_CONFIG} --cflags)
CURL_LIB=$(${CURL_CONFIG} --libs)
- PBX_CURL=1
- AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.])
+
+ AC_MSG_CHECKING(for curl_version() in curl/curl.h)
+ saved_cppflags="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} ${CURL_INCLUDE}"
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [#include <curl/curl.h>],
+ [curl_version();])
+ ],[
+ AC_MSG_RESULT(yes)
+ ac_cv_curl_h="yes"
+ ],[
+ AC_MSG_RESULT(no)
+ ac_cv_curl_h="no"
+ ]
+ )
+ CPPFLAGS="${saved_cppflags}"
+ if test "${ac_cv_curl_h}" = "yes"; then
+ PBX_CURL=1
+ AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.])
+ fi
fi
fi
fi
Modified: team/russell/chan_console/include/asterisk/stringfields.h
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/include/asterisk/stringfields.h?view=diff&rev=67059&r1=67058&r2=67059
==============================================================================
--- team/russell/chan_console/include/asterisk/stringfields.h (original)
+++ team/russell/chan_console/include/asterisk/stringfields.h Mon Jun 4 11:21:38 2007
@@ -235,7 +235,7 @@
*/
#define ast_string_field_index_set(x, index, data) do { \
char *__zz__ = (char*)(x)->__begin_field[index]; \
- int __dlen__ = strlen(data); \
+ size_t __dlen__ = strlen(data); \
if( __dlen__ == 0 ) { (x)->__begin_field[index] = __ast_string_field_empty; \
} else { \
if( __zz__[0] != 0 && __dlen__ <= strlen(__zz__) ) { \
@@ -250,7 +250,7 @@
#ifdef FOR_TEST
#define ast_string_field_index_logset(x, index, data, logstr) do { \
char *__zz__ = (char*)(x)->__begin_field[index]; \
- int __dlen__ = strlen(data); \
+ size_t __dlen__ = strlen(data); \
if( __dlen__ == 0 ) { (x)->__begin_field[index] = __ast_string_field_empty; \
} else { \
if( __zz__[0] != 0 && __dlen__ <= strlen(__zz__) ) { \
Modified: team/russell/chan_console/main/app.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/main/app.c?view=diff&rev=67059&r1=67058&r2=67059
==============================================================================
--- team/russell/chan_console/main/app.c (original)
+++ team/russell/chan_console/main/app.c Mon Jun 4 11:21:38 2007
@@ -55,12 +55,19 @@
static AST_LIST_HEAD_STATIC(groups, ast_group_info);
-/* !
-This function presents a dialtone and reads an extension into 'collect'
-which must be a pointer to a **pre-initialized** array of char having a
-size of 'size' suitable for writing to. It will collect no more than the smaller
-of 'maxlen' or 'size' minus the original strlen() of collect digits.
-\return 0 if extension does not exist, 1 if extension exists
+/*!
+ * \brief This function presents a dialtone and reads an extension into 'collect'
+ * which must be a pointer to a **pre-initialized** array of char having a
+ * size of 'size' suitable for writing to. It will collect no more than the smaller
+ * of 'maxlen' or 'size' minus the original strlen() of collect digits.
+ * \param chan struct.
+ * \param context
+ * \param collect
+ * \param size
+ * \param maxlen
+ * \param timeout timeout in seconds
+ *
+ * \return 0 if extension does not exist, 1 if extension exists
*/
int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect, size_t size, int maxlen, int timeout)
{
@@ -98,11 +105,13 @@
return res;
}
-/*! \param c The channel to read from
- * \param prompt The file to stream to the channel
- * \param s The string to read in to. Must be at least the size of your length
- * \param maxlen How many digits to read (maximum)
- * \param timeout set timeout to 0 for "standard" timeouts. Set timeout to -1 for
+/*!
+ * \brief ast_app_getdata
+ * \param c The channel to read from
+ * \param prompt The file to stream to the channel
+ * \param s The string to read in to. Must be at least the size of your length
+ * \param maxlen How many digits to read (maximum)
+ * \param timeout set timeout to 0 for "standard" timeouts. Set timeout to -1 for
* "ludicrous time" (essentially never times out) */
int ast_app_getdata(struct ast_channel *c, const char *prompt, char *s, int maxlen, int timeout)
{
@@ -491,19 +500,19 @@
static int global_maxsilence = 0;
/*! Optionally play a sound file or a beep, then record audio and video from the channel.
- * @param chan Channel to playback to/record from.
- * @param playfile Filename of sound to play before recording begins.
- * @param recordfile Filename to record to.
- * @param maxtime Maximum length of recording (in milliseconds).
- * @param fmt Format(s) to record message in. Multiple formats may be specified by separating them with a '|'.
- * @param duration Where to store actual length of the recorded message (in milliseconds).
- * @param beep Whether to play a beep before starting to record.
- * @param silencethreshold
- * @param maxsilence Length of silence that will end a recording (in milliseconds).
- * @param path Optional filesystem path to unlock.
- * @param prepend If true, prepend the recorded audio to an existing file.
- * @param acceptdtmf DTMF digits that will end the recording.
- * @param canceldtmf DTMF digits that will cancel the recording.
+ * \param chan Channel to playback to/record from.
+ * \param playfile Filename of sound to play before recording begins.
+ * \param recordfile Filename to record to.
+ * \param maxtime Maximum length of recording (in milliseconds).
+ * \param fmt Format(s) to record message in. Multiple formats may be specified by separating them with a '|'.
+ * \param duration Where to store actual length of the recorded message (in milliseconds).
+ * \param beep Whether to play a beep before starting to record.
+ * \param silencethreshold
+ * \param maxsilence Length of silence that will end a recording (in milliseconds).
+ * \param path Optional filesystem path to unlock.
+ * \param prepend If true, prepend the recorded audio to an existing file.
+ * \param acceptdtmf DTMF digits that will end the recording.
+ * \param canceldtmf DTMF digits that will cancel the recording.
*/
static int __ast_play_and_record(struct ast_channel *chan, const char *playfile, const char *recordfile, int maxtime, const char *fmt, int *duration, int beep, int silencethreshold, int maxsilence, const char *path, int prepend, const char *acceptdtmf, const char *canceldtmf)
Modified: team/russell/chan_console/main/ast_expr2f.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/main/ast_expr2f.c?view=diff&rev=67059&r1=67058&r2=67059
==============================================================================
--- team/russell/chan_console/main/ast_expr2f.c (original)
+++ team/russell/chan_console/main/ast_expr2f.c Mon Jun 4 11:21:38 2007
@@ -229,8 +229,8 @@
*/
int yy_at_bol;
- int yy_bs_lineno; /**< The line count. */
- int yy_bs_column; /**< The column count. */
+ int yy_bs_lineno; /*!< The line count. */
+ int yy_bs_column; /*!< The column count. */
/* Whether to try to fill the input buffer when we reach the
* end of it.
@@ -1436,9 +1436,9 @@
/* The rest are the same as the globals declared in the non-reentrant scanner. */
FILE *yyin_r, *yyout_r;
- size_t yy_buffer_stack_top; /**< index of top of stack. */
- size_t yy_buffer_stack_max; /**< capacity of stack. */
- YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
+ size_t yy_buffer_stack_top; /*!< index of top of stack. */
+ size_t yy_buffer_stack_max; /*!< capacity of stack. */
+ YY_BUFFER_STATE * yy_buffer_stack; /*!< Stack as an array. */
char yy_hold_char;
int yy_n_chars;
int yyleng_r;
@@ -1619,7 +1619,8 @@
#define YY_RULE_SETUP \
YY_USER_ACTION
-/** The main scanner function which does all the work.
+/*!
+ * \brief The main scanner function which does all the work.
*/
YY_DECL
{
@@ -2381,10 +2382,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)
{
@@ -2400,9 +2402,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)
{
@@ -2445,11 +2448,13 @@
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)
{
@@ -2475,9 +2480,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)
{
@@ -2528,9 +2534,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)
{
@@ -2556,11 +2563,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)
{
@@ -2589,9 +2597,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)
{
@@ -2653,11 +2662,13 @@
}
}
-/** 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)
{
@@ -2688,12 +2699,14 @@
return b;
}
-/** Setup the input buffer state to scan a string. The next call to ast_yylex() will
+/*!
+ * \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 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
+ * \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 NULL values, then use
* ast_yy_scan_bytes() instead.
*/
YY_BUFFER_STATE ast_yy_scan_string (yyconst char * str , yyscan_t yyscanner)
@@ -2702,12 +2715,14 @@
return ast_yy_scan_bytes(str,strlen(str) ,yyscanner);
}
-/** Setup the input buffer state to scan the given bytes. The next call to ast_yylex() will
+/*!
+ * \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 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.
+ * \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.
*/
YY_BUFFER_STATE ast_yy_scan_bytes (yyconst char * bytes, int len , yyscan_t yyscanner)
{
@@ -2768,8 +2783,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)
{
@@ -2777,8 +2793,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)
{
@@ -2790,8 +2807,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)
{
@@ -2803,8 +2821,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)
{
@@ -2812,8 +2831,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)
{
@@ -2821,8 +2841,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)
{
@@ -2830,8 +2851,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)
@@ -2840,9 +2862,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)
{
@@ -2850,9 +2873,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)
{
@@ -2865,9 +2889,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)
{
@@ -2880,11 +2905,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)
{
@@ -2969,7 +2995,8 @@
/* User-visible API */
-/* ast_yylex_init is special because it creates the scanner itself, so it is
+/*!
+ * \brief 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.
*/
@@ -2994,7 +3021,7 @@
return yy_init_globals ( *ptr_yy_globals );
}
-/* ast_yylex_destroy is for both reentrant and non-reentrant scanners. */
+/*! \brief ast_yylex_destroy is for both reentrant and non-reentrant scanners. */
int ast_yylex_destroy (yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
Modified: team/russell/chan_console/main/netsock.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/main/netsock.c?view=diff&rev=67059&r1=67058&r2=67059
==============================================================================
--- team/russell/chan_console/main/netsock.c (original)
+++ team/russell/chan_console/main/netsock.c Mon Jun 4 11:21:38 2007
@@ -185,7 +185,7 @@
ast_log(LOG_WARNING, "Unable to set CoS to %d\n", cos);
else {
if (option_verbose > 1)
- ast_verbose(VERBOSE_PREFIX_2 "Using CoS mark %d\n", tos);
+ ast_verbose(VERBOSE_PREFIX_2 "Using CoS mark %d\n", cos);
}
#endif
Modified: team/russell/chan_console/pbx/ael/ael_lex.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/pbx/ael/ael_lex.c?view=diff&rev=67059&r1=67058&r2=67059
==============================================================================
--- team/russell/chan_console/pbx/ael/ael_lex.c (original)
+++ team/russell/chan_console/pbx/ael/ael_lex.c Mon Jun 4 11:21:38 2007
@@ -230,8 +230,8 @@
*/
int yy_at_bol;
- int yy_bs_lineno; /**< The line count. */
- int yy_bs_column; /**< The column count. */
+ int yy_bs_lineno; /*!< The line count. */
+ int yy_bs_column; /*!< The column count. */
/* Whether to try to fill the input buffer when we reach the
* end of it.
@@ -899,7 +899,7 @@
#define YY_EXTRA_TYPE void *
#endif
-/* Holds the entire state of the reentrant scanner. */
+/*! \brief Holds the entire state of the reentrant scanner. */
struct yyguts_t
{
@@ -908,9 +908,9 @@
/* The rest are the same as the globals declared in the non-reentrant scanner. */
FILE *yyin_r, *yyout_r;
- size_t yy_buffer_stack_top; /**< index of top of stack. */
- size_t yy_buffer_stack_max; /**< capacity of stack. */
- YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
+ size_t yy_buffer_stack_top; /*!< index of top of stack. */
+ size_t yy_buffer_stack_max; /*!< capacity of stack. */
+ YY_BUFFER_STATE * yy_buffer_stack; /*!< Stack as an array. */
char yy_hold_char;
int yy_n_chars;
int yyleng_r;
@@ -2176,10 +2176,12 @@
}
#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 ael_yyrestart (FILE * input_file , yyscan_t yyscanner)
{
@@ -2195,9 +2197,10 @@
ael_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 ael_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
{
@@ -2240,11 +2243,13 @@
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 ael_yy_create_buffer (FILE * file, int size , yyscan_t yyscanner)
{
@@ -2270,9 +2275,10 @@
return b;
}
-/** Destroy the buffer.
- * @param b a buffer created with ael_yy_create_buffer()
- * @param yyscanner The scanner object.
+/*!
+ * \brief Destroy the buffer.
+ * \param b a buffer created with ael_yy_create_buffer()
+ * \param yyscanner The scanner object.
*/
void ael_yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner)
{
@@ -2323,9 +2329,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 ael_yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner)
{
@@ -2351,11 +2358,12 @@
ael_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 ael_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
{
@@ -2384,9 +2392,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 ael_yypop_buffer_state (yyscan_t yyscanner)
{
@@ -2448,11 +2457,13 @@
}
}
-/** 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 ael_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner)
{
@@ -2483,12 +2494,15 @@
return b;
}
-/** Setup the input buffer state to scan a string. The next call to ael_yylex() will
+/*!
+ * \brief Setup the input buffer state to scan a string. The next call to ael_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
+ * \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
* ael_yy_scan_bytes() instead.
*/
YY_BUFFER_STATE ael_yy_scan_string (yyconst char * str , yyscan_t yyscanner)
@@ -2497,12 +2511,14 @@
return ael_yy_scan_bytes(str,strlen(str) ,yyscanner);
}
-/** Setup the input buffer state to scan the given bytes. The next call to ael_yylex() will
+/*!
+ * \brief Setup the input buffer state to scan the given bytes. The next call to ael_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.
+ * \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.
*/
YY_BUFFER_STATE ael_yy_scan_bytes (yyconst char * bytes, int len , yyscan_t yyscanner)
{
@@ -2563,8 +2579,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 ael_yyget_extra (yyscan_t yyscanner)
{
@@ -2572,8 +2589,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 ael_yyget_lineno (yyscan_t yyscanner)
{
@@ -2585,8 +2603,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 ael_yyget_column (yyscan_t yyscanner)
{
@@ -2598,8 +2617,9 @@
return yycolumn;
}
-/** Get the input stream.
- * @param yyscanner The scanner object.
+/*!
+ * \brief Get the input stream.
+ * \param yyscanner The scanner object.
*/
FILE *ael_yyget_in (yyscan_t yyscanner)
{
@@ -2607,8 +2627,9 @@
return yyin;
}
-/** Get the output stream.
- * @param yyscanner The scanner object.
+/*!
+ * \brief Get the output stream.
+ * \param yyscanner The scanner object.
*/
FILE *ael_yyget_out (yyscan_t yyscanner)
{
@@ -2616,8 +2637,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 ael_yyget_leng (yyscan_t yyscanner)
{
@@ -2625,8 +2647,9 @@
return yyleng;
}
-/** Get the current token.
- * @param yyscanner The scanner object.
+/*!
+ * \brief Get the current token.
+ * \param yyscanner The scanner object.
*/
char *ael_yyget_text (yyscan_t yyscanner)
@@ -2635,9 +2658,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 ael_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner)
{
@@ -2645,9 +2669,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 ael_yyset_lineno (int line_number , yyscan_t yyscanner)
{
@@ -2660,9 +2685,10 @@
yylineno = line_number;
}
-/** Set the current column.
- * @param line_number
- * @param yyscanner The scanner object.
+/*!
+ * \brief Set the current column.
+ * \param line_number
+ * \param yyscanner The scanner object.
*/
void ael_yyset_column (int column_no , yyscan_t yyscanner)
{
@@ -2675,11 +2701,13 @@
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 ael_yy_switch_to_buffer
+ * \param in_str A readable stream.
+ * \param yyscanner The scanner object.
+ *
+ * \see ael_yy_switch_to_buffer
*/
void ael_yyset_in (FILE * in_str , yyscan_t yyscanner)
{
Modified: team/russell/chan_console/res/res_jabber.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/res/res_jabber.c?view=diff&rev=67059&r1=67058&r2=67059
==============================================================================
--- team/russell/chan_console/res/res_jabber.c (original)
+++ team/russell/chan_console/res/res_jabber.c Mon Jun 4 11:21:38 2007
@@ -546,6 +546,10 @@
}
}
} else {
+ if (!client->jid->user) {
[... 7 lines stripped ...]
More information about the asterisk-commits
mailing list