[asterisk-commits] russell: branch russell/chan_refcount r89500 - in /team/russell/chan_refcount...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Nov 21 13:47:57 CST 2007


Author: russell
Date: Wed Nov 21 13:47:56 2007
New Revision: 89500

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89500
Log:
sync up another 500 revisions, and fix up some conflicts

Modified:
    team/russell/chan_refcount/   (props changed)
    team/russell/chan_refcount/CHANGES
    team/russell/chan_refcount/CREDITS
    team/russell/chan_refcount/UPGRADE.txt
    team/russell/chan_refcount/apps/app_dial.c
    team/russell/chan_refcount/apps/app_exec.c
    team/russell/chan_refcount/apps/app_macro.c
    team/russell/chan_refcount/apps/app_meetme.c
    team/russell/chan_refcount/apps/app_minivm.c
    team/russell/chan_refcount/apps/app_mixmonitor.c
    team/russell/chan_refcount/apps/app_playback.c
    team/russell/chan_refcount/apps/app_queue.c
    team/russell/chan_refcount/apps/app_rpt.c
    team/russell/chan_refcount/build_tools/menuselect-deps.in
    team/russell/chan_refcount/cdr/cdr_adaptive_odbc.c
    team/russell/chan_refcount/cdr/cdr_custom.c
    team/russell/chan_refcount/cdr/cdr_manager.c
    team/russell/chan_refcount/cdr/cdr_odbc.c
    team/russell/chan_refcount/cdr/cdr_sqlite3_custom.c
    team/russell/chan_refcount/channels/chan_gtalk.c
    team/russell/chan_refcount/channels/chan_iax2.c
    team/russell/chan_refcount/channels/chan_jingle.c
    team/russell/chan_refcount/channels/chan_sip.c
    team/russell/chan_refcount/channels/chan_zap.c
    team/russell/chan_refcount/configure
    team/russell/chan_refcount/configure.ac
    team/russell/chan_refcount/doc/tex/Makefile
    team/russell/chan_refcount/funcs/func_cut.c
    team/russell/chan_refcount/funcs/func_logic.c
    team/russell/chan_refcount/funcs/func_odbc.c
    team/russell/chan_refcount/funcs/func_strings.c
    team/russell/chan_refcount/include/asterisk/autoconfig.h.in
    team/russell/chan_refcount/include/asterisk/jabber.h
    team/russell/chan_refcount/include/asterisk/lock.h
    team/russell/chan_refcount/include/asterisk/pbx.h
    team/russell/chan_refcount/include/asterisk/stringfields.h
    team/russell/chan_refcount/main/channel.c
    team/russell/chan_refcount/main/cli.c
    team/russell/chan_refcount/main/config.c
    team/russell/chan_refcount/main/db.c
    team/russell/chan_refcount/main/logger.c
    team/russell/chan_refcount/main/pbx.c
    team/russell/chan_refcount/main/say.c
    team/russell/chan_refcount/main/term.c
    team/russell/chan_refcount/main/utils.c
    team/russell/chan_refcount/makeopts.in
    team/russell/chan_refcount/pbx/pbx_config.c
    team/russell/chan_refcount/pbx/pbx_dundi.c
    team/russell/chan_refcount/pbx/pbx_loopback.c
    team/russell/chan_refcount/pbx/pbx_realtime.c
    team/russell/chan_refcount/res/ael/pval.c
    team/russell/chan_refcount/res/res_agi.c
    team/russell/chan_refcount/res/res_features.c
    team/russell/chan_refcount/res/res_jabber.c
    team/russell/chan_refcount/utils/Makefile
    team/russell/chan_refcount/utils/extconf.c

Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Nov 21 13:47:56 2007
@@ -1,1 +1,1 @@
-/trunk:1-88000
+/trunk:1-88500

Modified: team/russell/chan_refcount/CHANGES
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/CHANGES?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/CHANGES (original)
+++ team/russell/chan_refcount/CHANGES Wed Nov 21 13:47:56 2007
@@ -303,3 +303,8 @@
      channel in conjunction with the existing 'n' option for local channels.
   * Added support for reading the TOUCH_MONITOR_PREFIX channel variable.
      It allows you to configure a prefix for auto-monitor recordings.
+  * Added support for running your dialplan by writing one in lua.  See
+     configs/extensions.lua.sample for examples of how to do this.
+ * Added a new channel driver, chan_unistim.  See doc/unistim.txt and
+    configs/unistim.conf.sample for details.  This new channel driver allows
+	you to use Nortel i2002, i2004, and i2050 phones with Asterisk.

Modified: team/russell/chan_refcount/CREDITS
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/CREDITS?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/CREDITS (original)
+++ team/russell/chan_refcount/CREDITS Wed Nov 21 13:47:56 2007
@@ -163,6 +163,10 @@
 Voop AS - Financial support for a lot of work with the SIP driver and the IAX
 	trunk MTU patch
 
+Cedric Hans - Development of chan_unistim
+  cedric.hans(AT)mlkj.net
+
+
 === OTHER CONTRIBUTIONS ===
 John Todd - Monkey sounds and associated teletorture prompt
 Michael Jerris - bug marshaling

Modified: team/russell/chan_refcount/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/UPGRADE.txt?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/UPGRADE.txt (original)
+++ team/russell/chan_refcount/UPGRADE.txt Wed Nov 21 13:47:56 2007
@@ -90,6 +90,10 @@
   cdr_sqlite3_custom.  It will potentially be removed from the tree
   after Asterisk 1.6 is released.
 
+* The cdr_odbc module now uses res_odbc to manage its connections.  The
+  username and password parameters in cdr_odbc.conf, therefore, are no
+  longer used.  The dsn parameter now points to an entry in res_odbc.conf.
+
 Formats:
 
 * format_wav: The GAIN preprocessor definition and source code that used it

