ChangeLog: Added the changed poisoning behavior.

[collectd.git] / src / teamspeak2.c

diff --git a/src/teamspeak2.c b/src/teamspeak2.c
index 3bad6b0ebabdee773f9828e26756704876d554d8..52a1007ed4fcddd300955d3dbd55c40268830e53 100644 (file)
--- a/src/teamspeak2.c
+++ b/src/teamspeak2.c
@@ -371,8 +371,6 @@ static int tss2_select_vserver (FILE *read_fh, FILE *write_fh, vserver_list_t *v
        char response[128];
        int status;
 
-       DEBUG("teamspeak2 plugin: Select server %i", vserver->port);
-       
        /* Send request */
        snprintf (command, sizeof (command), "sel %i\r\n", vserver->port);
        command[sizeof (command) - 1] = 0;
@@ -391,10 +389,10 @@ static int tss2_select_vserver (FILE *read_fh, FILE *write_fh, vserver_list_t *v
                ERROR ("teamspeak2 plugin: tss2_receive_line failed.");
                return (-1);
        }
-       response[sizeof (response)] = 0;
+       response[sizeof (response) - 1] = 0;
 
        /* Check answer */
-       if ((strncmp ("OK", response, 2) == 0)
+       if ((strncasecmp ("OK", response, 2) == 0)
                        && ((response[2] == 0)
                                || (response[2] == '\n')
                                || (response[2] == '\r')))
@@ -417,9 +415,6 @@ static int tss2_vserver_gapl (FILE *read_fh, FILE *write_fh,
        gauge_t packet_loss = NAN;
        int status;
 
-       DEBUG("teamspeak2 plugin: Get average packet loss (VServer: %i)",
-                       vserver->port);
-       
        status = tss2_send_request (write_fh, "gapl\r\n");
        if (status != 0)
        {
@@ -442,7 +437,7 @@ static int tss2_vserver_gapl (FILE *read_fh, FILE *write_fh,
                        ERROR ("teamspeak2 plugin: tss2_receive_line failed.");
                        return (-1);
                }
-               buffer[sizeof (buffer)] = 0;
+               buffer[sizeof (buffer) - 1] = 0;
                
                if (strncmp ("average_packet_loss=", buffer,
                                        strlen ("average_packet_loss=")) == 0)
@@ -471,7 +466,7 @@ static int tss2_vserver_gapl (FILE *read_fh, FILE *write_fh,
                                continue;
                        }
                }
-               else if (strncmp ("OK", buffer, 2) == 0)
+               else if (strncasecmp ("OK", buffer, 2) == 0)
                {
                        break;
                }
@@ -525,8 +520,6 @@ static int tss2_read_vserver (vserver_list_t *vserver)
        if (vserver == NULL)
        {
                /* Request global information */
-               DEBUG("teamspeak2 plugin: Read global server information");
-       
                memset (plugin_instance, 0, sizeof (plugin_instance));
 
                status = tss2_send_request (write_fh, "gi\r\n");
@@ -534,8 +527,6 @@ static int tss2_read_vserver (vserver_list_t *vserver)
        else
        {
                /* Request server information */
-               DEBUG("teamspeak2 plugin: Read vserver's %i information!", vserver->port);
-       
                snprintf (plugin_instance, sizeof (plugin_instance), "vserver%i",
                                vserver->port);
                plugin_instance[sizeof (plugin_instance) - 1] = 0;
@@ -573,13 +564,13 @@ static int tss2_read_vserver (vserver_list_t *vserver)
                        break;
                }
 
-               if (strncmp ("ERROR", buffer, 5) == 0)
+               if (strncasecmp ("ERROR", buffer, 5) == 0)
                {
                        ERROR ("teamspeak2 plugin: Server returned an error: %s",
                                        buffer);
                        break;
                }
-               else if (strncmp ("OK", buffer, 2) == 0)
+               else if (strncasecmp ("OK", buffer, 2) == 0)
                {
                        break;
                }
@@ -780,8 +771,6 @@ static int tss2_read (void)
        int success = 0;
        int status;
 
-       DEBUG("teamspeak2 plugin: Poll everything");
-       
        /* Handle global server variables */
        status = tss2_read_vserver (NULL);
        if (status == 0)
@@ -808,7 +797,6 @@ static int tss2_read (void)
                        continue;
                }
        }
-       DEBUG("teamspeak2 plugin: Poll done");
        
        if (success == 0)
                return (-1);