unixsock plugin: Open two different IO stream handles for reading and writing.

[collectd.git] / src / unixsock.c

diff --git a/src/unixsock.c b/src/unixsock.c
index 8701cb9d43abb9d1db959cf2ddcfe565b70da7f3..80198ce2f22859eecfbd61ff0f845f09581f6b58 100644 (file)
--- 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,7 +179,17 @@ 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);
+       }
+
+       while (fgets (buffer, sizeof (buffer), fhin) != NULL)
        {
                int len;
 
@@ -204,33 +214,34 @@ 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);
+                       fprintf (fhout, "-1 Unknown command: %s\n", fields[0]);
+                       fflush (fhout);
                }
        } /* while (fgets) */
 
        DEBUG ("Exiting..");
-       close (fd);
+       fclose (fhin);
+       fclose (fhout);
 
        pthread_exit ((void *) 0);
        return ((void *) 0);