Merge branch 'collectd-4.5' into collectd-4.6

[collectd.git] / src / mysql.c

diff --git a/src/mysql.c b/src/mysql.c
index 08df3fa..cd1ff9d 100644 (file)
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/mysql.c
- * Copyright (C) 2006,2007  Florian octo Forster
+ * Copyright (C) 2006–2008  Florian octo Forster
+ * Copyright (C) 2008       Mirko Buffoni
  *
  * 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
@@ -17,6 +18,7 @@
  *
  * Authors:
  *   Florian octo Forster <octo at verplant.org>
+ *   Mirko Buffoni <briareos at eswat.org>
  **/
 
 #include "collectd.h"
@@ -49,7 +51,7 @@ static char *user;
 static char *pass;
 static char *db = NULL;
 static char *socket = NULL;
-static int  port = 0;
+static int   port = 0;
 
 static MYSQL *getconnection (void)
 {
@@ -120,10 +122,33 @@ static int config (const char *key, const char *value)
        else if (strcasecmp (key, "socket") == 0)
                return ((socket = strdup (value)) == NULL ? 1 : 0);
        else if (strcasecmp (key, "port") == 0)
-               return ((port = atoi (value)) == NULL ? 1 : 0);
+       {
+           char *endptr = NULL;
+           int temp;
+
+           errno = 0;
+           temp = strtol (value, &endptr, 0);
+           if ((errno != 0) || (value == endptr))
+           {
+               ERROR ("mysql plugin: Invalid \"Port\" argument: %s",
+                       value);
+               port = 0;
+               return (1);
+           }
+           else if ((temp < 0) || (temp >= 65535))
+           {
+               ERROR ("mysql plugin: Port number out of range: %i",
+                       temp);
+               port = 0;
+               return (1);
+           }
+
+           port = temp;
+           return (0);
+       }
        else
                return (-1);
-}
+} /* int config */
 
 static void counter_submit (const char *type, const char *type_instance,
                counter_t value)
@@ -135,7 +160,6 @@ static void counter_submit (const char *type, const char *type_instance,
 
        vl.values = values;
        vl.values_len = 1;
-       vl.time = time (NULL);
        sstrncpy (vl.host, hostname_g, sizeof (vl.host));
        sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin));
        sstrncpy (vl.type, type, sizeof (vl.type));
@@ -159,7 +183,6 @@ static void qcache_submit (counter_t hits, counter_t inserts,
 
        vl.values = values;
        vl.values_len = 5;
-       vl.time = time (NULL);
        sstrncpy (vl.host, hostname_g, sizeof (vl.host));
        sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin));
        sstrncpy (vl.type, "mysql_qcache", sizeof (vl.type));
@@ -180,7 +203,6 @@ static void threads_submit (gauge_t running, gauge_t connected, gauge_t cached,
 
        vl.values = values;
        vl.values_len = 4;
-       vl.time = time (NULL);
        sstrncpy (vl.host, hostname_g, sizeof (vl.host));
        sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin));
        sstrncpy (vl.type, "mysql_threads", sizeof (vl.type));
@@ -198,7 +220,6 @@ static void traffic_submit (counter_t rx, counter_t tx)
 
        vl.values = values;
        vl.values_len = 2;
-       vl.time = time (NULL);
        sstrncpy (vl.host, hostname_g, sizeof (vl.host));
        sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin));
        sstrncpy (vl.type, "mysql_octets", sizeof (vl.type));