ubox: Fix some memory leaks

[project/ubox.git] / log / logread.c

diff --git a/log/logread.c b/log/logread.c
index 28c9462..676bb82 100644 (file)
--- a/log/logread.c
+++ b/log/logread.c
@@ -17,6 +17,7 @@
 
 #include <fcntl.h>
 #include <time.h>
+#include <regex.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -57,9 +58,10 @@ static const struct blobmsg_policy log_policy[] = {
 
 static struct uloop_timeout retry;
 static struct uloop_fd sender;
-static const char *log_file, *log_ip, *log_port, *log_prefix, *pid_file, *hostname;
+static regex_t regexp_preg;
+static const char *log_file, *log_ip, *log_port, *log_prefix, *pid_file, *hostname, *regexp_pattern;
 static int log_type = LOG_STDOUT;
-static int log_size, log_udp, log_follow = 0;
+static int log_size, log_udp, log_follow, log_trailer_null = 0;
 
 static const char* getcodetext(int value, CODE *codetable) {
        CODE *i;
@@ -79,7 +81,7 @@ static void log_handle_reconnect(struct uloop_timeout *timeout)
                uloop_timeout_set(&retry, 1000);
        } else {
                uloop_fd_add(&sender, ULOOP_READ);
-               syslog(0, "Logread connected to %s:%s\n", log_ip, log_port);
+               syslog(LOG_INFO, "Logread connected to %s:%s\n", log_ip, log_port);
        }
 }
 
@@ -102,6 +104,7 @@ static int log_notify(struct blob_attr *msg)
        char *str;
        time_t t;
        char *c, *m;
+       int ret = 0;
 
        if (sender.fd < 0)
                return 0;
@@ -127,6 +130,9 @@ static int log_notify(struct blob_attr *msg)
        }
 
        m = blobmsg_get_string(tb[LOG_MSG]);
+       if (regexp_pattern &&
+           regexec(&regexp_preg, m, 0, NULL, 0) == REG_NOMATCH)
+               return 0;
        t = blobmsg_get_u64(tb[LOG_TIME]) / 1000;
        c = ctime(&t);
        p = blobmsg_get_u32(tb[LOG_PRIO]);
@@ -135,23 +141,30 @@ static int log_notify(struct blob_attr *msg)
        if (log_type == LOG_NET) {
                int err;
 
-               *buf = '\0';
-               if (hostname)
-                       snprintf(buf, sizeof(buf), "%s ", hostname);
+               snprintf(buf, sizeof(buf), "<%u>", p);
+               strncat(buf, c + 4, 16);
+               if (hostname) {
+                       strncat(buf, hostname, sizeof(buf) - strlen(buf) - 1);
+                       strncat(buf, " ", sizeof(buf) - strlen(buf) - 1);
+               }
                if (log_prefix) {
-                       strncat(buf, log_prefix, sizeof(buf));
-                       strncat(buf, ": ", sizeof(buf));
+                       strncat(buf, log_prefix, sizeof(buf) - strlen(buf) - 1);
+                       strncat(buf, ": ", sizeof(buf) - strlen(buf) - 1);
                }
                if (blobmsg_get_u32(tb[LOG_SOURCE]) == SOURCE_KLOG)
-                       strncat(buf, "kernel: ", sizeof(buf));
-               strncat(buf, m, sizeof(buf));
+                       strncat(buf, "kernel: ", sizeof(buf) - strlen(buf) - 1);
+               strncat(buf, m, sizeof(buf) - strlen(buf) - 1);
                if (log_udp)
                        err = write(sender.fd, buf, strlen(buf));
-               else
-                       err = send(sender.fd, buf, strlen(buf), 0);
+               else {
+                       size_t buflen = strlen(buf);
+                       if (!log_trailer_null)
+                               buf[buflen] = '\n';
+                       err = send(sender.fd, buf, buflen + 1, 0);
+               }
 
                if (err < 0) {
-                       syslog(0, "failed to send log data to %s:%s via %s\n",
+                       syslog(LOG_INFO, "failed to send log data to %s:%s via %s\n",
                                log_ip, log_port, (log_udp) ? ("udp") : ("tcp"));
                        uloop_fd_delete(&sender);
                        close(sender.fd);
@@ -162,14 +175,14 @@ static int log_notify(struct blob_attr *msg)
                snprintf(buf, sizeof(buf), "%s %s.%s%s %s\n",
                        c, getcodetext(LOG_FAC(p) << 3, facilitynames), getcodetext(LOG_PRI(p), prioritynames),
                        (blobmsg_get_u32(tb[LOG_SOURCE])) ? ("") : (" kernel:"), m);
-               write(sender.fd, buf, strlen(buf));
+               ret = write(sender.fd, buf, strlen(buf));
        }
 
        free(str);
        if (log_type == LOG_FILE)
                fsync(sender.fd);
 
-       return 0;
+       return ret;
 }
 
 static int usage(const char *prog)
@@ -178,6 +191,7 @@ static int usage(const char *prog)
                "Options:\n"
                "    -s <path>          Path to ubus socket\n"
                "    -l <count>         Got only the last 'count' messages\n"
+               "    -e <pattern>       Filter messages with a regexp\n"
                "    -r <server> <port> Stream message to a server\n"
                "    -F <file>          Log file\n"
                "    -S <bytes>         Log size\n"
@@ -186,6 +200,7 @@ static int usage(const char *prog)
                "    -P <prefix>        Prefix custom text to streamed messages\n"
                "    -f                 Follow log messages\n"
                "    -u                 Use UDP as the protocol\n"
+               "    -0                 Use \\0 instead of \\n as trailer when using TCP\n"
                "\n", prog);
        return 1;
 }
