net.c: Improve documentation of struct crypt_data.

[paraslash.git] / mysql_selector.c

diff --git a/mysql_selector.c b/mysql_selector.c
index b2a925e09311a6cc71bf45c488c73eca8a163e99..bbc05bdf39ddcf9a4f8e9c503d3d21efff72ae67 100644 (file)
--- a/mysql_selector.c
+++ b/mysql_selector.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 1999-2007 Andre Noll <maan@systemlinux.org>
  *
 /*
  * Copyright (C) 1999-2007 Andre Noll <maan@systemlinux.org>
  *

- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.

  */
 
 /** \file mysql_selector.c para_server's mysql-based audio file selector */
  */
 
 /** \file mysql_selector.c para_server's mysql-based audio file selector */


@@ -34,11 +22,13 @@
 #include "string.h"
 #include "user_list.h"
 #include "mysql_selector_command_list.h"
 #include "string.h"
 #include "user_list.h"
 #include "mysql_selector_command_list.h"

+#include "ipc.h"

 
 /** pointer to the shared memory area */
 extern struct misc_meta_data *mmd;
 
 static void *mysql_ptr = NULL;
 
 /** pointer to the shared memory area */
 extern struct misc_meta_data *mmd;
 
 static void *mysql_ptr = NULL;

+static int mysql_lock;

 
 /**
  * contains name/replacement pairs used by s_a_r_list()
 
 /**
  * contains name/replacement pairs used by s_a_r_list()


@@ -77,11 +67,11 @@ static const struct para_macro mysql_macro_list[] = {
 };
 
 /**
 };
 
 /**

- * simple search and replace routine
+ * Simple search and replace routine.

  *
  *

- * \param src source string
- * \param macro_name the name of the macro
- * \param replacement the replacement format string
+ * \param src Source String.
+ * \param macro_name The name of the macro.
+ * \param replacement The replacement format string.

  *
  * In \p src, replace each occurence of \p macro_name(arg) by the string
  * determined by the \p replacement format string. \p replacement may (but
  *
  * In \p src, replace each occurence of \p macro_name(arg) by the string
  * determined by the \p replacement format string. \p replacement may (but


@@ -89,7 +79,7 @@ static const struct para_macro mysql_macro_list[] = {
  * replaced by \p arg.
  *
  * \return A string in which all matches in \p src are replaced, or \p NULL if
  * replaced by \p arg.
  *
  * \return A string in which all matches in \p src are replaced, or \p NULL if

- * an syntax error was encountered. Caller must free the result.
+ * an error was encountered. Caller must free the result.

  *
  * \sa regcomp(3)
  */
  *
  * \sa regcomp(3)
  */


