X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-network%2Ftest-dhcp-client.c;h=c48aa04b8db6204771b76b941402f4530d190e33;hb=3a6fb33c54bc64398e0af1c9d7c74a6b614a849d;hp=450b6d4d3c9bfc199b4297e5d768574009ee7cd6;hpb=0bbc2c1f3b8f01eac7826dab1a3e1e073f63da8a;p=elogind.git diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c index 450b6d4d3..c48aa04b8 100644 --- a/src/libsystemd-network/test-dhcp-client.c +++ b/src/libsystemd-network/test-dhcp-client.c @@ -196,7 +196,7 @@ int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link, return 575; } -int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link, uint32_t id) +int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link, uint32_t id, struct ether_addr mac) { if (socketpair(AF_UNIX, SOCK_STREAM, 0, test_fd) < 0) return -errno; @@ -447,7 +447,7 @@ static int test_addr_acq_recv_discover(size_t size, DHCPMessage *discover) { } static void test_addr_acq(sd_event *e) { - usec_t time_now = now(CLOCK_MONOTONIC); + usec_t time_now = now(clock_boottime_or_monotonic()); sd_dhcp_client *client; int res, r; @@ -470,7 +470,7 @@ static void test_addr_acq(sd_event *e) { callback_recv = test_addr_acq_recv_discover; assert_se(sd_event_add_time(e, &test_hangcheck, - CLOCK_MONOTONIC, + clock_boottime_or_monotonic(), time_now + 2 * USEC_PER_SEC, 0, test_dhcp_hangcheck, NULL) >= 0);