[asterisk-commits] russell: branch russell/events r88266 - in /team/russell/events: ./ build_too...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Nov 2 10:54:43 CDT 2007 

Author: russell
Date: Fri Nov  2 10:54:42 2007
New Revision: 88266

URL: http://svn.digium.com/view/asterisk?view=rev&rev=88266
Log:
resolve, reset

Added:
    team/russell/events/configs/extensions.lua.sample
      - copied unchanged from r88250, trunk/configs/extensions.lua.sample
    team/russell/events/pbx/pbx_lua.c
      - copied unchanged from r88250, trunk/pbx/pbx_lua.c
    team/russell/events/utils/build-extensions-conf.lua
      - copied unchanged from r88250, trunk/utils/build-extensions-conf.lua
Modified:
    team/russell/events/   (props changed)
    team/russell/events/UPGRADE.txt
    team/russell/events/build_tools/menuselect-deps.in
    team/russell/events/cdr/cdr_odbc.c
    team/russell/events/channels/chan_gtalk.c
    team/russell/events/channels/chan_jingle.c
    team/russell/events/configure.ac
    team/russell/events/include/asterisk/autoconfig.h.in
    team/russell/events/include/asterisk/jabber.h
    team/russell/events/include/asterisk/lock.h
    team/russell/events/include/asterisk/pbx.h
    team/russell/events/main/config.c
    team/russell/events/main/pbx.c
    team/russell/events/makeopts.in

Propchange: team/russell/events/
------------------------------------------------------------------------------
    automerge = *

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

Propchange: team/russell/events/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Nov  2 10:54:42 2007
@@ -1,1 +1,1 @@
-/trunk:1-88179
+/trunk:1-88265

Modified: team/russell/events/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/russell/events/UPGRADE.txt?view=diff&rev=88266&r1=88265&r2=88266
==============================================================================
--- team/russell/events/UPGRADE.txt (original)
+++ team/russell/events/UPGRADE.txt Fri Nov  2 10:54:42 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/events/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/russell/events/build_tools/menuselect-deps.in?view=diff&rev=88266&r1=88265&r2=88266
==============================================================================
--- team/russell/events/build_tools/menuselect-deps.in (original)
+++ team/russell/events/build_tools/menuselect-deps.in Fri Nov  2 10:54:42 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/events/cdr/cdr_odbc.c
URL: http://svn.digium.com/view/asterisk/team/russell/events/cdr/cdr_odbc.c?view=diff&rev=88266&r1=88265&r2=88266
==============================================================================
--- team/russell/events/cdr/cdr_odbc.c (original)
+++ team/russell/events/cdr/cdr_odbc.c Fri Nov  2 10:54:42 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/events/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/team/russell/events/channels/chan_gtalk.c?view=diff&rev=88266&r1=88265&r2=88266
==============================================================================
--- team/russell/events/channels/chan_gtalk.c (original)
+++ team/russell/events/channels/chan_gtalk.c Fri Nov  2 10:54:42 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/events/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/team/russell/events/channels/chan_jingle.c?view=diff&rev=88266&r1=88265&r2=88266
==============================================================================
--- team/russell/events/channels/chan_jingle.c (original)
+++ team/russell/events/channels/chan_jingle.c Fri Nov  2 10:54:42 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/russell/events/configure.ac
URL: http://svn.digium.com/view/asterisk/team/russell/events/configure.ac?view=diff&rev=88266&r1=88265&r2=88266
==============================================================================
--- team/russell/events/configure.ac (original)
+++ team/russell/events/configure.ac Fri Nov  2 10:54:42 2007
@@ -187,13 +187,13 @@
 AST_EXT_LIB_SETUP([CURL], [cURL], [curl])
 AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
 AST_EXT_LIB_SETUP([CRYPTO], [OpenSSL Cryptography support], [crypto])
