diff --git a/src/teamspeak2.c b/src/teamspeak2.c
index b7992d808524ded44b81678cd8da890a8970546f..5cd427afc2bb5ccb0c173d8791401e51fe682707 100644 (file)
--- a/src/teamspeak2.c
+++ b/src/teamspeak2.c
if (plugin_instance != NULL)
sstrncpy (vl.plugin_instance, plugin_instance,
sizeof (vl.plugin_instance));
-
+
+ sstrncpy (vl.type, type, sizeof (vl.type));
+
if (type_instance != NULL)
sstrncpy (vl.type_instance, type_instance,
sizeof (vl.type_instance));
- plugin_dispatch_values (type, &vl);
+ plugin_dispatch_values (&vl);
} /* void tss2_submit_gauge */
static void tss2_submit_io (const char *plugin_instance, const char *type,
if (plugin_instance != NULL)
sstrncpy (vl.plugin_instance, plugin_instance,
sizeof (vl.plugin_instance));
-
- plugin_dispatch_values (type, &vl);
+
+ sstrncpy (vl.type, type, sizeof (vl.type));
+
+ plugin_dispatch_values (&vl);
} /* void tss2_submit_gauge */
static void tss2_close_socket (void)
@@ -372,8 +376,7 @@ static int tss2_select_vserver (FILE *read_fh, FILE *write_fh, vserver_list_t *v
int status;
/* Send request */
- snprintf (command, sizeof (command), "sel %i\r\n", vserver->port);
- command[sizeof (command) - 1] = 0;
+ ssnprintf (command, sizeof (command), "sel %i\r\n", vserver->port);
status = tss2_send_request (write_fh, command);
if (status != 0)
@@ -389,7 +392,7 @@ 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 ((strncasecmp ("OK", response, 2) == 0)
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)
else
{
/* Request server information */
- snprintf (plugin_instance, sizeof (plugin_instance), "vserver%i",
+ ssnprintf (plugin_instance, sizeof (plugin_instance), "vserver%i",
vserver->port);
- plugin_instance[sizeof (plugin_instance) - 1] = 0;
/* Select the server */
status = tss2_select_vserver (read_fh, write_fh, vserver);