@@ -193,14 +208,19 @@ static int usage(const char *prog)
 static void logread_fd_data_cb(struct ustream *s, int bytes)
 {
        while (true) {
-               int len;
                struct blob_attr *a;
+               int len, cur_len;
 
                a = (void*) ustream_get_read_buf(s, &len);
-               if (len < sizeof(*a) || len < blob_len(a) + sizeof(*a))
+               if (len < sizeof(*a))
                        break;
+
+               cur_len = blob_len(a) + sizeof(*a);
+               if (len < cur_len)
+                       break;
+
                log_notify(a);
-               ustream_consume(s, blob_len(a) + sizeof(*a));
+               ustream_consume(s, cur_len);
        }
        if (!log_follow)
                uloop_end();
@@ -214,10 +234,6 @@ static void logread_fd_cb(struct ubus_request *req, int fd)
        ustream_fd_init(&test_fd, fd);
 }
 
-static void logread_complete_cb(struct ubus_request *req, int ret)
-{
-}
-
 int main(int argc, char **argv)
 {
        static struct ubus_request req;
@@ -230,11 +246,14 @@ int main(int argc, char **argv)
 
        signal(SIGPIPE, SIG_IGN);
 
-       while ((ch = getopt(argc, argv, "ufcs:l:r:F:p:S:P:h:")) != -1) {
+       while ((ch = getopt(argc, argv, "u0fcs:l:r:F:p:S:P:h:e:")) != -1) {
                switch (ch) {
                case 'u':
                        log_udp = 1;
                        break;
+               case '0':
+                       log_trailer_null = 1;
+                       break;
                case 's':
                        ubus_socket = optarg;
                        break;
@@ -266,6 +285,11 @@ int main(int argc, char **argv)
                case 'h':
                        hostname = optarg;
                        break;
+               case 'e':
+                       if (!regcomp(&regexp_preg, optarg, REG_NOSUB)) {
+                               regexp_pattern = optarg;
+                       }
+                       break;
                default:
                        return usage(*argv);
                }
@@ -289,6 +313,7 @@ int main(int argc, char **argv)
                }
 
                blob_buf_init(&b, 0);
+               blobmsg_add_u8(&b, "stream", 1);
                if (lines)
                        blobmsg_add_u32(&b, "lines", lines);
                else if (log_follow)
@@ -322,7 +347,6 @@ int main(int argc, char **argv)
 
                ubus_invoke_async(ctx, id, "read", b.head, &req);
                req.fd_cb = logread_fd_cb;
-               req.complete_cb = logread_complete_cb;
                ubus_complete_request_async(ctx, &req);
 
                uloop_run();