kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

More mysql patches

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1472 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-09-04 04:20:43 +00:00
parent ef1632a591
commit e42d5a20fd
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/Makefile
View File

@@ -11,10 +11,11 @@
# the GNU General Public License
#
USE_MYSQL_VM_INTERFACE=0
USE_MYSQL_VM_INTERFACE=1
MLFLAGS=
ifeq ($(USE_MYSQL_VM_INTERFACE),1)
CFLAGS+=-DUSEMYSQLVM
CFLAGS+=$(shell if [ -d /usr/local/mysql/include ]; then echo "-I/usr/local/mysql/include"; fi)
CFLAGS+=$(shell if [ -d /usr/include/mysql ]; then echo "-I/usr/include/mysql"; fi)
CFLAGS+=$(shell if [ -d /usr/local/include/mysql ]; then echo "-I/usr/local/include/mysql"; fi)
@@ -65,7 +66,11 @@ app_todd.so: app_todd.o
$(CC) -shared -Xlinker -x -o $@ $< -L/usr/local/ssl/lib -lssl -lcrypto
app_voicemail2.so : app_voicemail2.o
ifeq ($(USE_MYSQL_VM_INTERFACE),1)
$(CC) -shared -Xlinker -x -o $@ $(MLFLAGS) $< -lmysqlclient -lz
else
$(CC) -shared -Xlinker -x -o $@ $(MLFLAGS) $<
endif
app_sql_postgres.o: app_sql_postgres.c
$(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c

12
apps/app_voicemail2.c
View File

@@ -35,7 +35,7 @@
#include <sys/stat.h>
#include <time.h>
#ifdef USEMYSQLVM
#include <mysql/mysql.h>
#include <mysql.h>
#endif
#include <pthread.h>
@@ -186,6 +186,7 @@ MYSQL *dbhandler=NULL;
ast_mutex_t mysqllock;
char dbuser[80];
char dbpass[80];
char dbhost[80];
char dbname[80];
static int mysql_login(void)
@@ -193,11 +194,11 @@ static int mysql_login(void)
ast_verbose( VERBOSE_PREFIX_3 "Logging into database with user %s, password %s, and database %s\n", dbuser, dbpass, dbname);
dbhandler=mysql_init(NULL);
if (!mysql_real_connect(dbhandler, NULL, dbuser, dbpass, dbname, 0, NULL, 0)) {
if (!mysql_real_connect(dbhandler, dbhost[0] ? dbhost : NULL, dbuser, dbpass, dbname, 0, NULL, 0)) {
ast_log(LOG_WARNING, "Error Logging into database\n");
return(-1);
}
ast_mutex_init(&mysqllock, NULL);
ast_mutex_init(&mysqllock);
return(0);
}
@@ -2968,6 +2969,11 @@ static int load_config(void)
} else {
strcpy(dbpass, s);
}
if (!(s=ast_variable_retrieve(cfg, "general", "dbhost"))) {
strcpy(dbhost, "");
} else {
strcpy(dbhost, s);
}
if (!(s=ast_variable_retrieve(cfg, "general", "dbname"))) {
strcpy(dbname, "vmdb");
} else {