X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Funixsock.c;h=3dac88a49b437ec8105c170faf1366c65178f605;hb=a019b6c8144745db63c599680bd693ac02f11666;hp=8701cb9d43abb9d1db959cf2ddcfe565b70da7f3;hpb=78e83f7d68d154e8d6cdb876162abc90993aed79;p=collectd.git

diff --git a/src/unixsock.c b/src/unixsock.c
index 8701cb9d..3dac88a4 100644
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -158,7 +158,7 @@ static int us_open_socket (void)
 static void *us_handle_client (void *arg)
 {
 	int fd;
-	FILE *fh;
+	FILE *fhin, *fhout;
 	char buffer[1024];
 	char *fields[128];
 	int   fields_num;
@@ -169,8 +169,8 @@ static void *us_handle_client (void *arg)
 
 	DEBUG ("Reading from fd #%i", fd);
 
-	fh = fdopen (fd, "r+");
-	if (fh == NULL)
+	fhin  = fdopen (fd, "r");
+	if (fhin == NULL)
 	{
 		char errbuf[1024];
 		ERROR ("unixsock plugin: fdopen failed: %s",
@@ -179,10 +179,44 @@ static void *us_handle_client (void *arg)
 		pthread_exit ((void *) 1);
 	}
 
-	while (fgets (buffer, sizeof (buffer), fh) != NULL)
+	fhout = fdopen (fd, "w");
+	if (fhout == NULL)
+	{
+		char errbuf[1024];
+		ERROR ("unixsock plugin: fdopen failed: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		fclose (fhin); /* this closes fd as well */
+		pthread_exit ((void *) 1);
+	}
+
+	/* change output buffer to line buffered mode */
+	if (setvbuf (fhout, NULL, _IOLBF, 0) != 0)
+	{
+		char errbuf[1024];
+		ERROR ("unixsock plugin: setvbuf failed: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		fclose (fhin);
+		fclose (fhout);
+		pthread_exit ((void *) 1);
+	}
+
+	while (42)
 	{
 		int len;
 
+		errno = 0;
+		if (fgets (buffer, sizeof (buffer), fhin) == NULL)
+		{
+			if (errno != 0)
+			{
+				char errbuf[1024];
+				WARNING ("unixsock plugin: failed to read from socket #%i: %s",
+						fileno (fhin),
+						sstrerror (errno, errbuf, sizeof (errbuf)));
+			}
+			break;
+		}
+
 		len = strlen (buffer);
 		while ((len > 0)
 				&& ((buffer[len - 1] == '\n') || (buffer[len - 1] == '\r')))
@@ -204,33 +238,40 @@ static void *us_handle_client (void *arg)
 
 		if (strcasecmp (fields[0], "getval") == 0)
 		{
-			handle_getval (fh, fields, fields_num);
+			handle_getval (fhout, fields, fields_num);
 		}
 		else if (strcasecmp (fields[0], "putval") == 0)
 		{
-			handle_putval (fh, fields, fields_num);
+			handle_putval (fhout, fields, fields_num);
 		}
 		else if (strcasecmp (fields[0], "listval") == 0)
 		{
-			handle_listval (fh, fields, fields_num);
+			handle_listval (fhout, fields, fields_num);
 		}
 		else if (strcasecmp (fields[0], "putnotif") == 0)
 		{
-			handle_putnotif (fh, fields, fields_num);
+			handle_putnotif (fhout, fields, fields_num);
 		}
 		else if (strcasecmp (fields[0], "flush") == 0)
 		{
-			handle_flush (fh, fields, fields_num);
+			handle_flush (fhout, fields, fields_num);
 		}
 		else
 		{
-			fprintf (fh, "-1 Unknown command: %s\n", fields[0]);
-			fflush (fh);
+			if (fprintf (fhout, "-1 Unknown command: %s\n", fields[0]) < 0)
+			{
+				char errbuf[1024];
+				WARNING ("unixsock plugin: failed to write to socket #%i: %s",
+						fileno (fhout),
+						sstrerror (errno, errbuf, sizeof (errbuf)));
+				break;
+			}
 		}
 	} /* while (fgets) */
 
 	DEBUG ("Exiting..");
-	close (fd);
+	fclose (fhin);
+	fclose (fhout);
 
 	pthread_exit ((void *) 0);
 	return ((void *) 0);
@@ -341,8 +382,15 @@ static int us_config (const char *key, const char *val)
 
 static int us_init (void)
 {
+	static int have_init = 0;
+
 	int status;
 
+	/* Initialize only once. */
+	if (have_init != 0)
+		return (0);
+	have_init = 1;
+
 	loop = 1;
 
 	status = pthread_create (&listen_thread, NULL, us_server_thread, NULL);
@@ -371,7 +419,6 @@ static int us_shutdown (void)
 	}
 
 	plugin_unregister_init ("unixsock");
-	plugin_unregister_write ("unixsock");
 	plugin_unregister_shutdown ("unixsock");
 
 	return (0);