[asterisk-commits] branch oej/managerstuff r11661 - in /team/oej/managerstuff: ./ build_tools/ c...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Fri Mar 3 01:47:40 MST 2006


Author: oej
Date: Fri Mar  3 02:47:30 2006
New Revision: 11661

URL: http://svn.digium.com/view/asterisk?rev=11661&view=rev
Log:
Update to trunk

Modified:
    team/oej/managerstuff/   (props changed)
    team/oej/managerstuff/Makefile
    team/oej/managerstuff/README
    team/oej/managerstuff/asterisk.c
    team/oej/managerstuff/asterisk.sgml
    team/oej/managerstuff/build_tools/make_build_h
    team/oej/managerstuff/build_tools/make_svn_branch_name
    team/oej/managerstuff/cdr.c
    team/oej/managerstuff/cdr/cdr_manager.c
    team/oej/managerstuff/cdr/cdr_odbc.c
    team/oej/managerstuff/cdr/cdr_pgsql.c
    team/oej/managerstuff/cdr/cdr_tds.c
    team/oej/managerstuff/channels/chan_iax2.c
    team/oej/managerstuff/cli.c
    team/oej/managerstuff/include/asterisk/cdr.h
    team/oej/managerstuff/res/res_agi.c
    team/oej/managerstuff/res/res_config_odbc.c
    team/oej/managerstuff/res/res_monitor.c

Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
    automerge = yes

Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Mar  3 02:47:30 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7496,7498-11262
+/branches/1.2:1-7496,7498-11660

Modified: team/oej/managerstuff/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/Makefile?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/Makefile (original)
+++ team/oej/managerstuff/Makefile Fri Mar  3 02:47:30 2006
@@ -545,7 +545,7 @@
 	$(MAKE) -C stdtime clean
 
 datafiles: all