-AST_EXT_LIB_SETUP([GNUTLS], [GNU TLS support (used for iksemel only)], [gnutls])
 AST_EXT_LIB_SETUP([GSM], [GSM], [gsm], [, or 'internal'])
 AST_EXT_LIB_SETUP([IKSEMEL], [Iksemel Jabber Library], [iksemel])
 AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
 AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
 AST_EXT_LIB_SETUP([KDE], [KDE], [kde])
 AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
+AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
 AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
 AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs])
 AST_EXT_LIB_SETUP([NCURSES], [ncurses], [ncurses])
@@ -560,10 +560,6 @@
 
 AST_EXT_LIB_CHECK([IKSEMEL], [iksemel], [iks_start_sasl], [iksemel.h])
 
-if test "${PBX_IKSEMEL}" = 1; then
-   AST_EXT_LIB_CHECK([GNUTLS], [gnutls], [gnutls_bye], [gnutls/gnutls.h], [-lz -lgcrypt -lgpg-error])
-fi
-
 if test "${USE_IMAP_TK}" != "no"; then
    if test "${IMAP_TK_DIR}" = "system" ; then
       AC_MSG_NOTICE([Checking for system c-client library...])
@@ -987,6 +983,10 @@
 
 AC_LANG_POP
 
+LUA_INCLUDE="-I/usr/include/lua5.1"
+LUA_LIB="-llua5.1"
+AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h]) 
+
 AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
 
 AST_EXT_LIB_CHECK([SACLM], [SaClm], [saClmInitialize], [openais/saClm.h])

Modified: team/russell/events/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/team/russell/events/include/asterisk/autoconfig.h.in?view=diff&rev=88266&r1=88265&r2=88266
==============================================================================
--- team/russell/events/include/asterisk/autoconfig.h.in (original)
+++ team/russell/events/include/asterisk/autoconfig.h.in Fri Nov  2 10:54:42 2007
@@ -300,12 +300,6 @@
 /* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
-/* Define this to indicate the ${GNUTLS_DESCRIP} library */
-#undef HAVE_GNUTLS
-
-/* Define to indicate the ${GNUTLS_DESCRIP} library version */
-#undef HAVE_GNUTLS_VERSION
-
 /* Define to indicate the GSM library */
 #undef HAVE_GSM
 
@@ -414,6 +408,12 @@
 
 /* Define to indicate the ${LTDL_DESCRIP} library version */
 #undef HAVE_LTDL_VERSION
+
+/* Define this to indicate the ${LUA_DESCRIP} library */
+#undef HAVE_LUA
+
+/* Define to indicate the ${LUA_DESCRIP} library version */
+#undef HAVE_LUA_VERSION
 
 /* Define to 1 if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H

Modified: team/russell/events/include/asterisk/jabber.h
URL: http://svn.digium.com/view/asterisk/team/russell/events/include/asterisk/jabber.h?view=diff&rev=88266&r1=88265&r2=88266
==============================================================================
--- team/russell/events/include/asterisk/jabber.h (original)
+++ team/russell/events/include/asterisk/jabber.h Fri Nov  2 10:54:42 2007
@@ -32,8 +32,6 @@
  *
  * \section External dependencies
  * AJI use the IKSEMEL library found at http://iksemel.jabberstudio.org/
- * To use TLS connections, IKSEMEL depends on the GNUTLS library
- * available at http://iksemel.jabberstudio.org/
  *
  * \section Files
  * - res_jabber.c

Modified: team/russell/events/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/team/russell/events/include/asterisk/lock.h?view=diff&rev=88266&r1=88265&r2=88266
==============================================================================
--- team/russell/events/include/asterisk/lock.h (original)
+++ team/russell/events/include/asterisk/lock.h Fri Nov  2 10:54:42 2007
@@ -675,11 +675,11 @@
 	int res;
 	pthread_mutexattr_t attr;
 
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+#ifdef BSD
 	/* Check for already init'ed mutex for BSD */
