projects
/
project
/
ubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kmodloader: fix out-of-bound access when parsing .modinfo
[project/ubox.git]
/
log
/
logread.c
diff --git
a/log/logread.c
b/log/logread.c
index
06dda62
..
676bb82
100644
(file)
--- a/
log/logread.c
+++ b/
log/logread.c
@@
-17,6
+17,7
@@
#include <fcntl.h>
#include <time.h>
#include <fcntl.h>
#include <time.h>
+#include <regex.h>
#include <stdio.h>
#include <unistd.h>
#include <sys/types.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 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_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;
static const char* getcodetext(int value, CODE *codetable) {
CODE *i;
@@
-128,6
+130,9
@@
static int log_notify(struct blob_attr *msg)
}
m = blobmsg_get_string(tb[LOG_MSG]);
}
m = blobmsg_get_string(tb[LOG_MSG]);
+ if (regexp_pattern &&
+ regexec(®exp_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]);
t = blobmsg_get_u64(tb[LOG_TIME]) / 1000;
c = ctime(&t);
p = blobmsg_get_u32(tb[LOG_PRIO]);
@@
-151,8
+156,12
@@
static int log_notify(struct blob_attr *msg)
strncat(buf, m, sizeof(buf) - strlen(buf) - 1);
if (log_udp)
err = write(sender.fd, buf, strlen(buf));
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(LOG_INFO, "failed to send log data to %s:%s via %s\n",
if (err < 0) {
syslog(LOG_INFO, "failed to send log data to %s:%s via %s\n",
@@
-182,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"
"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"
" -r <server> <port> Stream message to a server\n"
" -F <file> Log file\n"
" -S <bytes> Log size\n"
@@
-190,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"
" -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;
}
"\n", prog);
return 1;
}
@@
-197,14
+208,19
@@
static int usage(const char *prog)
static void logread_fd_data_cb(struct ustream *s, int bytes)
{
while (true) {
static void logread_fd_data_cb(struct ustream *s, int bytes)
{
while (true) {
- int len;
struct blob_attr *a;
struct blob_attr *a;
+ int len, cur_len;
a = (void*) ustream_get_read_buf(s, &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;
break;
+
log_notify(a);
log_notify(a);
- ustream_consume(s,
blob_len(a) + sizeof(*a)
);
+ ustream_consume(s,
cur_len
);
}
if (!log_follow)
uloop_end();
}
if (!log_follow)
uloop_end();
@@
-218,10
+234,6
@@
static void logread_fd_cb(struct ubus_request *req, int fd)
ustream_fd_init(&test_fd, 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;
int main(int argc, char **argv)
{
static struct ubus_request req;
@@
-234,11
+246,14
@@
int main(int argc, char **argv)
signal(SIGPIPE, SIG_IGN);
signal(SIGPIPE, SIG_IGN);
- while ((ch = getopt(argc, argv, "u
fcs:l:r:F:p:S:P:h
:")) != -1) {
+ while ((ch = getopt(argc, argv, "u
0fcs:l:r:F:p:S:P:h:e
:")) != -1) {
switch (ch) {
case 'u':
log_udp = 1;
break;
switch (ch) {
case 'u':
log_udp = 1;
break;
+ case '0':
+ log_trailer_null = 1;
+ break;
case 's':
ubus_socket = optarg;
break;
case 's':
ubus_socket = optarg;
break;
@@
-270,6
+285,11
@@
int main(int argc, char **argv)
case 'h':
hostname = optarg;
break;
case 'h':
hostname = optarg;
break;
+ case 'e':
+ if (!regcomp(®exp_preg, optarg, REG_NOSUB)) {
+ regexp_pattern = optarg;
+ }
+ break;
default:
return usage(*argv);
}
default:
return usage(*argv);
}
@@
-293,6
+313,7
@@
int main(int argc, char **argv)
}
blob_buf_init(&b, 0);
}
blob_buf_init(&b, 0);
+ blobmsg_add_u8(&b, "stream", 1);
if (lines)
blobmsg_add_u32(&b, "lines", lines);
else if (log_follow)
if (lines)
blobmsg_add_u32(&b, "lines", lines);
else if (log_follow)
@@
-326,7
+347,6
@@
int main(int argc, char **argv)
ubus_invoke_async(ctx, id, "read", b.head, &req);
req.fd_cb = logread_fd_cb;
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();
ubus_complete_request_async(ctx, &req);
uloop_run();