[svn-commits] murf: branch murf/fast-ast2 r88245 - in /team/murf/fast-ast2: ./ apps/ cdr/ c...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Fri Nov 2 09:39:30 CDT 2007


Author: murf
Date: Fri Nov  2 09:39:29 2007
New Revision: 88245

URL: http://svn.digium.com/view/asterisk?view=rev&rev=88245
Log:
Merged revisions 88164-88166,88182-88184 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r88164 | qwell | 2007-11-01 16:10:33 -0600 (Thu, 01 Nov 2007) | 4 lines

Switch res_jabber to use openssl rather than gnutls.

Closes issue #9972, patch by phsultan.  Copied from branch at http://svn.digium.com/svn/asterisk/team/phsultan/res_jabber-openssl/

........
r88165 | qwell | 2007-11-01 16:19:56 -0600 (Thu, 01 Nov 2007) | 1 line

Crap, accidentally copied the props.  Thanks for pointing this out mvanbaak.  The odds are quite high that this will break automerge on every team branch.
........
r88166 | murf | 2007-11-01 16:26:51 -0600 (Thu, 01 Nov 2007) | 1 line

This commits the performance mods that give the priority processing engine in the pbx, a 25-30% speed boost. The two updates used, are, first, to merge the ast_exists_extension() and the ast_spawn_extension() where they are called sequentially in a loop in the code, into a slightly upgraded version of ast_spawn_extension(), with a few extra args; and, second, I modified the substitute_variables_helper_full, so it zeroes out the byte after the evaluated string instead of demanding you pre-zero the buffer; I also went thru the code and removed the code that zeroed this buffer before every call to the substitute_variables_helper_full. The first fix provides about a 9% speedup, and the second the rest. These figures come from the 'PIPS' benchmark I describe in blogs, conf. reports, etc.
........
r88182 | tilghman | 2007-11-01 16:43:46 -0600 (Thu, 01 Nov 2007) | 3 lines

Convert cdr_odbc to use res_odbc managed connections
Closes issue #10614

........
r88183 | tilghman | 2007-11-01 17:26:35 -0600 (Thu, 01 Nov 2007) | 3 lines

Modify WaitExten to include an optional dialtone
Closes issue #10783

........
r88184 | qwell | 2007-11-01 17:26:51 -0600 (Thu, 01 Nov 2007) | 1 line

Remove traces of gnutls, since we no longer use/need it.
........

Made some changes to the pbx.c stuff, to duplicate flow of control better in the merged exists_extension/spawn_extension calls.


Modified:
    team/murf/fast-ast2/   (props changed)
    team/murf/fast-ast2/UPGRADE.txt
    team/murf/fast-ast2/apps/app_dial.c
    team/murf/fast-ast2/apps/app_exec.c
    team/murf/fast-ast2/apps/app_macro.c
    team/murf/fast-ast2/apps/app_minivm.c
    team/murf/fast-ast2/apps/app_mixmonitor.c
    team/murf/fast-ast2/apps/app_playback.c
    team/murf/fast-ast2/apps/app_queue.c
    team/murf/fast-ast2/apps/app_rpt.c
    team/murf/fast-ast2/cdr/cdr_custom.c
    team/murf/fast-ast2/cdr/cdr_manager.c
    team/murf/fast-ast2/cdr/cdr_odbc.c
    team/murf/fast-ast2/cdr/cdr_sqlite3_custom.c
    team/murf/fast-ast2/channels/chan_gtalk.c
    team/murf/fast-ast2/channels/chan_jingle.c
    team/murf/fast-ast2/configure
    team/murf/fast-ast2/configure.ac
    team/murf/fast-ast2/funcs/func_cut.c
    team/murf/fast-ast2/funcs/func_logic.c
    team/murf/fast-ast2/funcs/func_odbc.c
    team/murf/fast-ast2/funcs/func_strings.c
    team/murf/fast-ast2/include/asterisk/autoconfig.h.in
    team/murf/fast-ast2/include/asterisk/jabber.h
    team/murf/fast-ast2/include/asterisk/pbx.h
    team/murf/fast-ast2/main/logger.c
    team/murf/fast-ast2/main/pbx.c
    team/murf/fast-ast2/makeopts.in
    team/murf/fast-ast2/pbx/pbx_config.c
    team/murf/fast-ast2/pbx/pbx_dundi.c
    team/murf/fast-ast2/pbx/pbx_loopback.c
    team/murf/fast-ast2/pbx/pbx_realtime.c
    team/murf/fast-ast2/res/ael/pval.c
    team/murf/fast-ast2/res/res_agi.c
    team/murf/fast-ast2/res/res_jabber.c
    team/murf/fast-ast2/utils/extconf.c