-	if (*pmutex != PTHREAD_MUTEX_INITIALIZER)
+	if (*pmutex != ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER))
 		return 0;
-#endif
+#endif /* BSD */
 	pthread_mutexattr_init(&attr);
 	pthread_mutexattr_settype(&attr, AST_MUTEX_KIND);
 
@@ -692,42 +692,42 @@
 
 static inline int ast_mutex_unlock(ast_mutex_t *pmutex)
 {
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+#ifdef BSD
 	/* Check for uninitialized mutex for BSD */
-	if (*pmutex == PTHREAD_MUTEX_INITIALIZER) {
+	if (*pmutex == ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER)) {
 		ast_mutex_init(pmutex);
 		return 0;
 	}
-#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
+#endif /* BSD */
 	return pthread_mutex_unlock(pmutex);
 }
 
 static inline int ast_mutex_destroy(ast_mutex_t *pmutex)
 {
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
-	if (*pmutex == PTHREAD_MUTEX_INITIALIZER)
+#ifdef BSD
+	if (*pmutex == ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER))
 		return 0;
-#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
+#endif /* BSD */
 	return pthread_mutex_destroy(pmutex);
 }
 
 static inline int ast_mutex_lock(ast_mutex_t *pmutex)
 {
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+#ifdef BSD
 	/* Check for uninitialized mutex for BSD */
-	if (*pmutex == PTHREAD_MUTEX_INITIALIZER)
+	if (*pmutex == ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER))
 		ast_mutex_init(pmutex);
-#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
+#endif /* BSD */
 	__MTX_PROF(pmutex);
 }
 
 static inline int ast_mutex_trylock(ast_mutex_t *pmutex)
 {
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+#ifdef BSD
 	/* Check for uninitialized mutex for BSD */
-	if (*pmutex == PTHREAD_MUTEX_INITIALIZER)
+	if (*pmutex == ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER))
 		ast_mutex_init(pmutex);
-#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
+#endif /* BSD */
 	return pthread_mutex_trylock(pmutex);
 }
 
@@ -1037,11 +1037,11 @@
 	int res;
 	pthread_rwlockattr_t attr;
 
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+#ifdef BSD
 	/* Check for already init'ed lock for BSD */
 	if (*prwlock != ((ast_rwlock_t) AST_RWLOCK_INIT_VALUE))
 		return 0;
-#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
+#endif /* BSD */
 	pthread_rwlockattr_init(&attr);
 
 #ifdef HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP
@@ -1055,67 +1055,67 @@
 
 static inline int ast_rwlock_destroy(ast_rwlock_t *prwlock)
 {
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+#ifdef BSD
 	/* Check for uninitialized mutex for BSD */
 	if (*prwlock == ((ast_rwlock_t) AST_RWLOCK_INIT_VALUE))
 		return 0;
-#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
+#endif /* BSD */
 	return pthread_rwlock_destroy(prwlock);
 }
 
 static inline int ast_rwlock_unlock(ast_rwlock_t *prwlock)
 {
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+#ifdef BSD
 	/* Check for uninitialized lock for BSD */
 	if (*prwlock == ((ast_rwlock_t) AST_RWLOCK_INIT_VALUE)) {
 		ast_rwlock_init(prwlock);
 		return 0;
 	}
-#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
+#endif /* BSD */
 	return pthread_rwlock_unlock(prwlock);
 }
 
 static inline int ast_rwlock_rdlock(ast_rwlock_t *prwlock)
 {
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+#ifdef BSD
 	/* Check for uninitialized lock for BSD */
 	if (*prwlock == ((ast_rwlock_t) AST_RWLOCK_INIT_VALUE)) {
 		ast_rwlock_init(prwlock);
 	}
-#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
+#endif /* BSD */
 	return pthread_rwlock_rdlock(prwlock);
 }
 
 static inline int ast_rwlock_tryrdlock(ast_rwlock_t *prwlock)
 {
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+#ifdef BSD
 	/* Check for uninitialized lock for BSD */
 	if (*prwlock == ((ast_rwlock_t) AST_RWLOCK_INIT_VALUE)) {
 		ast_rwlock_init(prwlock);
 	}
-#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
+#endif /* BSD */
 	return pthread_rwlock_tryrdlock(prwlock);
 }
 
 static inline int ast_rwlock_wrlock(ast_rwlock_t *prwlock)
 {
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+#ifdef BSD
 	/* Check for uninitialized lock for BSD */
 	if (*prwlock == ((ast_rwlock_t) AST_RWLOCK_INIT_VALUE)) {
 		ast_rwlock_init(prwlock);
 	}
-#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
+#endif /* BSD */
 	return pthread_rwlock_wrlock(prwlock);
 }
 
 static inline int ast_rwlock_trywrlock(ast_rwlock_t *prwlock)
 {
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+#ifdef BSD 
 	/* Check for uninitialized lock for BSD */
 	if (*prwlock == ((ast_rwlock_t) AST_RWLOCK_INIT_VALUE)) {
 		ast_rwlock_init(prwlock);
 	}
-#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
+#endif /* BSD */
 	return pthread_rwlock_trywrlock(prwlock);
 }
 #endif /* !DEBUG_THREADS */

