Merge branch 'collectd-4.4'

[collectd.git] / src / unixsock.c

diff --git a/src/unixsock.c b/src/unixsock.c
index 8701cb9..d34b91f 100644 (file)
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -86,8 +86,8 @@ static int us_open_socket (void)
 
        memset (&sa, '\0', sizeof (sa));
        sa.sun_family = AF_UNIX;
-       strncpy (sa.sun_path, (sock_file != NULL) ? sock_file : US_DEFAULT_PATH,
-                       sizeof (sa.sun_path) - 1);
+       sstrncpy (sa.sun_path, (sock_file != NULL) ? sock_file : US_DEFAULT_PATH,
+                       sizeof (sa.sun_path));
        /* unlink (sa.sun_path); */
 
        DEBUG ("unixsock plugin: socket path = %s", sa.sun_path);
@@ -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);
@@ -371,7 +412,6 @@ static int us_shutdown (void)
        }
 
        plugin_unregister_init ("unixsock");
-       plugin_unregister_write ("unixsock");
        plugin_unregister_shutdown ("unixsock");
 
        return (0);