Modified: team/russell/chan_refcount/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_dial.c?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/apps/app_dial.c (original)
+++ team/russell/chan_refcount/apps/app_dial.c Wed Nov 21 13:47:56 2007
@@ -1791,19 +1791,19 @@
 
 		if (ast_test_flag64(&opts, OPT_PEER_H) && ast_exists_extension(peer, peer->context, "h", 1, peer->cid.cid_num)) {
 			int autoloopflag;
+			int found;
 			strcpy(peer->exten, "h");
 			peer->priority = 1;
 			autoloopflag = ast_test_flag(peer, AST_FLAG_IN_AUTOLOOP);	/* save value to restore at the end */
 			ast_set_flag(peer, AST_FLAG_IN_AUTOLOOP);
 			
-			while (ast_exists_extension(peer, peer->context, peer->exten, peer->priority, peer->cid.cid_num)) {
-				if ((res = ast_spawn_extension(peer, peer->context, peer->exten, peer->priority, peer->cid.cid_num))) {
-					/* Something bad happened, or a hangup has been requested. */
-					ast_debug(1, "Spawn extension (%s,%s,%d) exited non-zero on '%s'\n", peer->context, peer->exten, peer->priority, peer->name);
-					ast_verb(2, "Spawn extension (%s, %s, %d) exited non-zero on '%s'\n", peer->context, peer->exten, peer->priority, peer->name);
-					break;
-				}
+			while ((res = ast_spawn_extension(peer, peer->context, peer->exten, peer->priority, peer->cid.cid_num, &found,1))) {
 				peer->priority++;
+			}
+			if (found && res) {
+				/* Something bad happened, or a hangup has been requested. */
+				ast_debug(1, "Spawn extension (%s,%s,%d) exited non-zero on '%s'\n", peer->context, peer->exten, peer->priority, peer->name);
+				ast_verb(2, "Spawn extension (%s, %s, %d) exited non-zero on '%s'\n", peer->context, peer->exten, peer->priority, peer->name);
 			}
 			ast_set2_flag(peer, autoloopflag, AST_FLAG_IN_AUTOLOOP);  /* set it back the way it was */
 		}

Modified: team/russell/chan_refcount/apps/app_exec.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_exec.c?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/apps/app_exec.c (original)
+++ team/russell/chan_refcount/apps/app_exec.c Wed Nov 21 13:47:56 2007
@@ -92,7 +92,7 @@
 static int exec_exec(struct ast_channel *chan, void *data)
 {
 	int res = 0;
-	char *s, *appname, *endargs, args[MAXRESULT] = "";
+	char *s, *appname, *endargs, args[MAXRESULT];
 	struct ast_app *app;
 
 	if (ast_strlen_zero(data))
@@ -122,7 +122,7 @@
 static int tryexec_exec(struct ast_channel *chan, void *data)
 {
 	int res = 0;
-	char *s, *appname, *endargs, args[MAXRESULT] = "";
+	char *s, *appname, *endargs, args[MAXRESULT];
 	struct ast_app *app;
 
 	if (ast_strlen_zero(data))

Modified: team/russell/chan_refcount/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_macro.c?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/apps/app_macro.c (original)
+++ team/russell/chan_refcount/apps/app_macro.c Wed Nov 21 13:47:56 2007
@@ -271,6 +271,7 @@
 	while(ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) {
 		struct ast_context *c;
 		struct ast_exten *e;
+		int foundx;
 		runningapp[0] = '\0';
 		runningdata[0] = '\0';
 
@@ -299,7 +300,7 @@
 		/* Reset the macro depth, if it was changed in the last iteration */
 		pbx_builtin_setvar_helper(chan, "MACRO_DEPTH", depthc);
 
-		if ((res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num))) {
+		if ((res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num, &foundx,1))) {
 			/* Something bad happened, or a hangup has been requested. */
 			if (((res >= '0') && (res <= '9')) || ((res >= 'A') && (res <= 'F')) ||
 		    	(res == '*') || (res == '#')) {
@@ -330,7 +331,7 @@
 			gosub_level++;
 			ast_debug(1, "Incrementing gosub_level\n");
 		} else if (!strcasecmp(runningapp, "GOSUBIF")) {
-			char tmp2[1024] = "", *cond, *app, *app2 = tmp2;
+			char tmp2[1024], *cond, *app, *app2 = tmp2;
 			pbx_substitute_variables_helper(chan, runningdata, tmp2, sizeof(tmp2) - 1);
 			cond = strsep(&app2, "?");
 			app = strsep(&app2, ":");
@@ -353,7 +354,7 @@
 			ast_debug(1, "Decrementing gosub_level\n");
 		} else if (!strncasecmp(runningapp, "EXEC", 4)) {
 			/* Must evaluate args to find actual app */
-			char tmp2[1024] = "", *tmp3 = NULL;
+			char tmp2[1024], *tmp3 = NULL;
 			pbx_substitute_variables_helper(chan, runningdata, tmp2, sizeof(tmp2) - 1);
 			if (!strcasecmp(runningapp, "EXECIF")) {
 				tmp3 = strchr(tmp2, '|');

Modified: team/russell/chan_refcount/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_meetme.c?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/apps/app_meetme.c (original)
+++ team/russell/chan_refcount/apps/app_meetme.c Wed Nov 21 13:47:56 2007
@@ -815,7 +815,7 @@
 		ast_log(LOG_WARNING, "Unable to open pseudo device\n");
 		if (cnf->fd >= 0)
 			close(cnf->fd);
-		free(cnf);
+		ast_free(cnf);
 		cnf = NULL;
 		goto cnfout;
 	}
@@ -2039,14 +2039,14 @@
 				break;
 
 			if (c) {
-				if (c->fds[0] != origfd || (user->zapchannel && chan->audiohooks)) {
+				if (c->fds[0] != origfd || (user->zapchannel && c->audiohooks)) {
 					if (using_pseudo) {
 						/* Kill old pseudo */
 						close(fd);
 						using_pseudo = 0;
 					}
 					ast_debug(1, "Ooh, something swapped out under us, starting over\n");
-					retryzap = (strcasecmp(chan->tech->type, "Zap") || chan->audiohooks ? 1 : 0);
+					retryzap = (strcasecmp(c->tech->type, "Zap") || c->audiohooks ? 1 : 0);
 					user->zapchannel = !retryzap;
 					goto zapretry;
 				}
@@ -4872,7 +4872,7 @@
 	while ((station_ref = AST_LIST_REMOVE_HEAD(&trunk->stations, entry)))
 		ast_free(station_ref);
 
-	ast_string_field_free_all(trunk);
+	ast_string_field_free_memory(trunk);
 	ast_free(trunk);
 }
 
@@ -4898,7 +4898,7 @@
 	while ((trunk_ref = AST_LIST_REMOVE_HEAD(&station->trunks, entry)))
 		ast_free(trunk_ref);
 
-	ast_string_field_free_all(station);
+	ast_string_field_free_memory(station);
 	ast_free(station);
 }
 

Modified: team/russell/chan_refcount/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_minivm.c?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/apps/app_minivm.c (original)
+++ team/russell/chan_refcount/apps/app_minivm.c Wed Nov 21 13:47:56 2007
@@ -1029,7 +1029,6 @@
 
 		ast_debug(4, "-_-_- Fromaddress template: %s\n", fromaddress);
 		if ((passdata = alloca(vmlen))) {
-			memset(passdata, 0, vmlen);
 			pbx_substitute_variables_helper(ast, fromaddress, passdata, vmlen);
 			len_passdata = strlen(passdata) * 2 + 3;
 			passdata2 = alloca(len_passdata);
@@ -1054,7 +1053,6 @@
 		char *passdata;
 		int vmlen = strlen(template->subject) * 3 + 200;
 		if ((passdata = alloca(vmlen))) {
-			memset(passdata, 0, vmlen);
 			ast_channel_lock(ast);
 			pbx_substitute_variables_helper(ast, template->subject, passdata, vmlen);
 			ast_channel_unlock(ast);
@@ -1088,7 +1086,6 @@
 		char *passdata;
 		int vmlen = strlen(template->body)*3 + 200;
 		if ((passdata = alloca(vmlen))) {
-			memset(passdata, 0, vmlen);
 			pbx_substitute_variables_helper(ast, template->body, passdata, vmlen);
 			ast_debug(3, "Message now: %s\n-----\n", passdata);
 			fprintf(p, "%s\n", passdata);

Modified: team/russell/chan_refcount/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_mixmonitor.c?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/apps/app_mixmonitor.c (original)
+++ team/russell/chan_refcount/apps/app_mixmonitor.c Wed Nov 21 13:47:56 2007
@@ -220,7 +220,7 @@
 {
 	pthread_t thread;
 	struct mixmonitor *mixmonitor;
-	char postprocess2[1024] = "";
+	char postprocess2[1024];
 	size_t len;
 
 	len = sizeof(*mixmonitor) + strlen(chan->name) + strlen(filename) + 2;
@@ -235,7 +235,6 @@
 				*p2 = '$';
 			}
 		}
-
 		pbx_substitute_variables_helper(chan, p1, postprocess2, sizeof(postprocess2) - 1);
 		if (!ast_strlen_zero(postprocess2))
 			len += strlen(postprocess2) + 1;

Modified: team/russell/chan_refcount/apps/app_playback.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_playback.c?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/apps/app_playback.c (original)
+++ team/russell/chan_refcount/apps/app_playback.c Wed Nov 21 13:47:56 2007
@@ -202,7 +202,6 @@
 		ast_trim_blanks(x);
 
 		/* replace variables */
-		memset(fn, 0, sizeof(fn)); /* XXX why isn't done in pbx_substitute_variables_helper! */
 		pbx_substitute_variables_varshead(&head, x, fn, sizeof(fn));
 		ast_log(LOG_WARNING, "doing [%s]\n", fn);
 

Modified: team/russell/chan_refcount/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_queue.c?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/apps/app_queue.c (original)
+++ team/russell/chan_refcount/apps/app_queue.c Wed Nov 21 13:47:56 2007
@@ -2978,7 +2978,6 @@
 					if (p == tmpid2 + sizeof(tmpid2))
 						tmpid2[sizeof(tmpid2) - 1] = '\0';
 
-					memset(tmpid, 0, sizeof(tmpid));
 					pbx_substitute_variables_helper(qe->chan, tmpid2, tmpid, sizeof(tmpid) - 1);
 				}
 
@@ -3005,7 +3004,6 @@
 					if (p == meid2 + sizeof(meid2))
 						meid2[sizeof(meid2) - 1] = '\0';
 
-					memset(meid, 0, sizeof(meid));
 					pbx_substitute_variables_helper(qe->chan, meid2, meid, sizeof(meid) - 1);
 				}
 	

Modified: team/russell/chan_refcount/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_rpt.c?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/apps/app_rpt.c (original)
+++ team/russell/chan_refcount/apps/app_rpt.c Wed Nov 21 13:47:56 2007
@@ -6936,7 +6936,7 @@
 		struct ast_hostent ahp;
 		struct hostent *hp;
 		struct in_addr ia;
-		char hisip[100] = "", nodeip[100];
+		char hisip[100], nodeip[100];
 		const char *val;
 		char *s, *s1, *s2;
 

Modified: team/russell/chan_refcount/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/build_tools/menuselect-deps.in?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/build_tools/menuselect-deps.in (original)
+++ team/russell/chan_refcount/build_tools/menuselect-deps.in Wed Nov 21 13:47:56 2007
@@ -11,6 +11,7 @@
 IXJUSER=@PBX_IXJUSER@
 KDE=@PBX_KDE@
 LTDL=@PBX_LTDL@
+LUA=@PBX_LUA@
 NBS=@PBX_NBS@
 NETSNMP=@PBX_NETSNMP@
 NEWT=@PBX_NEWT@

Modified: team/russell/chan_refcount/cdr/cdr_adaptive_odbc.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/cdr/cdr_adaptive_odbc.c?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/cdr/cdr_adaptive_odbc.c (original)
+++ team/russell/chan_refcount/cdr/cdr_adaptive_odbc.c Wed Nov 21 13:47:56 2007
@@ -314,8 +314,18 @@
 	SQLHSTMT stmt = NULL;
 	SQLLEN rows = 0;
 
+	if (!sql || !sql2) {
+		if (sql)
+			ast_free(sql);
+		if (sql2)
+			ast_free(sql2);
+		return -1;
+	}
+
 	if (AST_RWLIST_RDLOCK(&odbc_tables)) {
 		ast_log(LOG_ERROR, "Unable to lock table list.  Insert CDR(s) failed.\n");
+		ast_free(sql);
+		ast_free(sql2);
 		return -1;
 	}
 

Modified: team/russell/chan_refcount/cdr/cdr_custom.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/cdr/cdr_custom.c?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/cdr/cdr_custom.c (original)
+++ team/russell/chan_refcount/cdr/cdr_custom.c Wed Nov 21 13:47:56 2007
@@ -119,7 +119,6 @@
 	if (ast_strlen_zero(master))
 		return 0;
 
-	memset(buf, 0 , sizeof(buf));
 	/* Quite possibly the first use of a static struct ast_channel, we need it so the var funcs will work */
 	memset(&dummy, 0, sizeof(dummy));
 	dummy.cdr = cdr;

Modified: team/russell/chan_refcount/cdr/cdr_manager.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/cdr/cdr_manager.c?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/cdr/cdr_manager.c (original)
+++ team/russell/chan_refcount/cdr/cdr_manager.c Wed Nov 21 13:47:56 2007
@@ -143,7 +143,6 @@
 	ast_strftime(strEndTime, sizeof(strEndTime), DATE_FORMAT, &timeresult);
 
 	/* Custom fields handling */
-	memset(buf, 0 , sizeof(buf));
 	if (customfields != NULL && customfields->used > 0) {
 		memset(&dummy, 0, sizeof(dummy));
 		dummy.cdr = cdr;

Modified: team/russell/chan_refcount/cdr/cdr_odbc.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/cdr/cdr_odbc.c?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/cdr/cdr_odbc.c (original)
+++ team/russell/chan_refcount/cdr/cdr_odbc.c Wed Nov 21 13:47:56 2007
@@ -44,17 +44,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
-
-#ifndef __CYGWIN__
-#include <sql.h>
-#include <sqlext.h>
-#include <sqltypes.h>
-#else
-#include <windows.h>
-#include <w32api/sql.h>
-#include <w32api/sqlext.h>
-#include <w32api/sqltypes.h>
-#endif
 
 #include "asterisk/config.h"
 #include "asterisk/options.h"
@@ -62,47 +51,34 @@
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
 #include "asterisk/logger.h"
+#include "asterisk/res_odbc.h"
 
 #define DATE_FORMAT "%Y-%m-%d %T"
 
 static char *name = "ODBC";
-static char *config = "cdr_odbc.conf";
-static char *dsn = NULL, *username = NULL, *password = NULL, *table = NULL;
-static int loguniqueid = 0;
-static int usegmtime = 0;
-static int dispositionstring = 0;
-static int connected = 0;
-
-AST_MUTEX_DEFINE_STATIC(odbc_lock);
-
-static int odbc_do_query(void);
-static int odbc_init(void);
-
-static SQLHENV	ODBC_env = SQL_NULL_HANDLE;	/* global ODBC Environment */
-static SQLHDBC	ODBC_con;			/* global ODBC Connection Handle */
-static SQLHSTMT	ODBC_stmt;			/* global ODBC Statement Handle */
-
-static void odbc_disconnect(void)
-{
-	SQLDisconnect(ODBC_con);
-	SQLFreeHandle(SQL_HANDLE_DBC, ODBC_con);
-	SQLFreeHandle(SQL_HANDLE_ENV, ODBC_env);
-	connected = 0;
-}
-
-static int odbc_log(struct ast_cdr *cdr)
-{
-	int ODBC_res;
+static char *config_file = "cdr_odbc.conf";
+static char *dsn = NULL, *table = NULL;
+
+enum {
+	CONFIG_LOGUNIQUEID =       1 << 0,
+	CONFIG_USEGMTIME =         1 << 1,
+	CONFIG_DISPOSITIONSTRING = 1 << 2,
+};
+
+static struct ast_flags config = { 0 };
+
+static SQLHSTMT prepare_cb(struct odbc_obj *obj, void *data)
+{
+	struct ast_cdr *cdr = data;
+	SQLRETURN ODBC_res;
 	char sqlcmd[2048] = "", timestr[128];
-	int res = 0;
 	struct ast_tm tm;
-
-	ast_localtime(&cdr->start, &tm, usegmtime ? "GMT" : NULL);
-
-	ast_mutex_lock(&odbc_lock);
+	SQLHSTMT stmt;
+
+	ast_localtime(&cdr->start, &tm, ast_test_flag(&config, CONFIG_USEGMTIME) ? "GMT" : NULL);
+
 	ast_strftime(timestr, sizeof(timestr), DATE_FORMAT, &tm);
-	memset(sqlcmd,0,2048);
-	if (loguniqueid) {
+	if (ast_test_flag(&config, CONFIG_LOGUNIQUEID)) {
 		snprintf(sqlcmd,sizeof(sqlcmd),"INSERT INTO %s "
 		"(calldate,clid,src,dst,dcontext,channel,dstchannel,lastapp,"
 		"lastdata,duration,billsec,disposition,amaflags,accountcode,uniqueid,userfield) "
@@ -114,115 +90,71 @@
 		"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)", table);
 	}
 
-	if (!connected) {
-		res = odbc_init();
-		if (res < 0) {
-			odbc_disconnect();
-			ast_mutex_unlock(&odbc_lock);
-			return 0;
-		}				
-	}
-
-	ODBC_res = SQLAllocHandle(SQL_HANDLE_STMT, ODBC_con, &ODBC_stmt);
+	ODBC_res = SQLAllocHandle(SQL_HANDLE_STMT, obj->con, &stmt);
 
 	if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
 		ast_verb(11, "cdr_odbc: Failure in AllocStatement %d\n", ODBC_res);
-		SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt);
-		odbc_disconnect();
-		ast_mutex_unlock(&odbc_lock);
-		return 0;
-	}
-
-	/* We really should only have to do this once.  But for some
-	   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, (unsigned char *)sqlcmd, SQL_NTS);
+		SQLFreeHandle(SQL_HANDLE_STMT, stmt);
+		return NULL;
+	}
+
+	ODBC_res = SQLPrepare(stmt, (unsigned char *)sqlcmd, SQL_NTS);
 	
 	if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
 		ast_verb(11, "cdr_odbc: Error in PREPARE %d\n", ODBC_res);
-		SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt);
-		odbc_disconnect();
-		ast_mutex_unlock(&odbc_lock);
-		return 0;
-	}
-
-	SQLBindParameter(ODBC_stmt, 1, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(timestr), 0, &timestr, 0, NULL);
-	SQLBindParameter(ODBC_stmt, 2, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->clid), 0, cdr->clid, 0, NULL);
-	SQLBindParameter(ODBC_stmt, 3, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->src), 0, cdr->src, 0, NULL);
-	SQLBindParameter(ODBC_stmt, 4, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->dst), 0, cdr->dst, 0, NULL);
-	SQLBindParameter(ODBC_stmt, 5, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->dcontext), 0, cdr->dcontext, 0, NULL);
-	SQLBindParameter(ODBC_stmt, 6, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->channel), 0, cdr->channel, 0, NULL);
-	SQLBindParameter(ODBC_stmt, 7, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->dstchannel), 0, cdr->dstchannel, 0, NULL);
-	SQLBindParameter(ODBC_stmt, 8, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->lastapp), 0, cdr->lastapp, 0, NULL);
-	SQLBindParameter(ODBC_stmt, 9, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->lastdata), 0, cdr->lastdata, 0, NULL);
-	SQLBindParameter(ODBC_stmt, 10, SQL_PARAM_INPUT, SQL_C_SLONG, SQL_INTEGER, 0, 0, &cdr->duration, 0, NULL);
-	SQLBindParameter(ODBC_stmt, 11, SQL_PARAM_INPUT, SQL_C_SLONG, SQL_INTEGER, 0, 0, &cdr->billsec, 0, NULL);
-	if (dispositionstring)
-		SQLBindParameter(ODBC_stmt, 12, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(ast_cdr_disp2str(cdr->disposition)) + 1, 0, ast_cdr_disp2str(cdr->disposition), 0, NULL);
+		SQLFreeHandle(SQL_HANDLE_STMT, stmt);
+		return NULL;
+	}
+
+	SQLBindParameter(stmt, 1, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(timestr), 0, &timestr, 0, NULL);
+	SQLBindParameter(stmt, 2, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->clid), 0, cdr->clid, 0, NULL);
+	SQLBindParameter(stmt, 3, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->src), 0, cdr->src, 0, NULL);
+	SQLBindParameter(stmt, 4, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->dst), 0, cdr->dst, 0, NULL);
+	SQLBindParameter(stmt, 5, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->dcontext), 0, cdr->dcontext, 0, NULL);
+	SQLBindParameter(stmt, 6, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->channel), 0, cdr->channel, 0, NULL);
+	SQLBindParameter(stmt, 7, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->dstchannel), 0, cdr->dstchannel, 0, NULL);
+	SQLBindParameter(stmt, 8, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->lastapp), 0, cdr->lastapp, 0, NULL);
+	SQLBindParameter(stmt, 9, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->lastdata), 0, cdr->lastdata, 0, NULL);
+	SQLBindParameter(stmt, 10, SQL_PARAM_INPUT, SQL_C_SLONG, SQL_INTEGER, 0, 0, &cdr->duration, 0, NULL);
+	SQLBindParameter(stmt, 11, SQL_PARAM_INPUT, SQL_C_SLONG, SQL_INTEGER, 0, 0, &cdr->billsec, 0, NULL);
+	if (ast_test_flag(&config, CONFIG_DISPOSITIONSTRING))
+		SQLBindParameter(stmt, 12, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(ast_cdr_disp2str(cdr->disposition)) + 1, 0, ast_cdr_disp2str(cdr->disposition), 0, NULL);
 	else
-		SQLBindParameter(ODBC_stmt, 12, SQL_PARAM_INPUT, SQL_C_SLONG, SQL_INTEGER, 0, 0, &cdr->disposition, 0, NULL);
-	SQLBindParameter(ODBC_stmt, 13, SQL_PARAM_INPUT, SQL_C_SLONG, SQL_INTEGER, 0, 0, &cdr->amaflags, 0, NULL);
-	SQLBindParameter(ODBC_stmt, 14, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->accountcode), 0, cdr->accountcode, 0, NULL);
-
-	if (loguniqueid) {
-		SQLBindParameter(ODBC_stmt, 15, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->uniqueid), 0, cdr->uniqueid, 0, NULL);
-		SQLBindParameter(ODBC_stmt, 16, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->userfield), 0, cdr->userfield, 0, NULL);
-	}
-
-	if (connected) {
-		res = odbc_do_query();
-		if (res < 0) {
-			ast_verb(11, "cdr_odbc: Query FAILED Call not logged!\n");
-			ast_verb(11, "cdr_odbc: Reconnecting to dsn %s\n", dsn);
-			SQLDisconnect(ODBC_con);
-			res = odbc_init();
-			if (res < 0) {
-				ast_verb(11, "cdr_odbc: %s has gone away!\n", dsn);
-				odbc_disconnect();
-			} else {
-				ast_verb(11, "cdr_odbc: Trying Query again!\n");
-				res = odbc_do_query();
-				if (res < 0) {
-					ast_verb(11, "cdr_odbc: Query FAILED Call not logged!\n");
-				}
-			}
-		}
-	} else {
-		ast_verb(11, "cdr_odbc: Query FAILED Call not logged!\n");
-	}
-	SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt);
-	ast_mutex_unlock(&odbc_lock);
-	return 0;
-}
-
-static int odbc_unload_module(void)
-{
-	ast_mutex_lock(&odbc_lock);
-	if (connected) {
-		ast_verb(11, "cdr_odbc: Disconnecting from %s\n", dsn);
-		SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt);
-		odbc_disconnect();
-	}
-	if (dsn) {
-		ast_verb(11, "cdr_odbc: free dsn\n");
-		ast_free(dsn);
-	}
-	if (username) {
-		ast_verb(11, "cdr_odbc: free username\n");
-		ast_free(username);
-	}
-	if (password) {
-		ast_verb(11, "cdr_odbc: free password\n");
-		ast_free(password);
-	}
-	if (table) {
-		ast_verb(11, "cdr_odbc: free table\n");
-		ast_free(table);
-	}
-
-	ast_cdr_unregister(name);
-	ast_mutex_unlock(&odbc_lock);
+		SQLBindParameter(stmt, 12, SQL_PARAM_INPUT, SQL_C_SLONG, SQL_INTEGER, 0, 0, &cdr->disposition, 0, NULL);
+	SQLBindParameter(stmt, 13, SQL_PARAM_INPUT, SQL_C_SLONG, SQL_INTEGER, 0, 0, &cdr->amaflags, 0, NULL);
+	SQLBindParameter(stmt, 14, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->accountcode), 0, cdr->accountcode, 0, NULL);
+
+	if (ast_test_flag(&config, CONFIG_LOGUNIQUEID)) {
+		SQLBindParameter(stmt, 15, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->uniqueid), 0, cdr->uniqueid, 0, NULL);
+		SQLBindParameter(stmt, 16, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(cdr->userfield), 0, cdr->userfield, 0, NULL);
+	}
+
+	return stmt;
+}
+
+
+static int odbc_log(struct ast_cdr *cdr)
+{
+	struct odbc_obj *obj = ast_odbc_request_obj(dsn, 0);
+	SQLHSTMT stmt;
+
+	if (!obj) {
+		ast_log(LOG_ERROR, "Unable to retrieve database handle.  CDR failed.\n");
+		return -1;
+	}
+
+	stmt = ast_odbc_prepare_and_execute(obj, prepare_cb, cdr);
+	if (stmt) {
+		SQLLEN rows = 0;
+
+		SQLRowCount(stmt, &rows);
+		SQLFreeHandle(SQL_HANDLE_STMT, stmt);
+
+		if (rows == 0)
+			ast_log(LOG_WARNING, "CDR successfully ran, but inserted 0 rows?\n");
+	} else
+		ast_log(LOG_ERROR, "CDR prepare or execute failed\n");
+	ast_odbc_release_obj(obj);
 	return 0;
 }
 
@@ -234,12 +166,10 @@
 	const char *tmp;
 	struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
 
-	ast_mutex_lock(&odbc_lock);
-
 	do {
-		cfg = ast_config_load(config, config_flags);
+		cfg = ast_config_load(config_file, config_flags);
 		if (!cfg) {
-			ast_log(LOG_WARNING, "cdr_odbc: Unable to load config for ODBC CDR's: %s\n", config);
+			ast_log(LOG_WARNING, "cdr_odbc: Unable to load config for ODBC CDR's: %s\n", config_file);
 			res = AST_MODULE_LOAD_DECLINE;
 			break;
 		} else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
@@ -263,53 +193,25 @@
 			break;
 		}
 
-		if ((tmp = ast_variable_retrieve(cfg, "global", "dispositionstring")))
-			dispositionstring = ast_true(tmp);
+		if (((tmp = ast_variable_retrieve(cfg, "global", "dispositionstring"))) && ast_true(tmp))
+			ast_set_flag(&config, CONFIG_DISPOSITIONSTRING);
 		else
-			dispositionstring = 0;
-
-		if ((tmp = ast_variable_retrieve(cfg, "global", "username"))) {
-			if (username)
-				ast_free(username);
-			username = ast_strdup(tmp);
-			if (username == NULL) {
-				res = -1;
-				break;
-			}
-		}
-
-		if ((tmp = ast_variable_retrieve(cfg, "global", "password"))) {
-			if (password)
-				ast_free(password);
-			password = ast_strdup(tmp);
-			if (password == NULL) {
-				res = -1;
-				break;
-			}
-		}
-
-		if ((tmp = ast_variable_retrieve(cfg, "global", "loguniqueid"))) {
-			loguniqueid = ast_true(tmp);
-			if (loguniqueid) {
-				ast_debug(1, "cdr_odbc: Logging uniqueid\n");
-			} else {
-				ast_debug(1, "cdr_odbc: Not logging uniqueid\n");
-			}
+			ast_clear_flag(&config, CONFIG_DISPOSITIONSTRING);
+
+		if (((tmp = ast_variable_retrieve(cfg, "global", "loguniqueid"))) && ast_true(tmp)) {
+			ast_set_flag(&config, CONFIG_LOGUNIQUEID);
+			ast_debug(1, "cdr_odbc: Logging uniqueid\n");
 		} else {
+			ast_clear_flag(&config, CONFIG_LOGUNIQUEID);
 			ast_debug(1, "cdr_odbc: Not logging uniqueid\n");
-			loguniqueid = 0;
-		}
-
-		if ((tmp = ast_variable_retrieve(cfg, "global", "usegmtime"))) {
-			usegmtime = ast_true(tmp);
-			if (usegmtime) {
-				ast_debug(1, "cdr_odbc: Logging in GMT\n");
-			} else {
-				ast_debug(1, "cdr_odbc: Not logging in GMT\n");
-			}
+		}
+
+		if (((tmp = ast_variable_retrieve(cfg, "global", "usegmtime"))) && ast_true(tmp)) {
+			ast_set_flag(&config, CONFIG_USEGMTIME);
+			ast_debug(1, "cdr_odbc: Logging in GMT\n");
 		} else {
-			ast_debug(1, "cdr_odbc: Not logging in GMT\n");
-			usegmtime = 0;
+			ast_clear_flag(&config, CONFIG_USEGMTIME);
+			ast_debug(1, "cdr_odbc: Logging in local time\n");
 		}
 
 		if ((tmp = ast_variable_retrieve(cfg, "global", "table")) == NULL) {
@@ -325,18 +227,8 @@
 		}
 
 		ast_verb(3, "cdr_odbc: dsn is %s\n", dsn);
-		if (username) {
-			ast_verb(3, "cdr_odbc: username is %s\n", username);
-			ast_verb(3, "cdr_odbc: password is [secret]\n");
-		} else
-			ast_verb(3, "cdr_odbc: retrieving username and password from odbc config\n");
 		ast_verb(3, "cdr_odbc: table is %s\n", table);
 
-		res = odbc_init();
-		if (res < 0) {
-			ast_log(LOG_ERROR, "cdr_odbc: Unable to connect to datasource: %s\n", dsn);
-			ast_verb(3, "cdr_odbc: Unable to connect to datasource: %s\n", dsn);
-			}
 		res = ast_cdr_register(name, ast_module_info->description, odbc_log);
 		if (res) {
 			ast_log(LOG_ERROR, "cdr_odbc: Unable to register ODBC CDR handling\n");
@@ -345,85 +237,28 @@
 
 	if (cfg && cfg != CONFIG_STATUS_FILEUNCHANGED)
 		ast_config_destroy(cfg);
-	ast_mutex_unlock(&odbc_lock);
 	return res;
 }
 
-static int odbc_do_query(void)
-{
-	int ODBC_res;
-	
-	ODBC_res = SQLExecute(ODBC_stmt);
-	
-	if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
-		ast_verb(11, "cdr_odbc: Error in Query %d\n", ODBC_res);
-		SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt);
-		odbc_disconnect();
-		return -1;
-	} else {
-		ast_verb(11, "cdr_odbc: Query Successful!\n");
-		connected = 1;
-	}
+static int load_module(void)
+{
+	return odbc_load_module(0);
+}
+
+static int unload_module(void)
+{
+	ast_cdr_unregister(name);
+
+	if (dsn) {
+		ast_verb(11, "cdr_odbc: free dsn\n");
+		ast_free(dsn);
+	}
+	if (table) {
+		ast_verb(11, "cdr_odbc: free table\n");
+		ast_free(table);
+	}
+
 	return 0;
-}
-
-static int odbc_init(void)
-{
-	int ODBC_res;
-
-	if (ODBC_env == SQL_NULL_HANDLE || connected == 0) {
-		ODBC_res = SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &ODBC_env);
-		if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
-			ast_verb(11, "cdr_odbc: Error AllocHandle\n");
-			connected = 0;
-			return -1;
-		}
-
-		ODBC_res = SQLSetEnvAttr(ODBC_env, SQL_ATTR_ODBC_VERSION, (void*)SQL_OV_ODBC3, 0);
-
-		if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
-			ast_verb(11, "cdr_odbc: Error SetEnv\n");
-			SQLFreeHandle(SQL_HANDLE_ENV, ODBC_env);
-			connected = 0;
-			return -1;
-		}
-
-		ODBC_res = SQLAllocHandle(SQL_HANDLE_DBC, ODBC_env, &ODBC_con);
-
-		if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
-			ast_verb(11, "cdr_odbc: Error AllocHDB %d\n", ODBC_res);
-			SQLFreeHandle(SQL_HANDLE_ENV, ODBC_env);
-			connected = 0;
-			return -1;
-		}
-		SQLSetConnectAttr(ODBC_con, SQL_LOGIN_TIMEOUT, (SQLPOINTER *)10, 0);	
-	}
-
-	/* Note that the username and password could be NULL here, but that is allowed in ODBC.
-           In this case, the default username and password will be used from odbc.conf */
-	ODBC_res = SQLConnect(ODBC_con, (SQLCHAR*)dsn, SQL_NTS, (SQLCHAR*)username, SQL_NTS, (SQLCHAR*)password, SQL_NTS);
-
-	if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
-		ast_verb(11, "cdr_odbc: Error SQLConnect %d\n", ODBC_res);
-		SQLFreeHandle(SQL_HANDLE_DBC, ODBC_con);
-		SQLFreeHandle(SQL_HANDLE_ENV, ODBC_env);
-		connected = 0;
-		return -1;
-	} else {
-		ast_verb(11, "cdr_odbc: Connected to %s\n", dsn);
-		connected = 1;
-	}
-	return 0;
-}
-
-static int load_module(void)
-{
-	return odbc_load_module(0);
-}
-
-static int unload_module(void)
-{
-	return odbc_unload_module();
 }
 
 static int reload(void)

Modified: team/russell/chan_refcount/cdr/cdr_sqlite3_custom.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/cdr/cdr_sqlite3_custom.c?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/cdr/cdr_sqlite3_custom.c (original)
+++ team/russell/chan_refcount/cdr/cdr_sqlite3_custom.c Wed Nov 21 13:47:56 2007
@@ -158,7 +158,7 @@
 
 	{ /* Make it obvious that only sql_cmd should be used outside of this block */
 		char *sql_tmp_cmd;
-		char sql_insert_cmd[2048] = "";
+		char sql_insert_cmd[2048];
 		sql_tmp_cmd = sqlite3_mprintf("INSERT INTO %q (%q) VALUES (%q)", table, columns, values);
 		dummy.cdr = cdr;
 		pbx_substitute_variables_helper(&dummy, sql_tmp_cmd, sql_insert_cmd, sizeof(sql_insert_cmd) - 1);

Modified: team/russell/chan_refcount/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/channels/chan_gtalk.c?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/channels/chan_gtalk.c (original)
+++ team/russell/chan_refcount/channels/chan_gtalk.c Wed Nov 21 13:47:56 2007
@@ -28,7 +28,7 @@
 /*** MODULEINFO
 	<depend>iksemel</depend>
 	<depend>res_jabber</depend>
-	<use>gnutls</use>
+	<use>openssl</use>
  ***/
 
 #include "asterisk.h"
@@ -49,11 +49,6 @@
 #include <sys/signal.h>
 #include <iksemel.h>
 #include <pthread.h>
-
-#ifdef HAVE_GNUTLS
-#include <gcrypt.h>
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-#endif /* HAVE_GNUTLS */
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
@@ -1901,10 +1896,6 @@
 /*! \brief Load module into PBX, register channel */
 static int load_module(void)
 {
-#ifdef HAVE_GNUTLS	
-        gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-#endif /* HAVE_GNUTLS */
-
 	ASTOBJ_CONTAINER_INIT(&gtalk_list);
 	if (!gtalk_load_config()) {
 		ast_log(LOG_ERROR, "Unable to read config file %s. Not loading module.\n", GOOGLE_CONFIG);

Modified: team/russell/chan_refcount/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/channels/chan_iax2.c?view=diff&rev=89500&r1=89499&r2=89500
==============================================================================
--- team/russell/chan_refcount/channels/chan_iax2.c (original)
+++ team/russell/chan_refcount/channels/chan_iax2.c Wed Nov 21 13:47:56 2007
@@ -2152,7 +2152,7 @@
 				iax2_frame_free(frame.data);
 			jb_destroy(pvt->jb);
 			/* gotta free up the stringfields */
-			ast_string_field_free_pools(pvt);
+			ast_string_field_free_memory(pvt);
 			ast_free(pvt);
 		}
 	}
@@ -2206,7 +2206,7 @@
 							/* Hangup the fd */
 							fr.frametype = AST_FRAME_CONTROL;
 							fr.subclass = AST_CONTROL_HANGUP;
-							iax2_queue_frame(callno, &fr); // XXX
+							iax2_queue_frame(callno, &fr); /* XXX */
 							/* Remember, owner could disappear */
 							if (iaxs[callno] && iaxs[callno]->owner)
 								iaxs[callno]->owner->hangupcause = AST_CAUSE_DESTINATION_OUT_OF_ORDER;
@@ -6037,7 +6037,7 @@
 				}
 			}
 			if (prev)
-				free(prev);
+				ast_free(prev);
 			ies->vars = NULL;
 			ast_channel_datastore_add(p->owner, variablestore);
 		} else {
@@ -7828,7 +7828,7 @@
 							}
 						}
 						if (prev)
-							free(prev);
+							ast_free(prev);
 						ies.vars = NULL;
 						ast_channel_datastore_add(c, variablestore);
 					} else {
@@ -8586,7 +8586,7 @@
 										}
 									}
 									if (prev)
-										free(prev);
+										ast_free(prev);
 									ies.vars = NULL;
 									ast_channel_datastore_add(c, variablestore);
 								} else {
@@ -9735,7 +9735,7 @@
 	if (peer->mwi_event_sub)
 		ast_event_unsubscribe(peer->mwi_event_sub);
 
-	ast_string_field_free_pools(peer);
+	ast_string_field_free_memory(peer);
 }
 
 /*! \brief Create peer structure based on configuration */
@@ -9987,7 +9987,7 @@
 		ast_variables_destroy(user->vars);
 		user->vars = NULL;
 	}
-	ast_string_field_free_pools(user);
+	ast_string_field_free_memory(user);
 }
 
 /*! \brief Create in-memory user structure from configuration */
@@ -10028,7 +10028,7 @@
 	
 	if (user) {
 		if (firstpass) {
-			ast_string_field_free_pools(user);
+			ast_string_field_free_memory(user);
 			memset(user, 0, sizeof(struct iax2_user));
 			if (ast_string_field_init(user, 32)) {

[... 4172 lines stripped ...]



More information about the asterisk-commits mailing list