@@ -105,7 +95,8 @@ __must_check __malloc static char *s_a_r(const char *src, const char* macro_name
 
        if (!macro_name || !replacement || !src)
                return para_strdup(src);
 
        if (!macro_name || !replacement || !src)
                return para_strdup(src);

-       regcomp(&preg, macro_name, 0);
+       if (regcomp(&preg, macro_name, 0) != 0)
+               return NULL;

        while (regexec(&preg,  bufptr, nmatch, pmatch, eflags)
                        != REG_NOMATCH) {
                char *tmp, *arg, *o_bracket, *c_bracket;
        while (regexec(&preg,  bufptr, nmatch, pmatch, eflags)
                        != REG_NOMATCH) {
                char *tmp, *arg, *o_bracket, *c_bracket;


@@ -164,7 +155,7 @@ __must_check __malloc static char *s_a_r_list(const struct para_macro *macro_lis
        return ret;
 }
 
        return ret;
 }
 

-static int real_query(const char *query)
+static int lockless_real_query(const char *query)

 {
        if (!mysql_ptr)
                return -E_NOTCONN;
 {
        if (!mysql_ptr)
                return -E_NOTCONN;


@@ -177,19 +168,32 @@ static int real_query(const char *query)
        return 1;
 }
 
        return 1;
 }
 

+static int real_query(const char *query)
+{
+       int ret;
+
+       mutex_lock(mysql_lock);
+       ret = lockless_real_query(query);
+       mutex_unlock(mysql_lock);
+       return ret;
+}
+

 /*
  * Use open connection given by mysql_ptr to query server. Returns a
  * result pointer on succes and NULL on errors
  */
 static struct MYSQL_RES *get_result(const char *query)
 {
 /*
  * Use open connection given by mysql_ptr to query server. Returns a
  * result pointer on succes and NULL on errors
  */
 static struct MYSQL_RES *get_result(const char *query)
 {

-       void *result;
+       void *result = NULL;

 
 

-       if (real_query(query) < 0)
-               return NULL;
+       mutex_lock(mysql_lock);
+       if (lockless_real_query(query) < 0)
+               goto out;

        result = mysql_store_result(mysql_ptr);
        if (!result)
                PARA_ERROR_LOG("%s", "store_result error\n");
        result = mysql_store_result(mysql_ptr);
        if (!result)
                PARA_ERROR_LOG("%s", "store_result error\n");

+out:
+       mutex_unlock(mysql_lock);

        return result;
 }
 /*
        return result;
 }
 /*


@@ -228,11 +232,11 @@ out:
        return ret;
 }
 
        return ret;
 }
 

-static char *escape_blob(const char* old, int size)
+static char *escape_blob(const char* old, size_t size)

 {
        char *new;
 
 {
        char *new;
 

-       if (!mysql_ptr || size < 0)
+       if (!mysql_ptr)

                return NULL;
        new = para_malloc(2 * size * sizeof(char) + 1);
        mysql_real_escape_string(mysql_ptr, new, old, size);
                return NULL;
        new = para_malloc(2 * size * sizeof(char) + 1);
        mysql_real_escape_string(mysql_ptr, new, old, size);


@@ -368,8 +372,8 @@ int com_picadd(int fd, int argc, char *argv[])
  * print results to fd
  */
 static int print_results(int fd, void *result,
  * print results to fd
  */
 static int print_results(int fd, void *result,

-               unsigned int top, unsigned int left,
-               unsigned int bottom, unsigned int right)
+               my_ulonglong top, my_ulonglong left,
+               my_ulonglong bottom, my_ulonglong right)

 {
        unsigned int i,j;
        int ret;
 {
        unsigned int i,j;
        int ret;


@@ -399,7 +403,7 @@ int com_verb(int fd, int argc, char *argv[])
 {
        void *result = NULL;
        int ret;
 {
        void *result = NULL;
        int ret;

-       unsigned int num_rows, num_fields;
+       my_ulonglong num_rows, num_fields, top = 0, left = 0;

        char *tmp;
 
        if (argc < 2)
        char *tmp;
 
        if (argc < 2)


@@ -416,7 +420,7 @@ int com_verb(int fd, int argc, char *argv[])
        num_rows = mysql_num_rows(result);
        ret = 1;
        if (num_fields && num_rows)
        num_rows = mysql_num_rows(result);
        ret = 1;
        if (num_fields && num_rows)

-               ret = print_results(fd, result, 0, 0, num_rows - 1,
+               ret = print_results(fd, result, top, left, num_rows - 1,

                        num_fields - 1);
        mysql_free_result(result);
        return ret;
                        num_fields - 1);
        mysql_free_result(result);
        return ret;


@@ -435,7 +439,7 @@ static void *get_all_attributes(void)
                mysql_free_result(result);
                return NULL;
        }
                mysql_free_result(result);
                return NULL;
        }

-       mysql_data_seek(result, 4); /* skip Lastplayed, Numplayed... */
+       mysql_data_seek(result, (my_ulonglong)4); /* skip Lastplayed, Numplayed... */

        return result;
 }
 
        return result;
 }
 


@@ -446,13 +450,18 @@ int com_laa(int fd, int argc, __a_unused char *argv[])
 {
        void *result;
        int ret;
 {
        void *result;
        int ret;

+       my_ulonglong top = 0, left = 0, bottom, right = 0;

 
        if (argc != 1)
                return -E_MYSQL_SYNTAX;
        result = get_all_attributes();
        if (!result)
                return -E_NOATTS;
 
        if (argc != 1)
                return -E_MYSQL_SYNTAX;
        result = get_all_attributes();
        if (!result)
                return -E_NOATTS;

-       ret = print_results(fd, result, 0, 0, mysql_num_rows(result) - 5, 0);
+       bottom = mysql_num_rows(result);
+       if (bottom < 5)
+               return -E_MYSQL_SYNTAX;
+       bottom -= 5;
+       ret = print_results(fd, result, top, left, bottom, right);

        mysql_free_result(result);
        return ret;
 }
        mysql_free_result(result);
        return ret;
 }


@@ -465,7 +474,7 @@ int com_hist(int fd, int argc, char *argv[])
        int ret;
        void *result = NULL;
        char *q, *atts;
        int ret;
        void *result = NULL;
        char *q, *atts;

-       unsigned int num_rows;
+       my_ulonglong num_rows, top = 0, left = 0, right = 1;

 
        if (argc > 3)
                return -E_MYSQL_SYNTAX;
 
        if (argc > 3)
                return -E_MYSQL_SYNTAX;


@@ -488,7 +497,7 @@ int com_hist(int fd, int argc, char *argv[])
        num_rows = mysql_num_rows(result);
        ret = 1;
        if (num_rows)
        num_rows = mysql_num_rows(result);
        ret = 1;
        if (num_rows)

-               ret = print_results(fd, result, 0, 0, num_rows - 1, 1);
+               ret = print_results(fd, result, top, left, num_rows - 1, right);

        mysql_free_result(result);
        return ret;
 }
        mysql_free_result(result);
        return ret;
 }


@@ -501,6 +510,7 @@ int com_last(int fd, int argc, char *argv[])
        void *result = NULL;
        char *q;
        int num, ret;
        void *result = NULL;
        char *q;
        int num, ret;

+       my_ulonglong top = 0, left = 0, right = 0;

 
        if (argc < 2)
                num = 10;
 
        if (argc < 2)
                num = 10;


@@ -514,7 +524,8 @@ int com_last(int fd, int argc, char *argv[])
        free(q);
        if (!result)
                return -E_NORESULT;
        free(q);
        if (!result)
                return -E_NORESULT;

-       ret = print_results(fd, result, 0, 0, mysql_num_rows(result) - 1, 0);
+       ret = print_results(fd, result, top, left, mysql_num_rows(result) - 1,
+               right);

        mysql_free_result(result);
        return ret;
 }
        mysql_free_result(result);
        return ret;
 }


