X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fteamspeak2.c;h=c8bf48361230a14a9d1d940008320d34dadfad11;hb=7462900ca1749634a7fa9325c2e71f49e13d0095;hp=a78e700f03a67962132bb9be8dd372dcb68144d5;hpb=619f181d3d5f4f6c90cb8ae228527302ddd35819;p=collectd.git

diff --git a/src/teamspeak2.c b/src/teamspeak2.c
index a78e700f..c8bf4836 100644
--- a/src/teamspeak2.c
+++ b/src/teamspeak2.c
@@ -258,6 +258,7 @@ static int tss2_get_socket (FILE **ret_read_fh, FILE **ret_write_fh)
 			WARNING ("teamspeak2 plugin: connect failed: %s",
 					sstrerror (errno, errbuf, sizeof (errbuf)));
 			close (sd);
+			sd = -1;
 			continue;
 		}
 
@@ -299,6 +300,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)