-	if [ x`whoami` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+	if [ x`id -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
 	for x in sounds/digits/*.gsm; do \

Modified: team/oej/managerstuff/README
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/README?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/README (original)
+++ team/oej/managerstuff/README Fri Mar  3 02:47:30 2006
@@ -67,7 +67,7 @@
   In order to discover new features to use, please check the configuration
 examples in the /configs directory of the source code distribution. 
 To discover the major new features of Asterisk 1.2, please visit 
-http://www.astricon.net/asterisk1-2/
+http://edvina.net/asterisk1-2/
 
 * NEW INSTALLATIONS
 

Modified: team/oej/managerstuff/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/asterisk.c?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/asterisk.c (original)
+++ team/oej/managerstuff/asterisk.c Fri Mar  3 02:47:30 2006
@@ -82,6 +82,9 @@
 
 #if  defined(__FreeBSD__) || defined( __NetBSD__ ) || defined(SOLARIS)
 #include <netdb.h>
+#if defined(SOLARIS)
+extern int daemon(int, int);  /* defined in libresolv of all places */
+#endif
 #endif
 
 #include "asterisk.h"
@@ -1896,7 +1899,8 @@
 			snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value);
 		} else if (!strcasecmp(v->name, "astvarlibdir")) {
 			ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR));
-			snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/%s", v->value, "astdb");    
+			snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value);
+			snprintf(ast_config_AST_KEY_DIR, sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value);
 		} else if (!strcasecmp(v->name, "astlogdir")) {
 			ast_copy_string(ast_config_AST_LOG_DIR, v->value, sizeof(ast_config_AST_LOG_DIR));
 		} else if (!strcasecmp(v->name, "astagidir")) {
@@ -2156,7 +2160,7 @@
 			exit(1);
 		}
 		if (setgid(gr->gr_gid)) {
-			ast_log(LOG_WARNING, "Unable to setgid to %d (%s)\n", gr->gr_gid, rungroup);
+			ast_log(LOG_WARNING, "Unable to setgid to %d (%s)\n", (int)gr->gr_gid, rungroup);
 			exit(1);
 		}
 		if (setgroups(0, NULL)) {
@@ -2176,7 +2180,7 @@
 		}
 		if (!rungroup) {
 			if (setgid(pw->pw_gid)) {
-				ast_log(LOG_WARNING, "Unable to setgid to %d!\n", pw->pw_gid);
+				ast_log(LOG_WARNING, "Unable to setgid to %d!\n", (int)pw->pw_gid);
 				exit(1);
 			}
 			if (initgroups(pw->pw_name, pw->pw_gid)) {
@@ -2185,7 +2189,7 @@
 			}
 		}
 		if (setuid(pw->pw_uid)) {
-			ast_log(LOG_WARNING, "Unable to setuid to %d (%s)\n", pw->pw_uid, runuser);
+			ast_log(LOG_WARNING, "Unable to setuid to %d (%s)\n", (int)pw->pw_uid, runuser);
 			exit(1);
 		}
 		setenv("ASTERISK_ALREADY_NONROOT","yes",1);
@@ -2252,7 +2256,7 @@
 	unlink(ast_config_AST_PID);
 	f = fopen(ast_config_AST_PID, "w");
 	if (f) {
-		fprintf(f, "%d\n", getpid());
+		fprintf(f, "%d\n", (int)getpid());
 		fclose(f);
 	} else
 		ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno));
@@ -2263,7 +2267,7 @@
 		unlink(ast_config_AST_PID);
 		f = fopen(ast_config_AST_PID, "w");
 		if (f) {
-			fprintf(f, "%d\n", getpid());
+			fprintf(f, "%d\n", (int)getpid());
 			fclose(f);
 		} else
 			ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno));

Modified: team/oej/managerstuff/asterisk.sgml
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/asterisk.sgml?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/asterisk.sgml (original)
+++ team/oej/managerstuff/asterisk.sgml Fri Mar  3 02:47:30 2006
@@ -27,6 +27,7 @@
 <arg><option>-G </option><replaceable class="parameter">group</replaceable></arg>
 <arg><option>-x </option><replaceable class="parameter">command</replaceable></arg>
 <arg><option>-M </option><replaceable class="parameter">value</replaceable></arg>
+<arg><option>-L </option><replaceable class="parameter">loadaverage</replaceable></arg>
 	</cmdsynopsis>
 	<cmdsynopsis>
 

Modified: team/oej/managerstuff/build_tools/make_build_h
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/build_tools/make_build_h?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/build_tools/make_build_h (original)
+++ team/oej/managerstuff/build_tools/make_build_h Fri Mar  3 02:47:30 2006
@@ -3,7 +3,7 @@
 KERNEL=`uname -r`
 MACHINE=`uname -m`
 OS=`uname -s`
-USER=`whoami`
+USER=`id -un`
 DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
 cat << END
 /*

Modified: team/oej/managerstuff/build_tools/make_svn_branch_name
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/build_tools/make_svn_branch_name?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/build_tools/make_svn_branch_name (original)
+++ team/oej/managerstuff/build_tools/make_svn_branch_name Fri Mar  3 02:47:30 2006
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asterisk/:: | sed -e 's:/: :g'`
+PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
 BRANCH=0
 TEAM=0
 

Modified: team/oej/managerstuff/cdr.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/cdr.c?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/cdr.c (original)
+++ team/oej/managerstuff/cdr.c Fri Mar  3 02:47:30 2006
@@ -253,9 +253,9 @@
 			strftime(workspace, workspacelen, fmt, &tm);
 		}
 	} else if (!strcasecmp(name, "duration"))
-		snprintf(workspace, workspacelen, "%d", cdr->duration);
+		snprintf(workspace, workspacelen, "%ld", cdr->duration);
 	else if (!strcasecmp(name, "billsec"))
-		snprintf(workspace, workspacelen, "%d", cdr->billsec);
+		snprintf(workspace, workspacelen, "%ld", cdr->billsec);
 	else if (!strcasecmp(name, "disposition"))
 		ast_copy_string(workspace, ast_cdr_disp2str(cdr->disposition), workspacelen);
 	else if (!strcasecmp(name, "amaflags"))