Propchange: team/murf/fast-ast2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Nov  2 09:39:29 2007
@@ -1,1 +1,1 @@
-/trunk:1-88135
+/trunk:1-88196

Modified: team/murf/fast-ast2/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/UPGRADE.txt?view=diff&rev=88245&r1=88244&r2=88245
==============================================================================
--- team/murf/fast-ast2/UPGRADE.txt (original)
+++ team/murf/fast-ast2/UPGRADE.txt Fri Nov  2 09:39:29 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/murf/fast-ast2/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/apps/app_dial.c?view=diff&rev=88245&r1=88244&r2=88245
==============================================================================
--- team/murf/fast-ast2/apps/app_dial.c (original)
+++ team/murf/fast-ast2/apps/app_dial.c Fri Nov  2 09:39:29 2007
@@ -1797,7 +1797,7 @@
 			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 ((res = ast_spawn_extension(peer, peer->context, peer->exten, peer->priority, peer->cid.cid_num, &found))) {
+			while ((res = ast_spawn_extension(peer, peer->context, peer->exten, peer->priority, peer->cid.cid_num, &found,1))) {
 				peer->priority++;
 			}
 			if (found && res) {

Modified: team/murf/fast-ast2/apps/app_exec.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/apps/app_exec.c?view=diff&rev=88245&r1=88244&r2=88245
==============================================================================
--- team/murf/fast-ast2/apps/app_exec.c (original)
+++ team/murf/fast-ast2/apps/app_exec.c Fri Nov  2 09:39:29 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/murf/fast-ast2/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/apps/app_macro.c?view=diff&rev=88245&r1=88244&r2=88245
==============================================================================
--- team/murf/fast-ast2/apps/app_macro.c (original)
+++ team/murf/fast-ast2/apps/app_macro.c Fri Nov  2 09:39:29 2007
@@ -300,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, &foundx))) {
+		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 == '#')) {
@@ -331,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, ":");
@@ -354,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/murf/fast-ast2/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/apps/app_minivm.c?view=diff&rev=88245&r1=88244&r2=88245
==============================================================================
--- team/murf/fast-ast2/apps/app_minivm.c (original)
+++ team/murf/fast-ast2/apps/app_minivm.c Fri Nov  2 09:39:29 2007
@@ -1025,7 +1025,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);
@@ -1050,7 +1049,6 @@
 		char *passdata;
 		int vmlen = strlen(template->subject) * 3 + 200;
 		if ((passdata = alloca(vmlen))) {
-			memset(passdata, 0, vmlen);
 			pbx_substitute_variables_helper(ast, template->subject, passdata, vmlen);
 			fprintf(p, "Subject: %s\n", passdata);
 		} else {
@@ -1082,7 +1080,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/murf/fast-ast2/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/apps/app_mixmonitor.c?view=diff&rev=88245&r1=88244&r2=88245
==============================================================================
--- team/murf/fast-ast2/apps/app_mixmonitor.c (original)
+++ team/murf/fast-ast2/apps/app_mixmonitor.c Fri Nov  2 09:39:29 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/murf/fast-ast2/apps/app_playback.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/apps/app_playback.c?view=diff&rev=88245&r1=88244&r2=88245
==============================================================================
--- team/murf/fast-ast2/apps/app_playback.c (original)
+++ team/murf/fast-ast2/apps/app_playback.c Fri Nov  2 09:39:29 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/murf/fast-ast2/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/apps/app_queue.c?view=diff&rev=88245&r1=88244&r2=88245
==============================================================================
--- team/murf/fast-ast2/apps/app_queue.c (original)
+++ team/murf/fast-ast2/apps/app_queue.c Fri Nov  2 09:39:29 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/murf/fast-ast2/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/apps/app_rpt.c?view=diff&rev=88245&r1=88244&r2=88245
==============================================================================
--- team/murf/fast-ast2/apps/app_rpt.c (original)
+++ team/murf/fast-ast2/apps/app_rpt.c Fri Nov  2 09:39:29 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/murf/fast-ast2/cdr/cdr_custom.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/cdr/cdr_custom.c?view=diff&rev=88245&r1=88244&r2=88245
==============================================================================
--- team/murf/fast-ast2/cdr/cdr_custom.c (original)
+++ team/murf/fast-ast2/cdr/cdr_custom.c Fri Nov  2 09:39:29 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/murf/fast-ast2/cdr/cdr_manager.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/cdr/cdr_manager.c?view=diff&rev=88245&r1=88244&r2=88245
==============================================================================
--- team/murf/fast-ast2/cdr/cdr_manager.c (original)
+++ team/murf/fast-ast2/cdr/cdr_manager.c Fri Nov  2 09:39:29 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/murf/fast-ast2/cdr/cdr_odbc.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/cdr/cdr_odbc.c?view=diff&rev=88245&r1=88244&r2=88245
==============================================================================
--- team/murf/fast-ast2/cdr/cdr_odbc.c (original)
+++ team/murf/fast-ast2/cdr/cdr_odbc.c Fri Nov  2 09:39:29 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) {
+		SQLINTEGER 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/murf/fast-ast2/cdr/cdr_sqlite3_custom.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/cdr/cdr_sqlite3_custom.c?view=diff&rev=88245&r1=88244&r2=88245
==============================================================================
--- team/murf/fast-ast2/cdr/cdr_sqlite3_custom.c (original)
+++ team/murf/fast-ast2/cdr/cdr_sqlite3_custom.c Fri Nov  2 09:39:29 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/murf/fast-ast2/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/channels/chan_gtalk.c?view=diff&rev=88245&r1=88244&r2=88245
==============================================================================
--- team/murf/fast-ast2/channels/chan_gtalk.c (original)
+++ team/murf/fast-ast2/channels/chan_gtalk.c Fri Nov  2 09:39:29 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/murf/fast-ast2/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/channels/chan_jingle.c?view=diff&rev=88245&r1=88244&r2=88245
==============================================================================
--- team/murf/fast-ast2/channels/chan_jingle.c (original)
+++ team/murf/fast-ast2/channels/chan_jingle.c Fri Nov  2 09:39:29 2007
@@ -30,7 +30,7 @@
 /*** MODULEINFO
 	<depend>iksemel</depend>
 	<depend>res_jabber</depend>
-	<use>gnutls</use>
+	<use>openssl</use>
  ***/
 
 #include "asterisk.h"
@@ -50,11 +50,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"
@@ -1804,10 +1799,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(&jingle_list);
 	if (!jingle_load_config()) {
 		ast_log(LOG_ERROR, "Unable to read config file %s. Not loading module.\n", JINGLE_CONFIG);

Modified: team/murf/fast-ast2/configure
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/configure?view=diff&rev=88245&r1=88244&r2=88245
==============================================================================
--- team/murf/fast-ast2/configure (original)
+++ team/murf/fast-ast2/configure Fri Nov  2 09:39:29 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 87247 .
+# From configure.ac Revision: 87325 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -741,10 +741,6 @@
 CRYPTO_INCLUDE
 CRYPTO_DIR
 PBX_CRYPTO
-GNUTLS_LIB
-GNUTLS_INCLUDE
-GNUTLS_DIR
-PBX_GNUTLS
 GSM_LIB
 GSM_INCLUDE
 GSM_DIR
@@ -1535,8 +1531,6 @@
   --with-curl=PATH        use cURL files in PATH
   --with-curses=PATH      use curses files in PATH
   --with-crypto=PATH      use OpenSSL Cryptography support files in PATH
-  --with-gnutls=PATH      use GNU TLS support (used for iksemel only) files in
-                          PATH
   --with-gsm=PATH         use GSM files in PATH , or 'internal'
   --with-iksemel=PATH     use Iksemel Jabber Library files in PATH
   --with-imap=PATH        use UW IMAP Toolkit files in PATH
@@ -7829,34 +7823,6 @@
 
 
 
-GNUTLS_DESCRIP="GNU TLS support (used for iksemel only)"
-GNUTLS_OPTION="gnutls"
-
-# Check whether --with-gnutls was given.
-if test "${with_gnutls+set}" = set; then
-  withval=$with_gnutls;
-case ${withval} in
-     n|no)
-     USE_GNUTLS=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} GNUTLS"
-     ;;
-     *)
-     GNUTLS_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} GNUTLS"
-     ;;
-esac
-
-fi
-
-PBX_GNUTLS=0
-
-
-
-
-
-
 GSM_DESCRIP="GSM"
 GSM_OPTION="gsm"
 
