log: remove unused callbacks

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

diff --git a/log/logread.c b/log/logread.c
index a7ab567..6255408 100644 (file)
--- a/log/logread.c
+++ b/log/logread.c
@@ -59,7 +59,7 @@ 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 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 +79,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 +102,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;
@@ -138,23 +139,27 @@ static int log_notify(struct blob_attr *msg)
                snprintf(buf, sizeof(buf), "<%u>", p);
                strncat(buf, c + 4, 16);
                if (hostname) {
-                       strncat(buf, hostname, sizeof(buf));
-                       strncat(buf, " ", sizeof(buf));
+                       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);
@@ -165,14 +170,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)
@@ -189,6 +194,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;
 }
@@ -217,10 +223,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;
@@ -233,11 +235,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:")) != -1) {
                switch (ch) {
                case 'u':
                        log_udp = 1;
                        break;
+               case '0':
+                       log_trailer_null = 1;
+                       break;
                case 's':
                        ubus_socket = optarg;
                        break;
@@ -325,7 +330,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();