Modified: team/russell/events/include/asterisk/pbx.h
URL: http://svn.digium.com/view/asterisk/team/russell/events/include/asterisk/pbx.h?view=diff&rev=88266&r1=88265&r2=88266
==============================================================================
--- team/russell/events/include/asterisk/pbx.h (original)
+++ team/russell/events/include/asterisk/pbx.h Fri Nov  2 10:54:42 2007
@@ -508,6 +508,20 @@
 int ast_extension_close(const char *pattern, const char *data, int needmore);
 
 /*! 
+ * \brief Determine if one extension should match before another
+ * 
+ * \param a extension to compare with b
+ * \param b extension to compare with a
+ *
+ * Checks whether or extension a should match before extension b
+ *
+ * \retval 0 if the two extensions have equal matching priority
+ * \retval 1 on a > b
+ * \retval -1 on a < b
+ */
+int ast_extension_cmp(const char *a, const char *b);
+
+/*! 
  * \brief Launch a new extension (i.e. new stack)
  * 
  * \param c not important

Modified: team/russell/events/main/config.c
URL: http://svn.digium.com/view/asterisk/team/russell/events/main/config.c?view=diff&rev=88266&r1=88265&r2=88266
==============================================================================
--- team/russell/events/main/config.c (original)
+++ team/russell/events/main/config.c Fri Nov  2 10:54:42 2007
@@ -818,6 +818,12 @@
 
 	switch (attrtype) {
 	case ATTRIBUTE_INCLUDE:
+		AST_LIST_TRAVERSE(&cfmtime->includes, cfinclude, list) {
+			if (!strcmp(cfinclude->include, filename)) {
+				AST_LIST_UNLOCK(&cfmtime_head);
+				return;
+			}
+		}
 		cfinclude = ast_calloc(1, sizeof(*cfinclude) + strlen(filename) + 1);
 		if (!cfinclude) {
 			AST_LIST_UNLOCK(&cfmtime_head);

Modified: team/russell/events/main/pbx.c
URL: http://svn.digium.com/view/asterisk/team/russell/events/main/pbx.c?view=diff&rev=88266&r1=88265&r2=88266
==============================================================================
--- team/russell/events/main/pbx.c (original)
+++ team/russell/events/main/pbx.c Fri Nov  2 10:54:42 2007
@@ -68,6 +68,7 @@
 #include "asterisk/stringfields.h"
 #include "asterisk/event.h"
 #include "asterisk/module.h"
+#include "asterisk/indications.h"
 
 /*!
  * \note I M P O R T A N T :
@@ -106,9 +107,11 @@
 });
 
 #define WAITEXTEN_MOH		(1 << 0)
+#define WAITEXTEN_DIALTONE	(1 << 1)
 
 AST_APP_OPTIONS(waitexten_opts, {
 	AST_APP_OPTION_ARG('m', WAITEXTEN_MOH, 0),
+	AST_APP_OPTION_ARG('d', WAITEXTEN_DIALTONE, 0),
 });
 
 struct ast_context;
@@ -801,6 +804,11 @@
 		return 0;
 	else
 		return (ret > 0) ? 1 : -1;
+}
+
+int ast_extension_cmp(const char *a, const char *b)
+{
+	return ext_cmp(a, b);
 }
 
 /*!
@@ -2657,7 +2665,7 @@
 		if (c->cdr && ast_opt_end_cdr_before_h_exten)
 			ast_cdr_end(c->cdr);
 		set_ext_pri(c, "h", 1);
-		while ((res = ast_spawn_extension(c, c->context, c->exten, c->priority, c->cid.cid_num, &found,1))) {
+		while ((res = ast_spawn_extension(c, c->context, c->exten, c->priority, c->cid.cid_num, &found, 1)) == 0) {
 			c->priority++;
 		}
 		if (found && res) {
@@ -5760,9 +5768,15 @@
 	
 	if (ast_test_flag(&flags, WAITEXTEN_MOH) && !opts[0] ) {
 		ast_log(LOG_WARNING, "The 'm' option has been specified for WaitExten without a class.\n"); 
-	} else if (ast_test_flag(&flags, WAITEXTEN_MOH))
+	} else if (ast_test_flag(&flags, WAITEXTEN_MOH)) {
 		ast_indicate_data(chan, AST_CONTROL_HOLD, opts[0], strlen(opts[0]));
-
+	} else if (ast_test_flag(&flags, WAITEXTEN_DIALTONE)) {
+		const struct ind_tone_zone_sound *ts = ast_get_indication_tone(chan->zone, "dial");
+		if (ts)
+			ast_playtones_start(chan, 0, ts->data, 0);
+		else
+			ast_tonepair_start(chan, 350, 440, 0, 0);
+	}
 	/* Wait for "n" seconds */
 	if (args.timeout && (s = atof(args.timeout)) > 0)
 		 ms = s * 1000.0;
