X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fteamspeak2.c;h=502145d36dc89bd459be4f32636da13747510665;hb=61a1fa91ba73e4fe3a34949f77c5f017056f2b7a;hp=50e8d2235144395f2c20c6c1ebe868c52f8d24d4;hpb=6117cc8d4d9bfa911e0268fe1ddfc4386ba0eaec;p=collectd.git

diff --git a/src/teamspeak2.c b/src/teamspeak2.c
index 50e8d223..502145d3 100644
--- a/src/teamspeak2.c
+++ b/src/teamspeak2.c
@@ -129,19 +129,20 @@ static void tss2_submit_gauge (const char *plugin_instance,
 
 	vl.values     = values;
 	vl.values_len = 1;
-	vl.time       = time (NULL);
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "teamspeak2", sizeof (vl.plugin));
 
 	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,
@@ -158,15 +159,16 @@ static void tss2_submit_io (const char *plugin_instance, const char *type,
 
 	vl.values     = values;
 	vl.values_len = 2;
-	vl.time       = time (NULL);
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "teamspeak2", sizeof (vl.plugin));
 
 	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)
@@ -297,6 +299,13 @@ static int tss2_get_socket (FILE **ret_read_fh, FILE **ret_write_fh)
 		char *buffer_ptr;
 
 		buffer_ptr = fgets (buffer, sizeof (buffer), global_read_fh);
+		if (buffer_ptr == NULL)
+		{
+			WARNING ("teamspeak2 plugin: Unexpected EOF received "
+					"from remote host %s:%s.",
+					config_host ? config_host : DEFAULT_HOST,
+					config_port ? config_port : DEFAULT_PORT);
+		}
 		buffer[sizeof (buffer) - 1] = 0;
 
 		if (memcmp ("[TS]\r\n", buffer, 6) != 0)
@@ -371,11 +380,8 @@ 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;
+	ssnprintf (command, sizeof (command), "sel %i\r\n", vserver->port);
 
 	status = tss2_send_request (write_fh, command);
 	if (status != 0)
@@ -391,7 +397,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)
@@ -407,7 +413,7 @@ static int tss2_select_vserver (FILE *read_fh, FILE *write_fh, vserver_list_t *v
 } /* int tss2_select_vserver */
 
 static int tss2_vserver_gapl (FILE *read_fh, FILE *write_fh,
-		vserver_list_t *vserver, gauge_t *ret_value)
+		gauge_t *ret_value)
 {
 	/*
 	 * Reads the vserver's average packet loss and submits it to collectd.
@@ -417,9 +423,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 +445,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)
@@ -525,8 +528,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,11 +535,8 @@ 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",
+		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);
@@ -686,7 +684,7 @@ static int tss2_read_vserver (vserver_list_t *vserver)
 	 * with an error. */
 	if ((status == 0) && (vserver != NULL))
 	{
-		status = tss2_vserver_gapl (read_fh, write_fh, vserver, &packet_loss);
+		status = tss2_vserver_gapl (read_fh, write_fh, &packet_loss);
 		if (status == 0)
 		{
 			valid |= 0x20;
@@ -780,8 +778,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 +804,6 @@ static int tss2_read (void)
 			continue;
 		}
 	}
-	DEBUG("teamspeak2 plugin: Poll done");
 	
 	if (success == 0)
 		return (-1);