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-event: rename sd_event_source_set_name() to sd_event_source_get_name()
[elogind.git]
/
src
/
libsystemd-network
/
sd-icmp6-nd.c
diff --git
a/src/libsystemd-network/sd-icmp6-nd.c
b/src/libsystemd-network/sd-icmp6-nd.c
index 243f06a85f1a3dcb15d87d2a55553b11d8e9fe57..2473fbbddf25d3aefdd94e4c8a29df3487f3ff95 100644
(file)
--- a/
src/libsystemd-network/sd-icmp6-nd.c
+++ b/
src/libsystemd-network/sd-icmp6-nd.c
@@
-212,7
+212,7
@@
static int icmp6_router_advertisment_recv(sd_event_source *s, int fd,
if (ra.nd_ra_flags_reserved & ND_RA_FLAG_MANAGED)
event = ICMP6_EVENT_ROUTER_ADVERTISMENT_MANAGED;
if (ra.nd_ra_flags_reserved & ND_RA_FLAG_MANAGED)
event = ICMP6_EVENT_ROUTER_ADVERTISMENT_MANAGED;
- log_icmp6_nd(nd, "Received Router Advertisment flags %s/%s",
+ log_icmp6_nd(nd, "Received Router Advertis
e
ment flags %s/%s",
(ra.nd_ra_flags_reserved & ND_RA_FLAG_MANAGED)? "MANAGED":
"none",
(ra.nd_ra_flags_reserved & ND_RA_FLAG_OTHER)? "OTHER":
(ra.nd_ra_flags_reserved & ND_RA_FLAG_MANAGED)? "MANAGED":
"none",
(ra.nd_ra_flags_reserved & ND_RA_FLAG_OTHER)? "OTHER":
@@
-278,7
+278,7
@@
static int icmp6_router_solicitation_timeout(sd_event_source *s, uint64_t usec,
return 0;
}
return 0;
}
- r = sd_event_source_set_
name
(nd->timeout, "icmp6-timeout");
+ r = sd_event_source_set_
description
(nd->timeout, "icmp6-timeout");
if (r < 0) {
icmp6_nd_notify(nd, r);
return 0;
if (r < 0) {
icmp6_nd_notify(nd, r);
return 0;
@@
-328,7
+328,7
@@
int sd_icmp6_router_solicitation_start(sd_icmp6_nd *nd) {
if (r < 0)
goto error;
if (r < 0)
goto error;
- r = sd_event_source_set_
name
(nd->recv, "icmp6-receive-message");
+ r = sd_event_source_set_
description
(nd->recv, "icmp6-receive-message");
if (r < 0)
goto error;
if (r < 0)
goto error;
@@
-341,7
+341,7
@@
int sd_icmp6_router_solicitation_start(sd_icmp6_nd *nd) {
if (r < 0)
goto error;
if (r < 0)
goto error;
- r = sd_event_source_set_
name
(nd->timeout, "icmp6-timeout");
+ r = sd_event_source_set_
description
(nd->timeout, "icmp6-timeout");
error:
if (r < 0)
icmp6_nd_init(nd);
error:
if (r < 0)
icmp6_nd_init(nd);