@@ -5786,6 +5800,8 @@
 
 	if (ast_test_flag(&flags, WAITEXTEN_MOH))
 		ast_indicate(chan, AST_CONTROL_UNHOLD);
+	else if (ast_test_flag(&flags, WAITEXTEN_DIALTONE))
+		ast_playtones_stop(chan);
 
 	return res;
 }

Modified: team/russell/events/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/russell/events/makeopts.in?view=diff&rev=88266&r1=88265&r2=88266
==============================================================================
--- team/russell/events/makeopts.in (original)
+++ team/russell/events/makeopts.in Fri Nov  2 10:54:42 2007
@@ -92,9 +92,6 @@
 IKSEMEL_INCLUDE=@IKSEMEL_INCLUDE@
 IKSEMEL_LIB=@IKSEMEL_LIB@
 
-GNUTLS_INCLUDE=@GNUTLS_INCLUDE@
-GNUTLS_LIB=@GNUTLS_LIB@
-
 IMAP_TK_INCLUDE=@IMAP_TK_INCLUDE@
 IMAP_TK_LIB=@IMAP_TK_LIB@
 
@@ -102,6 +99,9 @@
 KDE_INCLUDE=@KDE_INCLUDE@
 KDE_LIB=@KDE_LIB@
 
+LUA_INCLUDE=@LUA_INCLUDE@
+LUA_LIB=@LUA_LIB@
+
 NBS_INCLUDE=@NBS_INCLUDE@
 NBS_LIB=@NBS_LIB@

More information about the asterisk-commits mailing list