[svn-commits] branch oej/test-this-branch r33170 - in /team/oej/test-this-branch: ./ cdr/ c...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Fri Jun 9 01:58:07 MST 2006


Author: oej
Date: Fri Jun  9 03:58:06 2006
New Revision: 33170

URL: http://svn.digium.com/view/asterisk?rev=33170&view=rev
Log:
- Various updates
- Disabling sqlite3, no updated module interface

Modified:
    team/oej/test-this-branch/   (props changed)
    team/oej/test-this-branch/asterisk.c
    team/oej/test-this-branch/cdr/Makefile
    team/oej/test-this-branch/channels/chan_sip.c
    team/oej/test-this-branch/include/asterisk/doxyref.h

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun  9 03:58:06 2006
@@ -1,1 +1,1 @@
-/trunk:1-33057
+/trunk:1-33088

Modified: team/oej/test-this-branch/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/asterisk.c?rev=33170&r1=33169&r2=33170&view=diff
==============================================================================
--- team/oej/test-this-branch/asterisk.c (original)
+++ team/oej/test-this-branch/asterisk.c Fri Jun  9 03:58:06 2006
@@ -360,9 +360,8 @@
 
 static struct profile_data *prof_data;
 
-/*
- * allocates a counter with a given name and scale.
- * Returns the identifier of the counter.
+/*! \brief allocates a counter with a given name and scale.
+ * \return Returns the identifier of the counter.
  */
 int ast_add_profile(const char *name, uint64_t scale)
 {
@@ -491,7 +490,7 @@
 "       Shows the revision numbers of the files used to build this copy of Asterisk.\n"
 "       Optional regular expression pattern is used to filter the file list.\n";
 
-/*! CLI command to list module versions */
+/*! \brief CLI command to list module versions */
 static int handle_show_version_files(int fd, int argc, char *argv[])
 {
 #define FORMAT "%-25.25s %-40.40s\n"
@@ -603,14 +602,14 @@
 	return write(fd, s, strlen(s) + 1);
 }
 
-/*! NULL handler so we can collect the child exit status */
+/*! \brief NULL handler so we can collect the child exit status */
 static void null_sig_handler(int signal)
 {
 
 }
 
 AST_MUTEX_DEFINE_STATIC(safe_system_lock);
-/*! Keep track of how many threads are currently trying to wait*() on
+/*! \brief Keep track of how many threads are currently trying to wait*() on
  *  a child process */
 static unsigned int safe_system_level = 0;
 static void *safe_system_prev_handler;
@@ -683,7 +682,7 @@
 }
 
 /*!
- * mute or unmute a console from logging
+ * \brief mute or unmute a console from logging
  */
 void ast_console_toggle_mute(int fd) {
 	int x;
@@ -703,27 +702,7 @@
 }
 
 /*!
- * mute or unmute a console from logging
- */
-void ast_console_mute(int fd) {
-	int x;
-	for (x=0;x<AST_MAX_CONNECTS; x++) {
-		if (fd == consoles[x].fd) {
-			if (consoles[x].mute) {
-				consoles[x].mute=0;
-				ast_cli(fd, "Console is not muted anymore.\n");
-			} else {
-				consoles[x].mute=1;
-				ast_cli(fd, "Console is muted.\n");
-			}
-			return;
-		}
-	}
-	ast_cli(fd, "Couldn't find remote console.\n");
-}
-
-/*!
- * log the string to all attached console clients
+ * \brief log the string to all attached console clients
  */
 static void ast_network_puts_mutable(const char *string)
 {
@@ -737,7 +716,7 @@
 }
 
 /*!
- * log the string to the console, and all attached
+ * \brief log the string to the console, and all attached
  * console clients
  */
 void ast_console_puts_mutable(const char *string)
@@ -748,7 +727,7 @@
 }
 
 /*!
- * write the string to all attached console clients
+ * \brief write the string to all attached console clients
  */
 static void ast_network_puts(const char *string)
 {
@@ -1001,7 +980,8 @@
 		return 1;
 }
 
-/*! Urgent handler
+/*! \brief Urgent handler
+
  Called by soft_hangup to interrupt the poll, read, or other
  system call.  We don't actually need to do anything though.  
  Remember: Cannot EVER ast_log from within a signal handler 
@@ -1044,7 +1024,7 @@
 	signal(sig, child_handler);
 }
 
-/*! Set an X-term or screen title */
+/*! \brief Set an X-term or screen title */
 static void set_title(char *text)
 {
 	if (getenv("TERM") && strstr(getenv("TERM"), "xterm"))
@@ -1057,7 +1037,7 @@
 		fprintf(stdout, "\033]1;%s\007", text);
 }
 
-/*! We set ourselves to a high priority, that we might pre-empt everything
+/*! \brief We set ourselves to a high priority, that we might pre-empt everything
    else.  If your PBX has heavy activity on it, this is a good thing.  */
 int ast_set_priority(int pri)
 {

Modified: team/oej/test-this-branch/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/cdr/Makefile?rev=33170&r1=33169&r2=33170&view=diff
==============================================================================
--- team/oej/test-this-branch/cdr/Makefile (original)
+++ team/oej/test-this-branch/cdr/Makefile Fri Jun  9 03:58:06 2006
@@ -12,14 +12,6 @@
 #
 
 include ../menuselect.makeopts
-
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sqlite3.h),)
-  MODS:=$(filter-out cdr_sqlite3.so,$(MODS))
-endif
-
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/radiusclient-ng.h $(CROSS_COMPILE_TARGET)/usr/local/include/radiusclient-ng.h),)
-  MODS:=$(filter-out cdr_radius.so,$(MODS))
-endif
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*.c)))
 
@@ -46,6 +38,13 @@
 endif
 
 MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
+
+#This needs to go when this is enabled in menuselect and configure
+#ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sqlite3.h),)
+  #Temporarily disabled, not adapted to new module loader
+  MODS:=$(filter-out cdr_sqlite3.so,$(MODS))
+#endif
+
 
 all: depend $(MODS)
 

Modified: team/oej/test-this-branch/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channels/chan_sip.c?rev=33170&r1=33169&r2=33170&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/chan_sip.c (original)
+++ team/oej/test-this-branch/channels/chan_sip.c Fri Jun  9 03:58:06 2006
@@ -15809,7 +15809,7 @@
 		changed |= ast_rtp_get_peer(vrtp, &p->vredirip);
 	else
 		memset(&p->vredirip, 0, sizeof(p->vredirip));
-	if (p->redircodecs != codecs) {
+	if (codecs && (p->redircodecs != codecs)) {
 		p->redircodecs = codecs;
 		changed = 1;
 	}

Modified: team/oej/test-this-branch/include/asterisk/doxyref.h
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/include/asterisk/doxyref.h?rev=33170&r1=33169&r2=33170&view=diff
==============================================================================
--- team/oej/test-this-branch/include/asterisk/doxyref.h (original)
+++ team/oej/test-this-branch/include/asterisk/doxyref.h Fri Jun  9 03:58:06 2006
@@ -486,6 +486,6 @@
  * http.
  *  \section ami AMI - The manager Interface
  *  \arg \link Config_ami Configuration file \endlink
- *  \verbinclude http.txt
- */
-
+ *  \verbinclude ajam.txt
+ */
+



More information about the svn-commits mailing list