chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: unify how we generate the prefix string when dumping unit state
[elogind.git]
/
src
/
libsystemd-network
/
test-icmp6-rs.c
diff --git
a/src/libsystemd-network/test-icmp6-rs.c
b/src/libsystemd-network/test-icmp6-rs.c
index 86e02cccbeb705fe6110af5bf03a5d61f38a03d2..afa85626598b61cd0840bd9e3fae0bd81527a80c 100644
(file)
--- a/
src/libsystemd-network/test-icmp6-rs.c
+++ b/
src/libsystemd-network/test-icmp6-rs.c
@@
-108,7
+108,7
@@
static void test_rs_done(sd_icmp6_nd *nd, int event, void *userdata) {
}
static void test_rs(sd_event *e) {
}
static void test_rs(sd_event *e) {
- usec_t time_now = now(
CLOCK_MONOTONIC
);
+ usec_t time_now = now(
clock_boottime_or_monotonic()
);
sd_icmp6_nd *nd;
if (verbose)
sd_icmp6_nd *nd;
if (verbose)
@@
-123,10
+123,14
@@
static void test_rs(sd_event *e) {
assert(sd_icmp6_nd_set_mac(nd, &mac_addr) >= 0);
assert(sd_icmp6_nd_set_callback(nd, test_rs_done, e) >= 0);
assert(sd_icmp6_nd_set_mac(nd, &mac_addr) >= 0);
assert(sd_icmp6_nd_set_callback(nd, test_rs_done, e) >= 0);
- assert(sd_event_add_time(e, &test_hangcheck,
CLOCK_MONOTONIC
,
+ assert(sd_event_add_time(e, &test_hangcheck,
clock_boottime_or_monotonic()
,
time_now + 2 *USEC_PER_SEC, 0,
test_rs_hangcheck, NULL) >= 0);
time_now + 2 *USEC_PER_SEC, 0,
test_rs_hangcheck, NULL) >= 0);
+ assert(sd_icmp6_nd_stop(nd) >= 0);
+ assert(sd_icmp6_router_solicitation_start(nd) >= 0);
+ assert(sd_icmp6_nd_stop(nd) >= 0);
+
assert(sd_icmp6_router_solicitation_start(nd) >= 0);
sd_event_loop(e);
assert(sd_icmp6_router_solicitation_start(nd) >= 0);
sd_event_loop(e);
@@
-136,7
+140,6
@@
static void test_rs(sd_event *e) {
nd = sd_icmp6_nd_unref(nd);
assert(!nd);
nd = sd_icmp6_nd_unref(nd);
assert(!nd);
- close(test_fd[0]);
close(test_fd[1]);
}
close(test_fd[1]);
}