X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fteamspeak2.c;h=201e1828a2b2037093fde4b02c45709a53d6d062;hb=a7eecf6018a684dcf8323d4a41a7e704a5d57f02;hp=d4bf2aa40dcb1d3172fce8f6d4878f19461e296c;hpb=6e419a825c50f9c97471aba7d50521bfc7e19828;p=collectd.git

diff --git a/src/teamspeak2.c b/src/teamspeak2.c
index d4bf2aa4..201e1828 100644
--- a/src/teamspeak2.c
+++ b/src/teamspeak2.c
@@ -18,15 +18,15 @@
  *
  * Authors:
  *   Stefan Hacker <d0t at dbclan dot de>
- *   Florian Forster <octo at verplant.org>
+ *   Florian Forster <octo at collectd.org>
  **/
 
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
 
-#include <arpa/inet.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
@@ -146,7 +146,7 @@ static void tss2_submit_gauge (const char *plugin_instance,
 } /* void tss2_submit_gauge */
 
 static void tss2_submit_io (const char *plugin_instance, const char *type,
-		counter_t rx, counter_t tx)
+		derive_t rx, derive_t tx)
 {
 	/*
 	 * Submits the io rx/tx tuple to the collectd daemon
@@ -154,8 +154,8 @@ static void tss2_submit_io (const char *plugin_instance, const char *type,
 	value_t values[2];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].counter = rx;
-	values[1].counter = tx;
+	values[0].derive = rx;
+	values[1].derive = tx;
 
 	vl.values     = values;
 	vl.values_len = 2;
@@ -299,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)
@@ -432,7 +439,7 @@ static int tss2_vserver_gapl (FILE *read_fh, FILE *write_fh,
 		status = tss2_receive_line (read_fh, buffer, sizeof (buffer));
 		if (status != 0)
 		{
-			/* Set to NULL just to make sure noone uses these FHs anymore. */
+			/* Set to NULL just to make sure no one uses these FHs anymore. */
 			read_fh = NULL;
 			write_fh = NULL;
 			ERROR ("teamspeak2 plugin: tss2_receive_line failed.");
@@ -498,10 +505,10 @@ static int tss2_read_vserver (vserver_list_t *vserver)
 	gauge_t users = NAN;
 	gauge_t channels = NAN;
 	gauge_t servers = NAN;
-	counter_t rx_octets = 0;
-	counter_t tx_octets = 0;
-	counter_t rx_packets = 0;
-	counter_t tx_packets = 0;
+	derive_t rx_octets = 0;
+	derive_t tx_octets = 0;
+	derive_t rx_packets = 0;
+	derive_t tx_packets = 0;
 	gauge_t packet_loss = NAN;
 	int valid = 0;
 
@@ -557,7 +564,7 @@ static int tss2_read_vserver (vserver_list_t *vserver)
 		status = tss2_receive_line (read_fh, buffer, sizeof (buffer));
 		if (status != 0)
 		{
-			/* Set to NULL just to make sure noone uses these FHs anymore. */
+			/* Set to NULL just to make sure no one uses these FHs anymore. */
 			read_fh = NULL;
 			write_fh = NULL;
 			ERROR ("teamspeak2 plugin: tss2_receive_line failed.");