-/* mysqlConn.c - NeonServ v5.3
+/* mysqlConn.c - NeonServ v5.6
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
*/
#include "mysqlConn.h"
-#define DATABASE_VERSION "10"
+#define DATABASE_VERSION "20"
+
+static void show_mysql_error();
+
+struct mysql_conn_struct {
+ unsigned int tid;
+ MYSQL *mysql_conn;
+ struct used_result *used_results;
+ struct escaped_string *escaped_strings;
+ struct mysql_conn_struct *next;
+};
struct used_result {
MYSQL_RES *result;
struct escaped_string *next;
};
-MYSQL *mysql_conn = NULL;
-static struct used_result *used_results;
-static struct escaped_string *escaped_strings;
+struct mysql_conn_struct *get_mysql_conn_struct();
+
+struct mysql_conn_struct *mysql_conns = NULL;
static int mysql_serverport;
static char *mysql_host, *mysql_user, *mysql_pass, *mysql_base;
-void check_mysql() {
+#ifdef HAVE_THREADS
+static pthread_mutex_t synchronized;
+#endif
+
+static void check_mysql() {
+ MYSQL *mysql_conn = get_mysql_conn();
int errid;
if((errid = mysql_ping(mysql_conn))) {
if(mysql_errno(mysql_conn) == CR_SERVER_GONE_ERROR) {
}
MYSQL_RES *mysql_use() {
- MYSQL_RES *res = mysql_store_result(mysql_conn);
+ struct mysql_conn_struct *mysql_conn = get_mysql_conn_struct();
+ MYSQL_RES *res = mysql_store_result(mysql_conn->mysql_conn);
struct used_result *result = malloc(sizeof(*result));
if (!result) {
mysql_free_result(res);
return NULL;
}
result->result = res;
- result->next = used_results;
- used_results = result;
+ result->next = mysql_conn->used_results;
+ mysql_conn->used_results = result;
return res;
}
void mysql_free() {
+ struct mysql_conn_struct *mysql_conn = get_mysql_conn_struct();
+ if(!mysql_conn) return;
struct used_result *result, *next_result;
- for(result = used_results; result; result = next_result) {
+ for(result = mysql_conn->used_results; result; result = next_result) {
next_result = result->next;
mysql_free_result(result->result);
free(result);
}
- used_results = NULL;
+ mysql_conn->used_results = NULL;
struct escaped_string *escaped, *next_escaped;
- for(escaped = escaped_strings; escaped; escaped = next_escaped) {
+ for(escaped = mysql_conn->escaped_strings; escaped; escaped = next_escaped) {
next_escaped = escaped->next;
free(escaped->string);
free(escaped);
}
- escaped_strings = NULL;
+ mysql_conn->escaped_strings = NULL;
}
void init_mysql(char *host, int port, char *user, char *pass, char *base) {
+ THREAD_MUTEX_INIT(synchronized);
mysql_host = strdup(host);
mysql_serverport = port;
mysql_user = strdup(user);
mysql_pass = strdup(pass);
mysql_base = strdup(base);
- mysql_conn = mysql_init(NULL);
- if (!mysql_real_connect(mysql_conn, mysql_host, mysql_user, mysql_pass, mysql_base, mysql_serverport, NULL, 0)) {
- //error
- show_mysql_error();
- }
+
+
+ MYSQL *mysql_conn = get_mysql_conn();
+
//check database version...
int version = 0;
if(!mysql_query(mysql_conn, "SELECT `database_version` FROM `version`")) {
version = atoi(row[0]);
}
}
- printf("%d \n", version);
if(!version) {
//CREATE DATABASE
FILE *f = fopen("database.sql", "r");
}
void free_mysql() {
- mysql_close(mysql_conn);
+ struct mysql_conn_struct *mysql_conn, *next;
+ for(mysql_conn = mysql_conns; mysql_conn; mysql_conn = next) {
+ next = mysql_conn->next;
+ mysql_close(mysql_conn->mysql_conn);
+ free(mysql_conn);
+ }
+ mysql_conns = NULL;
}
-void show_mysql_error() {
+static void show_mysql_error() {
+ MYSQL *mysql_conn = get_mysql_conn();
//show mysql_error()
- printf("MySQL Error: %s\n", mysql_error(mysql_conn));
+ putlog(LOGLEVEL_ERROR, "MySQL Error: %s\n", mysql_error(mysql_conn));
}
void printf_mysql_query(const char *text, ...) {
+ MYSQL *mysql_conn = get_mysql_conn();
va_list arg_list;
char queryBuf[MYSQLMAXLEN];
int pos;
va_end(arg_list);
if (pos < 0 || pos > (MYSQLMAXLEN - 2)) pos = MYSQLMAXLEN - 2;
queryBuf[pos] = '\0';
- printf("MySQL: %s\n", queryBuf);
+ putlog(LOGLEVEL_MYSQL, "MySQL: %s\n", queryBuf);
+ if(mysql_query(mysql_conn, queryBuf)) {
+ check_mysql();
+ if(mysql_query(mysql_conn, queryBuf)) {
+ show_mysql_error();
+ }
+ }
+}
+
+void printf_long_mysql_query(int len, const char *text, ...) {
+ MYSQL *mysql_conn = get_mysql_conn();
+ va_list arg_list;
+ char queryBuf[len];
+ int pos;
+ queryBuf[0] = '\0';
+ va_start(arg_list, text);
+ pos = vsnprintf(queryBuf, len - 2, text, arg_list);
+ va_end(arg_list);
+ if (pos < 0 || pos > (len - 2)) pos = len - 2;
+ queryBuf[pos] = '\0';
+ putlog(LOGLEVEL_MYSQL, "MySQL: %s\n", queryBuf);
if(mysql_query(mysql_conn, queryBuf)) {
check_mysql();
if(mysql_query(mysql_conn, queryBuf)) {
}
char* escape_string(const char *str) {
+ struct mysql_conn_struct *mysql_conn = get_mysql_conn_struct();
struct escaped_string *escapedstr = malloc(sizeof(*escapedstr));
if (!escapedstr) {
return NULL;
}
char escaped[strlen(str)*2+1];
- mysql_real_escape_string(mysql_conn, escaped, str, strlen(str));
+ mysql_real_escape_string(mysql_conn->mysql_conn, escaped, str, strlen(str));
escapedstr->string = strdup(escaped);
- escapedstr->next = escaped_strings;
- escaped_strings = escapedstr;
+ escapedstr->next = mysql_conn->escaped_strings;
+ mysql_conn->escaped_strings = escapedstr;
return escapedstr->string;
}
+
+struct mysql_conn_struct *get_mysql_conn_struct() {
+ SYNCHRONIZE(synchronized);
+ struct mysql_conn_struct *mysql_conn;
+ unsigned int tid;
+ #ifdef HAVE_THREADS
+ tid = (unsigned int) pthread_self_tid();
+ #else
+ tid = 1;
+ #endif
+ for(mysql_conn = mysql_conns; mysql_conn; mysql_conn = mysql_conn->next) {
+ if(mysql_conn->tid == tid) {
+ DESYNCHRONIZE(synchronized);
+ return mysql_conn;
+ }
+ }
+ mysql_conn = malloc(sizeof(*mysql_conn));
+ mysql_conn->mysql_conn = mysql_init(NULL);
+ mysql_conn->tid = tid;
+ mysql_conn->used_results = NULL;
+ mysql_conn->escaped_strings = NULL;
+ mysql_conn->next = mysql_conns;
+ mysql_conns = mysql_conn;
+ if (!mysql_real_connect(mysql_conn->mysql_conn, mysql_host, mysql_user, mysql_pass, mysql_base, mysql_serverport, NULL, 0)) {
+ //error
+ show_mysql_error();
+ }
+ DESYNCHRONIZE(synchronized);
+ return mysql_conn;
+}
+
+MYSQL *get_mysql_conn() {
+ struct mysql_conn_struct *mysql_conn = get_mysql_conn_struct();
+ return mysql_conn->mysql_conn;
+}
projects / NeonServV5.git / blobdiff