-/* 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 "14"
+#include "ConfigParser.h"
+#include "tools.h"
+#define DATABASE_VERSION "20"
+
+static void show_mysql_error();
struct mysql_conn_struct {
- unsigned long tid;
+ unsigned int tid;
MYSQL *mysql_conn;
struct used_result *used_results;
struct escaped_string *escaped_strings;
static pthread_mutex_t synchronized;
#endif
-void check_mysql() {
+static void check_mysql() {
MYSQL *mysql_conn = get_mysql_conn();
int errid;
if((errid = mysql_ping(mysql_conn))) {
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);
+int reload_mysql() {
+ char *new_mysql_host = get_string_field("MySQL.host");
+ char *new_mysql_user = get_string_field("MySQL.user");
+ char *new_mysql_pass = get_string_field("MySQL.pass");
+ char *new_mysql_base = get_string_field("MySQL.base");
+ if(!(new_mysql_host && new_mysql_user && new_mysql_pass && new_mysql_base))
+ return 0;
+
+ //replace login data
+ if(mysql_host)
+ free(mysql_host);
+ mysql_host = strdup(new_mysql_host);
+
+ if(mysql_user)
+ free(mysql_user);
+ mysql_user = strdup(new_mysql_user);
+
+ if(mysql_pass)
+ free(mysql_pass);
+ mysql_pass = strdup(new_mysql_pass);
+ if(mysql_base)
+ free(mysql_base);
+ mysql_base = strdup(new_mysql_base);
+
+ mysql_serverport = get_int_field("MySQL.port");
+ if(!mysql_serverport)
+ mysql_serverport = 3306;
+ return 1;
+}
+
+void init_mysql() {
+ THREAD_MUTEX_INIT(synchronized);
MYSQL *mysql_conn = get_mysql_conn();
version = atoi(row[0]);
}
}
- printf("%d \n", version);
if(!version) {
//CREATE DATABASE
FILE *f = fopen("database.sql", "r");
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, ...) {
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)) {
va_end(arg_list);
if (pos < 0 || pos > (len - 2)) pos = len - 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)) {
struct mysql_conn_struct *get_mysql_conn_struct() {
SYNCHRONIZE(synchronized);
struct mysql_conn_struct *mysql_conn;
- unsigned long tid = syscall(SYS_gettid);
+ 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);