Modified: team/oej/managerstuff/cdr/cdr_manager.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/cdr/cdr_manager.c?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/cdr/cdr_manager.c (original)
+++ team/oej/managerstuff/cdr/cdr_manager.c Fri Mar  3 02:47:30 2006
@@ -121,8 +121,8 @@
 	    "StartTime: %s\r\n"
 	    "AnswerTime: %s\r\n"
 	    "EndTime: %s\r\n"
-	    "Duration: %d\r\n"
-	    "BillableSeconds: %d\r\n"
+	    "Duration: %ld\r\n"
+	    "BillableSeconds: %ld\r\n"
 	    "Disposition: %s\r\n"
 	    "AMAFlags: %s\r\n"
 	    "UniqueID: %s\r\n"

Modified: team/oej/managerstuff/cdr/cdr_odbc.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/cdr/cdr_odbc.c?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/cdr/cdr_odbc.c (original)
+++ team/oej/managerstuff/cdr/cdr_odbc.c Fri Mar  3 02:47:30 2006
@@ -122,7 +122,7 @@
 	if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
 		if (option_verbose > 10)
 			ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: Failure in AllocStatement %d\n", ODBC_res);
-		SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, ODBC_stat, &ODBC_err, ODBC_msg, 100, &ODBC_mlen);
+		SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, (unsigned char *)ODBC_stat, &ODBC_err, (unsigned char *)ODBC_msg, 100, &ODBC_mlen);
 		SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt);	
 		connected = 0;
 		ast_mutex_unlock(&odbc_lock);
@@ -133,12 +133,12 @@
 	   strange reason if I don't it blows holes in memory like
 	   like a shotgun.  So we just do this so its safe. */
 
-	ODBC_res = SQLPrepare(ODBC_stmt, sqlcmd, SQL_NTS);
+	ODBC_res = SQLPrepare(ODBC_stmt, (unsigned char *)sqlcmd, SQL_NTS);
 	
 	if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
 		if (option_verbose > 10)
 			ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: Error in PREPARE %d\n", ODBC_res);
-		SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, ODBC_stat, &ODBC_err, ODBC_msg, 100, &ODBC_mlen);
+		SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, (unsigned char *)ODBC_stat, &ODBC_err, (unsigned char *)ODBC_msg, 100, &ODBC_mlen);
 		SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt);
 		connected = 0;
 		ast_mutex_unlock(&odbc_lock);
@@ -381,7 +381,7 @@
 	if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
 		if (option_verbose > 10)
 			ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: Error in Query %d\n", ODBC_res);
-		SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, ODBC_stat, &ODBC_err, ODBC_msg, 100, &ODBC_mlen);
+		SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, (unsigned char *)ODBC_stat, &ODBC_err, (unsigned char *)ODBC_msg, 100, &ODBC_mlen);
 		SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt);
 		connected = 0;
 		return -1;
@@ -438,7 +438,7 @@
 	if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
 		if (option_verbose > 10)
 			ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: Error SQLConnect %d\n", ODBC_res);
-		SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, ODBC_stat, &ODBC_err, ODBC_msg, 100, &ODBC_mlen);
+		SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, (unsigned char *)ODBC_stat, &ODBC_err, (unsigned char *)ODBC_msg, 100, &ODBC_mlen);
 		SQLFreeHandle(SQL_HANDLE_ENV, ODBC_env);
 		connected = 0;
 		return -1;

Modified: team/oej/managerstuff/cdr/cdr_pgsql.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/cdr/cdr_pgsql.c?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/cdr/cdr_pgsql.c (original)
+++ team/oej/managerstuff/cdr/cdr_pgsql.c Fri Mar  3 02:47:30 2006
@@ -122,7 +122,7 @@
 
 		snprintf(sqlcmd,sizeof(sqlcmd),"INSERT INTO %s (calldate,clid,src,dst,dcontext,channel,dstchannel,"
 				 "lastapp,lastdata,duration,billsec,disposition,amaflags,accountcode,uniqueid,userfield) VALUES"
-				 " ('%s','%s','%s','%s','%s', '%s','%s','%s','%s',%d,%d,'%s',%d,'%s','%s','%s')",
+				 " ('%s','%s','%s','%s','%s', '%s','%s','%s','%s',%ld,%ld,'%s',%ld,'%s','%s','%s')",
 				 table,timestr,clid,cdr->src, cdr->dst, dcontext,channel, dstchannel, lastapp, lastdata,
 				 cdr->duration,cdr->billsec,ast_cdr_disp2str(cdr->disposition),cdr->amaflags, cdr->accountcode, uniqueid, userfield);
 		

