summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-05-24 21:20:30 +0200
committerLennart Poettering <lennart@poettering.net>2016-05-26 15:34:43 +0200
commitad2998abd52678f49b2882a45474fd80fb90172c (patch)
tree3ea2fe6ba8b4d4078ff316c3b3b64ff38edc4173 /src
parentb3dfcf6a767442ca1e912615b49449d5095429fb (diff)
sd-ndisc: add log_ndisc_errno() macro, to complement log_ndisc() like elsewhere
Also make use of it where appropriate.
Diffstat (limited to 'src')
-rw-r--r--src/libsystemd-network/sd-ndisc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libsystemd-network/sd-ndisc.c b/src/libsystemd-network/sd-ndisc.c
index 3432c71f33..2f021debc1 100644
--- a/src/libsystemd-network/sd-ndisc.c
+++ b/src/libsystemd-network/sd-ndisc.c
@@ -90,7 +90,8 @@ struct sd_ndisc {
void *userdata;
};
-#define log_ndisc(p, fmt, ...) log_internal(LOG_DEBUG, 0, __FILE__, __LINE__, __func__, "NDisc CLIENT: " fmt, ##__VA_ARGS__)
+#define log_ndisc_errno(p, error, fmt, ...) log_internal(LOG_DEBUG, error, __FILE__, __LINE__, __func__, "NDisc CLIENT: " fmt, ##__VA_ARGS__)
+#define log_ndisc(p, fmt, ...) log_ndisc_errno(p, 0, fmt, ##__VA_ARGS__)
static NDiscPrefix *ndisc_prefix_unref(NDiscPrefix *prefix) {
@@ -514,8 +515,7 @@ static int ndisc_router_advertisement_recv(sd_event_source *s, int fd, uint32_t
if (errno == EAGAIN || errno == EINTR)
return 0;
- log_ndisc(nd, "Could not receive message from ICMPv6 socket: %m");
- return -errno;
+ return log_ndisc_errno(nd, errno, "Could not receive message from ICMPv6 socket: %m");
}
if ((size_t) len < sizeof(struct nd_router_advert)) {
log_ndisc(nd, "Too small to be a router advertisement: ignoring");
@@ -588,7 +588,7 @@ static int ndisc_router_advertisement_recv(sd_event_source *s, int fd, uint32_t
r = ndisc_ra_parse(nd, ra, len);
if (r < 0) {
- log_ndisc(nd, "Could not parse Router Advertisement: %s", strerror(-r));
+ log_ndisc_errno(nd, r, "Could not parse Router Advertisement: %m");
return 0;
}
@@ -616,7 +616,7 @@ static int ndisc_router_solicitation_timeout(sd_event_source *s, uint64_t usec,
} else {
r = icmp6_send_router_solicitation(nd->fd, &nd->mac_addr);
if (r < 0)
- log_ndisc(nd, "Error sending Router Solicitation");
+ log_ndisc_errno(nd, r, "Error sending Router Solicitation: %m");
else {
nd->state = NDISC_STATE_SOLICITATION_SENT;
log_ndisc(nd, "Sent Router Solicitation");