chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log: also set errno to the passed error code before processing format string in log_s...
[elogind.git]
/
src
/
libsystemd-network
/
test-dhcp-client.c
diff --git
a/src/libsystemd-network/test-dhcp-client.c
b/src/libsystemd-network/test-dhcp-client.c
index 9c316d75bcd07c7faa00f73d7ffdb90c2ee89a21..0515440e4e97cf0d65e70050c4273a88890b39b5 100644
(file)
--- a/
src/libsystemd-network/test-dhcp-client.c
+++ b/
src/libsystemd-network/test-dhcp-client.c
@@
-29,6
+29,8
@@
#include "util.h"
#include "socket-util.h"
#include "util.h"
#include "socket-util.h"
+#include "sd-event.h"
+#include "event-util.h"
#include "dhcp-protocol.h"
#include "dhcp-internal.h"
#include "dhcp-protocol.h"
#include "dhcp-internal.h"
@@
-77,7
+79,9
@@
static void test_request_basic(sd_event *e)
assert_se(sd_dhcp_client_set_index(client, 15) == 0);
assert_se(sd_dhcp_client_set_index(client, -42) == -EINVAL);
assert_se(sd_dhcp_client_set_index(client, 15) == 0);
assert_se(sd_dhcp_client_set_index(client, -42) == -EINVAL);
- assert_se(sd_dhcp_client_set_index(client, -1) == 0);
+ assert_se(sd_dhcp_client_set_index(client, -1) == -EINVAL);
+ assert_se(sd_dhcp_client_set_index(client, 0) == -EINVAL);
+ assert_se(sd_dhcp_client_set_index(client, 1) == 0);
assert_se(sd_dhcp_client_set_request_option(client,
DHCP_OPTION_SUBNET_MASK) == -EEXIST);
assert_se(sd_dhcp_client_set_request_option(client,
DHCP_OPTION_SUBNET_MASK) == -EEXIST);
@@
-109,6
+113,8
@@
static void test_request_basic(sd_event *e)
assert_se(sd_dhcp_client_set_request_option(client, 33) == -EEXIST);
assert_se(sd_dhcp_client_set_request_option(client, 44) == 0);
assert_se(sd_dhcp_client_set_request_option(client, 33) == -EEXIST);
assert_se(sd_dhcp_client_set_request_option(client, 33) == -EEXIST);
assert_se(sd_dhcp_client_set_request_option(client, 44) == 0);
assert_se(sd_dhcp_client_set_request_option(client, 33) == -EEXIST);
+
+ sd_dhcp_client_unref(client);
}
static void test_checksum(void)
}
static void test_checksum(void)
@@
-122,7
+128,7
@@
static void test_checksum(void)
if (verbose)
printf("* %s\n", __FUNCTION__);
if (verbose)
printf("* %s\n", __FUNCTION__);
- assert_se(dhcp_packet_checksum(&buf, 20) == be16toh(0x78ae));
+ assert_se(dhcp_packet_checksum(
(uint8_t*)
&buf, 20) == be16toh(0x78ae));
}
static int check_options(uint8_t code, uint8_t len, const uint8_t *option,
}
static int check_options(uint8_t code, uint8_t len, const uint8_t *option,
@@
-169,13
+175,13
@@
int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link,
discover->ip.ttl = 0;
discover->ip.check = discover->udp.len;
discover->ip.ttl = 0;
discover->ip.check = discover->udp.len;
- udp_check = ~dhcp_packet_checksum(&discover->ip.ttl, len - 8);
+ udp_check = ~dhcp_packet_checksum(
(uint8_t*)
&discover->ip.ttl, len - 8);
assert_se(udp_check == 0xffff);
discover->ip.ttl = IPDEFTTL;
discover->ip.check = ip_check;
assert_se(udp_check == 0xffff);
discover->ip.ttl = IPDEFTTL;
discover->ip.check = ip_check;
- ip_check = ~dhcp_packet_checksum(&discover->ip, sizeof(discover->ip));
+ ip_check = ~dhcp_packet_checksum(
(uint8_t*)
&discover->ip, sizeof(discover->ip));
assert_se(ip_check == 0xffff);
assert_se(discover->dhcp.xid);
assert_se(ip_check == 0xffff);
assert_se(discover->dhcp.xid);
@@
-190,7
+196,9
@@
int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link,
return 575;
}
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, const uint8_t *addr,
+ size_t addr_len, uint16_t arp_type)
{
if (socketpair(AF_UNIX, SOCK_STREAM, 0, test_fd) < 0)
return -errno;
{
if (socketpair(AF_UNIX, SOCK_STREAM, 0, test_fd) < 0)
return -errno;
@@
-198,7
+206,7
@@
int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link, uint32_t
return test_fd[0];
}
return test_fd[0];
}
-int dhcp_network_bind_udp_socket(
int index,
be32_t address, uint16_t port)
+int dhcp_network_bind_udp_socket(be32_t address, uint16_t port)
{
return 0;
}
{
return 0;
}
@@
-238,7
+246,10
@@
static void test_discover_message(sd_event *e)
assert_se(r >= 0);
assert_se(sd_dhcp_client_set_index(client, 42) >= 0);
assert_se(r >= 0);
assert_se(sd_dhcp_client_set_index(client, 42) >= 0);
- assert_se(sd_dhcp_client_set_mac(client, &mac_addr) >= 0);
+ assert_se(sd_dhcp_client_set_mac(client,
+ (const uint8_t *) &mac_addr,
+ sizeof (mac_addr),
+ ARPHRD_ETHER) >= 0);
assert_se(sd_dhcp_client_set_request_option(client, 248) >= 0);
assert_se(sd_dhcp_client_set_request_option(client, 248) >= 0);
@@
-373,6
+384,7
@@
static void test_addr_acq_acquired(sd_dhcp_client *client, int event,
if (verbose)
printf(" DHCP address acquired\n");
if (verbose)
printf(" DHCP address acquired\n");
+ sd_dhcp_lease_unref(lease);
sd_event_exit(e, 0);
}
sd_event_exit(e, 0);
}
@@
-440,7
+452,7
@@
static int test_addr_acq_recv_discover(size_t size, DHCPMessage *discover) {
}
static void test_addr_acq(sd_event *e) {
}
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;
sd_dhcp_client *client;
int res, r;
@@
-455,7
+467,10
@@
static void test_addr_acq(sd_event *e) {
assert_se(r >= 0);
assert_se(sd_dhcp_client_set_index(client, 42) >= 0);
assert_se(r >= 0);
assert_se(sd_dhcp_client_set_index(client, 42) >= 0);
- assert_se(sd_dhcp_client_set_mac(client, &mac_addr) >= 0);
+ assert_se(sd_dhcp_client_set_mac(client,
+ (const uint8_t *) &mac_addr,
+ sizeof (mac_addr),
+ ARPHRD_ETHER) >= 0);
assert_se(sd_dhcp_client_set_callback(client, test_addr_acq_acquired, e)
>= 0);
assert_se(sd_dhcp_client_set_callback(client, test_addr_acq_acquired, e)
>= 0);
@@
-463,19
+478,19
@@
static void test_addr_acq(sd_event *e) {
callback_recv = test_addr_acq_recv_discover;
assert_se(sd_event_add_time(e, &test_hangcheck,
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);
res = sd_dhcp_client_start(client);
assert_se(res == 0 || res == -EINPROGRESS);
time_now + 2 * USEC_PER_SEC, 0,
test_dhcp_hangcheck, NULL) >= 0);
res = sd_dhcp_client_start(client);
assert_se(res == 0 || res == -EINPROGRESS);
-
sd_event_loop(e
);
+
assert_se(sd_event_loop(e) >= 0
);
test_hangcheck = sd_event_source_unref(test_hangcheck);
test_hangcheck = sd_event_source_unref(test_hangcheck);
-
sd_dhcp_client_set_callback(client, NULL, NULL
);
-
sd_dhcp_client_stop(client
);
+
assert_se(sd_dhcp_client_set_callback(client, NULL, NULL) >= 0
);
+
assert_se(sd_dhcp_client_stop(client) >= 0
);
sd_dhcp_client_unref(client);
test_fd[1] = safe_close(test_fd[1]);
sd_dhcp_client_unref(client);
test_fd[1] = safe_close(test_fd[1]);
@@
-485,7
+500,11
@@
static void test_addr_acq(sd_event *e) {
}
int main(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
- sd_event *e;
+ _cleanup_event_unref_ sd_event *e;
+
+ log_set_max_level(LOG_DEBUG);
+ log_parse_environment();
+ log_open();
assert_se(sd_event_new(&e) >= 0);
assert_se(sd_event_new(&e) >= 0);