Modified: team/oej/managerstuff/cdr/cdr_tds.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/cdr/cdr_tds.c?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/cdr/cdr_tds.c (original)
+++ team/oej/managerstuff/cdr/cdr_tds.c Fri Mar  3 02:47:30 2006
@@ -169,8 +169,8 @@
 			"%s, "		/* start */
 			"%s, "		/* answer */
 			"%s, "		/* end */
-			"%d, "		/* duration */
-			"%d, "		/* billsec */
+			"%ld, "		/* duration */
+			"%ld, "		/* billsec */
 			"'%s', "	/* disposition */
 			"'%s', "	/* amaflags */
 			"'%s'"		/* uniqueid */

Modified: team/oej/managerstuff/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/channels/chan_iax2.c?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/channels/chan_iax2.c (original)
+++ team/oej/managerstuff/channels/chan_iax2.c Fri Mar  3 02:47:30 2006
@@ -1960,7 +1960,7 @@
 		ast_cli(fd, "  Status       : ");
 		peer_status(peer, status, sizeof(status));	
 		ast_cli(fd, "%s\n",status);
-		ast_cli(fd, "  Qualify      : every %d when OK, every %d when UNREACHABLE (sample smoothing %s)\n", peer->pokefreqok, peer->pokefreqnotok, (peer->smoothing == 1) ? "On" : "Off");
+		ast_cli(fd, " Qualify        : every %dms when OK, every %dms when UNREACHABLE (sample smoothing %s)\n", peer->pokefreqok, peer->pokefreqnotok, peer->smoothing ? "On" : "Off");
 		ast_cli(fd,"\n");
 		if (ast_test_flag(peer, IAX_TEMPONLY))
 			destroy_peer(peer);

Modified: team/oej/managerstuff/cli.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/cli.c?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/cli.c (original)
+++ team/oej/managerstuff/cli.c Fri Mar  3 02:47:30 2006
@@ -1452,6 +1452,22 @@
 			ast_mutex_lock(&clilock);
 			e->inuse--;
 			ast_mutex_unlock(&clilock);
+			if (e) {
+				switch(e->handler(fd, x, argv)) {
+				case RESULT_SHOWUSAGE:
+					if (e->usage)
+						ast_cli(fd, "%s", e->usage);
+					else
+						ast_cli(fd, "%s", "Invalid usage, but no usage information available.\n");
+					break;
+				}
+			} else 
+				ast_cli(fd, "No such command '%s' (type 'help' for help)\n", find_best(argv));
+			if (e) {
+				ast_mutex_lock(&clilock);
+				e->inuse--;
+				ast_mutex_unlock(&clilock);
+			}
 		}
 	}
 	free(dup);

Modified: team/oej/managerstuff/include/asterisk/cdr.h
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/include/asterisk/cdr.h?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/include/asterisk/cdr.h (original)
+++ team/oej/managerstuff/include/asterisk/cdr.h Fri Mar  3 02:47:30 2006
@@ -74,13 +74,13 @@
 	
 	struct timeval end;
 	/*! Total time in system, in seconds */
-	int duration;				
+	long int duration;				
 	/*! Total time call is up, in seconds */
-	int billsec;				
+	long int billsec;				
 	/*! What happened to the call */
-	int disposition;			
+	long int disposition;			
 	/*! What flags to use */
-	int amaflags;				
+	long int amaflags;				
 	/*! What account number to use */
 	char accountcode[AST_MAX_ACCOUNT_CODE];			
 	/*! flags */