@@ -524,7 +535,7 @@ int com_mbox(int fd, int argc, char *argv[])
        void *result;
        MYSQL_ROW row;
        int ret;
        void *result;
        MYSQL_ROW row;
        int ret;

-       unsigned int num_rows, num_fields;
+       my_ulonglong num_rows, num_fields, top = 0, left = 0;

        char *query = para_strdup("select concat('From foo@localhost ', "
                "date_format(Lastplayed, '%a %b %e %T %Y'), "
                "'\nReceived: from\nTo: bar\n");
        char *query = para_strdup("select concat('From foo@localhost ', "
                "date_format(Lastplayed, '%a %b %e %T %Y'), "
                "'\nReceived: from\nTo: bar\n");


@@ -571,7 +582,8 @@ int com_mbox(int fd, int argc, char *argv[])
        num_rows = mysql_num_rows(result);
        if (!num_fields || !num_rows)
                goto out;
        num_rows = mysql_num_rows(result);
        if (!num_fields || !num_rows)
                goto out;

-       ret = print_results(fd, result, 0, 0, num_rows - 1, num_fields - 1);
+       ret = print_results(fd, result, top, left, num_rows - 1,
+               num_fields - 1);

 out:
        free(query);
        if (result)
 out:
        free(query);
        if (result)


@@ -592,7 +604,8 @@ static char *get_atts(char *name, int verbose)
        void *result = NULL, *result2 = NULL;
        MYSQL_ROW row, row2;
        int i;
        void *result = NULL, *result2 = NULL;
        MYSQL_ROW row, row2;
        int i;

-       unsigned num_fields;
+       my_ulonglong num_fields, offset = 4; /* skip Lastplayed, Numplayed... */
+

 
        result2 = get_all_attributes();
        if (!result2)
 
        result2 = get_all_attributes();
        if (!result2)


@@ -609,7 +622,7 @@ static char *get_atts(char *name, int verbose)
        num_fields = mysql_num_fields(result);
        if (num_fields < 5)
                goto out;
        num_fields = mysql_num_fields(result);
        if (num_fields < 5)
                goto out;

-       mysql_data_seek(result2, 4); /* skip Lastplayed, Numplayed... */
+       mysql_data_seek(result2, offset);

        row = mysql_fetch_row(result);
        if (!row)
                goto out;
        row = mysql_fetch_row(result);
        if (!row)
                goto out;


