shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-07 05:57:46 +03:00
Code

rfkill: improve error logging

Browse Source 
If we get something of unexpected size, log the sizes. Also, don't log twice.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-02-18 10:40:16 +01:00
parent f542f3b2ed
commit 6c7afdeab0
1 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/rfkill/rfkill.c
View File

@ -135,8 +135,6 @@ static int determine_state_file(
static int load_state(Context *c, const struct rfkill_event *event) {
_cleanup_free_ char *state_file = NULL, *value = NULL;
struct rfkill_event we;
ssize_t l;
int b, r;
assert(c);
@ -168,18 +166,19 @@ static int load_state(Context *c, const struct rfkill_event *event) {
if (b < 0)
return log_error_errno(b, "Failed to parse state file %s: %m", state_file);
we = (struct rfkill_event) {
.op = RFKILL_OP_CHANGE,
struct rfkill_event we = {
.idx = event->idx,
.op = RFKILL_OP_CHANGE,
.soft = b,
};
l = write(c->rfkill_fd, &we, sizeof(we));
ssize_t l = write(c->rfkill_fd, &we, sizeof we);
if (l < 0)
return log_error_errno(errno, "Failed to restore rfkill state for %i: %m", event->idx);
if (l != sizeof(we))
if (l != sizeof we)
return log_error_errno(SYNTHETIC_ERRNO(EIO),
"Couldn't write rfkill event structure, too short.");
"Couldn't write rfkill event structure, too short (wrote %zd of %zu bytes).",
l, sizeof we);
log_debug("Loaded state '%s' from %s.", one_zero(b), state_file);
return 0;
@ -306,43 +305,38 @@ static int run(int argc, char *argv[]) {
for (;;) {
struct rfkill_event event;
const char *type;
ssize_t l;
l = read(c.rfkill_fd, &event, sizeof(event));
ssize_t l = read(c.rfkill_fd, &event, sizeof event);
if (l < 0) {
if (errno == EAGAIN) {
if (errno != EAGAIN)
return log_error_errno(errno, "Failed to read from /dev/rfkill: %m");
if (!ready) {
/* Notify manager that we are
* now finished with
* processing whatever was
* queued */
(void) sd_notify(false, "READY=1");
ready = true;
}
/* Hang around for a bit, maybe there's more coming */
r = fd_wait_for_event(c.rfkill_fd, POLLIN, EXIT_USEC);
if (r == -EINTR)
continue;
if (r < 0)
return log_error_errno(r, "Failed to poll() on device: %m");
if (r > 0)
continue;
log_debug("All events read and idle, exiting.");
break;
if (!ready) {
/* Notify manager that we are now finished with processing whatever was
* queued */
(void) sd_notify(false, "READY=1");
ready = true;
}
log_error_errno(errno, "Failed to read from /dev/rfkill: %m");
/* Hang around for a bit, maybe there's more coming */
r = fd_wait_for_event(c.rfkill_fd, POLLIN, EXIT_USEC);
if (r == -EINTR)
continue;
if (r < 0)
return log_error_errno(r, "Failed to poll() on device: %m");
if (r > 0)
continue;
log_debug("All events read and idle, exiting.");
break;
}
if (l != RFKILL_EVENT_SIZE_V1)
return log_error_errno(SYNTHETIC_ERRNO(EIO), "Read event structure of invalid size.");
return log_error_errno(SYNTHETIC_ERRNO(EIO), "Read event structure of unexpected size (%zd, not %d)",
l, RFKILL_EVENT_SIZE_V1);
type = rfkill_type_to_string(event.type);
const char *type = rfkill_type_to_string(event.type);
if (!type) {
log_debug("An rfkill device of unknown type %i discovered, ignoring.", event.type);
continue;