Modified: team/oej/managerstuff/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/res/res_agi.c?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/res/res_agi.c (original)
+++ team/oej/managerstuff/res/res_agi.c Fri Mar  3 02:47:30 2006
@@ -91,7 +91,7 @@
 "and stdout.\n"
 "Returns -1 on hangup (except for DeadAGI) or if application requested\n"
 " hangup, or 0 on non-hangup exit. \n"
-"Using 'EAGI' provides enhanced AGI, with incoming audio available out of band"
+"Using 'EAGI' provides enhanced AGI, with incoming audio available out of band\n"
 "on file descriptor 3\n\n"
 "Use the CLI command 'show agi' to list available agi commands\n";
 

Modified: team/oej/managerstuff/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/res/res_config_odbc.c?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/res/res_config_odbc.c (original)
+++ team/oej/managerstuff/res/res_config_odbc.c Fri Mar  3 02:47:30 2006
@@ -106,7 +106,7 @@
 		newval = va_arg(aq, const char *);
 	}
 	va_end(aq);
-	res = SQLPrepare(stmt, sql, SQL_NTS);
+	res = SQLPrepare(stmt, (unsigned char *)sql, SQL_NTS);
 	if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
 		ast_log(LOG_WARNING, "SQL Prepare failed![%s]\n", sql);
 		SQLFreeHandle (SQL_HANDLE_STMT, stmt);
@@ -149,7 +149,7 @@
 	for (x=0;x<colcount;x++) {
 		rowdata[0] = '\0';
 		collen = sizeof(coltitle);
-		res = SQLDescribeCol(stmt, x + 1, coltitle, sizeof(coltitle), &collen, 
+		res = SQLDescribeCol(stmt, x + 1, (unsigned char *)coltitle, sizeof(coltitle), &collen, 
 					&datatype, &colsize, &decimaldigits, &nullable);
 		if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
 			ast_log(LOG_WARNING, "SQL Describe Column error!\n[%s]\n\n", sql);
@@ -252,7 +252,7 @@
 	if (initfield)
 		snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " ORDER BY %s", initfield);
 	va_end(aq);
-	res = SQLPrepare(stmt, sql, SQL_NTS);
+	res = SQLPrepare(stmt, (unsigned char *)sql, SQL_NTS);
 	if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
 		ast_log(LOG_WARNING, "SQL Prepare failed![%s]\n", sql);
 		SQLFreeHandle (SQL_HANDLE_STMT, stmt);
@@ -303,7 +303,7 @@
 		for (x=0;x<colcount;x++) {
 			rowdata[0] = '\0';
 			collen = sizeof(coltitle);
-			res = SQLDescribeCol(stmt, x + 1, coltitle, sizeof(coltitle), &collen, 
+			res = SQLDescribeCol(stmt, x + 1, (unsigned char *)coltitle, sizeof(coltitle), &collen, 
 						&datatype, &colsize, &decimaldigits, &nullable);
 			if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
 				ast_log(LOG_WARNING, "SQL Describe Column error!\n[%s]\n\n", sql);
@@ -379,7 +379,7 @@
 	va_end(aq);
 	snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " WHERE %s=?", keyfield);
 	
-	res = SQLPrepare(stmt, sql, SQL_NTS);
+	res = SQLPrepare(stmt, (unsigned char *)sql, SQL_NTS);
 	if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
 		ast_log(LOG_WARNING, "SQL Prepare failed![%s]\n", sql);
 		SQLFreeHandle (SQL_HANDLE_STMT, stmt);

Modified: team/oej/managerstuff/res/res_monitor.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/res/res_monitor.c?rev=11661&r1=11660&r2=11661&view=diff
==============================================================================
--- team/oej/managerstuff/res/res_monitor.c (original)
+++ team/oej/managerstuff/res/res_monitor.c Fri Mar  3 02:47:30 2006
@@ -536,7 +536,7 @@
 		return 0;
 	}
 	ast_mutex_unlock(&c->lock);
-	astman_send_ack(s, m, "Stopped monitoring channel");
+	astman_send_ack(s, m, "Changed monitor filename");
 	return 0;
 }
 



More information about the asterisk-commits mailing list