@@ -994,7 +1007,7 @@ static int get_pic_id_by_name(char *name)
 {
        char *q, *ebn;
        void *result = NULL;
 {
        char *q, *ebn;
        void *result = NULL;

-       long unsigned ret;
+       int ret;

        MYSQL_ROW row;
 
        if (!(ebn = escaped_basename(name)))
        MYSQL_ROW row;
 
        if (!(ebn = escaped_basename(name)))


@@ -1008,7 +1021,7 @@ static int get_pic_id_by_name(char *name)
        row = mysql_fetch_row(result);
        ret = -E_NOROW;
        if (row && row[0])
        row = mysql_fetch_row(result);
        ret = -E_NOROW;
        if (row && row[0])

-               ret = atol(row[0]);
+               ret = atoi(row[0]);

        mysql_free_result(result);
        return ret;
 }
        mysql_free_result(result);
        return ret;
 }


@@ -1367,7 +1380,7 @@ int com_ls(int fd, int argc, char *argv[])
        char *q;
        void *result;
        int ret;
        char *q;
        void *result;
        int ret;

-       unsigned int num_rows;
+       my_ulonglong num_rows, top = 0, left = 0, right = 0;

 
        if (argc > 2)
                return -E_MYSQL_SYNTAX;
 
        if (argc > 2)
                return -E_MYSQL_SYNTAX;


@@ -1387,7 +1400,7 @@ int com_ls(int fd, int argc, char *argv[])
        num_rows = mysql_num_rows(result);
        ret = 1;
        if (num_rows)
        num_rows = mysql_num_rows(result);
        ret = 1;
        if (num_rows)

-               ret = print_results(fd, result, 0, 0, num_rows - 1, 0);
+               ret = print_results(fd, result, top, left, num_rows - 1, right);

        mysql_free_result(result);
        return ret;
 }
        mysql_free_result(result);
        return ret;
 }


@@ -1520,11 +1533,12 @@ static int com_ps_ns(__a_unused int fd, int argc, char *argv[])
        char *query, *stream = get_current_stream();
        void *result = get_result("select name from streams");
        MYSQL_ROW row;
        char *query, *stream = get_current_stream();
        void *result = get_result("select name from streams");
        MYSQL_ROW row;

-       int match = -1, ret, i;
-       unsigned int num_rows;
+       int ret;
+       my_ulonglong num_rows, match, i;

 
 

+       ret = -E_MYSQL_SYNTAX;

        if (argc != 1)
        if (argc != 1)

-               return -E_MYSQL_SYNTAX;
+               goto out;

        ret = -E_NORESULT;
        if (!result)
                goto out;
        ret = -E_NORESULT;
        if (!result)
                goto out;


@@ -1539,14 +1553,13 @@ static int com_ps_ns(__a_unused int fd, int argc, char *argv[])
                        goto out;
                if (!strcmp(row[0], "current_stream"))
                        continue;
                        goto out;
                if (!strcmp(row[0], "current_stream"))
                        continue;

-               if (!strcmp(row[0], stream)) {
-                       match = i;
+               if (!strcmp(row[0], stream))

                        break;
                        break;

-               }

        }
        ret = -E_NO_STREAM;
        }
        ret = -E_NO_STREAM;

-       if (match < 0)
+       if (i == num_rows)

                goto out;
                goto out;

+       match = i;

        if (!strcmp(argv[0], "ps"))
                i = match > 0? match - 1 : num_rows - 1;
        else
        if (!strcmp(argv[0], "ps"))
                i = match > 0? match - 1 : num_rows - 1;
        else