@@ -37230,399 +37196,6 @@
    fi
 fi
 
-
-if test "${PBX_IKSEMEL}" = 1; then
-
-if test "x${PBX_GNUTLS}" != "x1" -a "${USE_GNUTLS}" != "no"; then
-   pbxlibdir=""
-   if test "x${GNUTLS_DIR}" != "x"; then
-      if test -d ${GNUTLS_DIR}/lib; then
-      	 pbxlibdir="-L${GNUTLS_DIR}/lib"
-      else
-      	 pbxlibdir="-L${GNUTLS_DIR}"
-      fi
-   fi
-   pbxfuncname="gnutls_bye"
-   if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers
-      AST_GNUTLS_FOUND=yes
-   else
-      as_ac_Lib=`echo "ac_cv_lib_gnutls_${pbxfuncname}" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lgnutls" >&5
-echo $ECHO_N "checking for ${pbxfuncname} in -lgnutls... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgnutls ${pbxlibdir} -lz -lgcrypt -lgpg-error $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ${pbxfuncname} ();
-int
-main ()
-{
-return ${pbxfuncname} ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-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_link") 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_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-  AST_GNUTLS_FOUND=yes
-else
-  AST_GNUTLS_FOUND=no
-fi
-
-   fi
-
-   if test "${AST_GNUTLS_FOUND}" = "yes"; then
-      GNUTLS_LIB="-lgnutls -lz -lgcrypt -lgpg-error"
-      GNUTLS_HEADER_FOUND="1"
-      if test "x${GNUTLS_DIR}" != "x"; then
-         GNUTLS_LIB="${pbxlibdir} ${GNUTLS_LIB}"
-	 GNUTLS_INCLUDE="-I${GNUTLS_DIR}/include"
-	 saved_cppflags="${CPPFLAGS}"
-	 CPPFLAGS="${CPPFLAGS} -I${GNUTLS_DIR}/include"
-	 if test "xgnutls/gnutls.h" != "x" ; then
-	    as_ac_Header=`echo "ac_cv_header_${GNUTLS_DIR}/include/gnutls/gnutls.h" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for ${GNUTLS_DIR}/include/gnutls/gnutls.h" >&5
-echo $ECHO_N "checking for ${GNUTLS_DIR}/include/gnutls/gnutls.h... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking ${GNUTLS_DIR}/include/gnutls/gnutls.h usability" >&5
-echo $ECHO_N "checking ${GNUTLS_DIR}/include/gnutls/gnutls.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <${GNUTLS_DIR}/include/gnutls/gnutls.h>
-_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
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking ${GNUTLS_DIR}/include/gnutls/gnutls.h presence" >&5
-echo $ECHO_N "checking ${GNUTLS_DIR}/include/gnutls/gnutls.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <${GNUTLS_DIR}/include/gnutls/gnutls.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in

[... 1810 lines stripped ...]



More information about the svn-commits mailing list