chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-network: split the operstate 'unknown' into 'down' and 'up'
[elogind.git]
/
src
/
journal
/
journald-native.c
diff --git
a/src/journal/journald-native.c
b/src/journal/journald-native.c
index 6674f3bd50ff291fff011263f22ee25c23392806..ac2d0ba148c10c8ddf3c25e1889fc028af54d62a 100644
(file)
--- a/
src/journal/journald-native.c
+++ b/
src/journal/journald-native.c
@@
-108,8
+108,7
@@
void server_process_native_message(
/* Entry separator */
if (entry_size + n + 1 > ENTRY_SIZE_MAX) { /* data + separators + trailer */
/* Entry separator */
if (entry_size + n + 1 > ENTRY_SIZE_MAX) { /* data + separators + trailer */
- log_debug("Entry is too big with %u properties and %zu bytes, ignoring.",
- n, entry_size);
+ log_debug("Entry is too big with %u properties and %zu bytes, ignoring.", n, entry_size);
continue;
}
continue;
}
@@
-134,8
+133,7
@@
void server_process_native_message(
/* A property follows */
/* n received properties, +1 for _TRANSPORT */
/* A property follows */
/* n received properties, +1 for _TRANSPORT */
- if (!GREEDY_REALLOC(iovec, m, n + 1 + N_IOVEC_META_FIELDS +
- !!object_pid * N_IOVEC_OBJECT_FIELDS)) {
+ if (!GREEDY_REALLOC(iovec, m, n + 1 + N_IOVEC_META_FIELDS + !!object_pid * N_IOVEC_OBJECT_FIELDS)) {
log_oom();
break;
}
log_oom();
break;
}
@@
-153,8
+151,8
@@
void server_process_native_message(
* field */
iovec[n].iov_base = (char*) p;
iovec[n].iov_len = l;
* field */
iovec[n].iov_base = (char*) p;
iovec[n].iov_len = l;
- n++;
entry_size += iovec[n].iov_len;
entry_size += iovec[n].iov_len;
+ n++;
/* We need to determine the priority
* of this entry for the rate limiting
/* We need to determine the priority
* of this entry for the rate limiting
@@
-223,7
+221,7
@@
void server_process_native_message(
l = le64toh(l_le);
if (l > DATA_SIZE_MAX) {
l = le64toh(l_le);
if (l > DATA_SIZE_MAX) {
- log_debug("Received binary data block of %
zu
bytes is too large, ignoring.", l);
+ log_debug("Received binary data block of %
"PRIu64"
bytes is too large, ignoring.", l);
break;
}
break;
}
@@
-246,8
+244,8
@@
void server_process_native_message(
if (valid_user_field(p, e - p, false)) {
iovec[n].iov_base = k;
iovec[n].iov_len = (e - p) + 1 + l;
if (valid_user_field(p, e - p, false)) {
iovec[n].iov_base = k;
iovec[n].iov_len = (e - p) + 1 + l;
- n++;
entry_size += iovec[n].iov_len;
entry_size += iovec[n].iov_len;
+ n++;
} else
free(k);
} else
free(k);
@@
-383,12
+381,15
@@
void server_process_native_file(
}
int server_open_native_socket(Server*s) {
}
int server_open_native_socket(Server*s) {
- union sockaddr_union sa;
int one, r;
assert(s);
if (s->native_fd < 0) {
int one, r;
assert(s);
if (s->native_fd < 0) {
+ union sockaddr_union sa = {
+ .un.sun_family = AF_UNIX,
+ .un.sun_path = "/run/systemd/journal/socket",
+ };
s->native_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
if (s->native_fd < 0) {
s->native_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
if (s->native_fd < 0) {
@@
-396,15
+397,11
@@
int server_open_native_socket(Server*s) {
return -errno;
}
return -errno;
}
- zero(sa);
- sa.un.sun_family = AF_UNIX;
- strncpy(sa.un.sun_path, "/run/systemd/journal/socket", sizeof(sa.un.sun_path));
-
unlink(sa.un.sun_path);
r = bind(s->native_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
if (r < 0) {
unlink(sa.un.sun_path);
r = bind(s->native_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
if (r < 0) {
- log_error("bind(
) failed: %m"
);
+ log_error("bind(
%s) failed: %m", sa.un.sun_path
);
return -errno;
}
return -errno;
}