@@ -1558,8 +1571,7 @@ static int com_ps_ns(__a_unused int fd, int argc, char *argv[])
                goto out;
        if (!strcmp(row[0], "current_stream")) {
                if (!strcmp(argv[0], "ps")) {
                goto out;
        if (!strcmp(row[0], "current_stream")) {
                if (!strcmp(argv[0], "ps")) {

-                       i = match - 2;
-                       i = i < 0? i + num_rows : i;
+                       i = match < 2? match + num_rows - 2 : match - 2;

                } else {
                        i = match + 2;
                        i = i > num_rows - 1? i - num_rows : i;
                } else {
                        i = match + 2;
                        i = i > num_rows - 1? i - num_rows : i;


@@ -1934,9 +1946,9 @@ static int com_vrfy_clean(int fd, int argc, __a_unused char *argv[])
        char *query;
        int ret, vrfy_mode = strcmp(argv[0], "clean");
        void *result = NULL;
        char *query;
        int ret, vrfy_mode = strcmp(argv[0], "clean");
        void *result = NULL;

-       unsigned int num_rows;

        MYSQL_ROW row;
        char *escaped_name;
        MYSQL_ROW row;
        char *escaped_name;

+       my_ulonglong num_rows, top = 0, left = 0, right = 0;

 
        if (argc != 1)
                return -E_MYSQL_SYNTAX;
 
        if (argc != 1)
                return -E_MYSQL_SYNTAX;


@@ -1951,9 +1963,9 @@ static int com_vrfy_clean(int fd, int argc, __a_unused char *argv[])
                goto out;
        }
        if (vrfy_mode) {
                goto out;
        }
        if (vrfy_mode) {

-               send_va_buffer(fd, "found %i invalid entr%s\n", num_rows,
+               send_va_buffer(fd, "found %lli invalid entr%s\n", num_rows,

                        num_rows == 1? "y" : "ies");
                        num_rows == 1? "y" : "ies");

-               ret = print_results(fd, result, 0, 0, num_rows - 1, 0);
+               ret = print_results(fd, result, top, left, num_rows - 1, right);

                goto out;
        }
        while ((row = mysql_fetch_row(result))) {
                goto out;
        }
        while ((row = mysql_fetch_row(result))) {


@@ -2141,14 +2153,17 @@ success:
 static int init_mysql_server(void)
 {
        char *u = conf.mysql_user_arg? conf.mysql_user_arg : para_logname();
 static int init_mysql_server(void)
 {
        char *u = conf.mysql_user_arg? conf.mysql_user_arg : para_logname();

+       unsigned int port;

 
        mysql_ptr = mysql_init(NULL);
        if (!mysql_ptr) {
                PARA_CRIT_LOG("%s", "mysql init error\n");
                return -E_NOTCONN;
        }
 
        mysql_ptr = mysql_init(NULL);
        if (!mysql_ptr) {
                PARA_CRIT_LOG("%s", "mysql init error\n");
                return -E_NOTCONN;
        }

-       PARA_DEBUG_LOG("connecting: %s@%s:%d\n", u, conf.mysql_host_arg,
-               conf.mysql_port_arg);
+       if (conf.mysql_port_arg < 0)
+               return -E_MYSQL_SYNTAX;
+       port = conf.mysql_port_arg;
+       PARA_DEBUG_LOG("connecting: %s@%s:%d\n", u, conf.mysql_host_arg, port);

        if (!conf.mysql_user_arg)
                free(u);
        /*
        if (!conf.mysql_user_arg)
                free(u);
        /*


@@ -2160,7 +2175,7 @@ static int init_mysql_server(void)
                        conf.mysql_user_arg,
                        conf.mysql_passwd_arg,
                        conf.mysql_database_arg,
                        conf.mysql_user_arg,
                        conf.mysql_passwd_arg,
                        conf.mysql_database_arg,

-                       conf.mysql_port_arg, NULL, 0))) {
+                       port, NULL, 0))) {

                PARA_CRIT_LOG("%s", "connect error\n");
                return -E_NOTCONN;
        }
                PARA_CRIT_LOG("%s", "connect error\n");
                return -E_NOTCONN;
        }


@@ -2245,11 +2260,19 @@ out:
 
 static void shutdown_connection(void)
 {
 
 static void shutdown_connection(void)
 {

+       int ret;
+

        if (mysql_ptr) {
                PARA_NOTICE_LOG("%s", "shutting down mysql connection\n");
                mysql_close(mysql_ptr);
                mysql_ptr = NULL;
        }
        if (mysql_ptr) {
                PARA_NOTICE_LOG("%s", "shutting down mysql connection\n");
                mysql_close(mysql_ptr);
                mysql_ptr = NULL;
        }

+       if (mysql_lock) {
+               ret = mutex_destroy(mysql_lock);
+               if (ret < 0)
+                       PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+               mysql_lock = 0;
+       }

 }
 
 /**
 }
 
 /**


@@ -2281,6 +2304,10 @@ int mysql_selector_init(struct audio_file_selector *db)
        db->get_audio_file_list = server_get_audio_file_list;
        db->update_audio_file = update_audio_file_server_handler;
        db->shutdown = shutdown_connection;
        db->get_audio_file_list = server_get_audio_file_list;
        db->update_audio_file = update_audio_file_server_handler;
        db->shutdown = shutdown_connection;

+       ret = mutex_new();
+       if (ret < 0)
+               return ret;
+       mysql_lock = ret;

        ret = init_mysql_server();
        if (ret < 0)
                PARA_WARNING_LOG("%s\n", PARA_STRERROR(-ret));
        ret = init_mysql_server();
        if (ret < 0)
                PARA_WARNING_LOG("%s\n", PARA_STRERROR(-ret));