X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-network%2Ftest-dhcp-client.c;h=0515440e4e97cf0d65e70050c4273a88890b39b5;hp=ca44cfbdc52b0269665b97226117dfdc7b5cf265;hb=5f86c1f4c43ee9caa120d130e9b89d3fd25124c0;hpb=d790d3f17325df9004b1a6cc4f5a107d5eeec7d8 diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c index ca44cfbdc..0515440e4 100644 --- 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 "sd-event.h" +#include "event-util.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, -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); @@ -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); + + sd_dhcp_client_unref(client); } static void test_checksum(void) @@ -122,7 +128,7 @@ static void test_checksum(void) 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, @@ -152,7 +158,7 @@ int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link, assert_se(s >= 0); assert_se(packet); - size = sizeof(DHCPPacket) + 4; + size = sizeof(DHCPPacket); assert_se(len > size); discover = memdup(packet, len); @@ -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; - 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; - 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); @@ -190,7 +196,9 @@ 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) +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; @@ -198,7 +206,7 @@ int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link) 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; } @@ -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(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); @@ -251,10 +262,9 @@ static void test_discover_message(sd_event *e) sd_event_run(e, (uint64_t) -1); sd_dhcp_client_stop(client); - sd_dhcp_client_free(client); + sd_dhcp_client_unref(client); - close(test_fd[0]); - close(test_fd[1]); + test_fd[1] = safe_close(test_fd[1]); callback_recv = NULL; } @@ -339,7 +349,7 @@ static uint8_t test_addr_acq_ack[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x82, 0x53, 0x63, 0x35, 0x01, 0x05, 0x36, 0x04, 0xc0, 0xa8, 0x02, 0x01, 0x33, 0x04, 0x00, - 0x00, 0x02, 0x58, 0x01, 0x04, 0xff, 0xff, 0xff, + 0x00, 0x02, 0x58, 0x01, 0x04, 0xff, 0xff, 0xff, 0x00, 0x2a, 0x04, 0xc0, 0xa8, 0x02, 0x01, 0x0f, 0x09, 0x6c, 0x61, 0x62, 0x2e, 0x69, 0x6e, 0x74, 0x72, 0x61, 0x03, 0x04, 0xc0, 0xa8, 0x02, 0x01, @@ -348,8 +358,7 @@ static uint8_t test_addr_acq_ack[] = { }; static void test_addr_acq_acquired(sd_dhcp_client *client, int event, - void *userdata) -{ + void *userdata) { sd_event *e = userdata; sd_dhcp_lease *lease; struct in_addr addr; @@ -375,11 +384,11 @@ static void test_addr_acq_acquired(sd_dhcp_client *client, int event, if (verbose) printf(" DHCP address acquired\n"); + sd_dhcp_lease_unref(lease); sd_event_exit(e, 0); } -static int test_addr_acq_recv_request(size_t size, DHCPMessage *request) -{ +static int test_addr_acq_recv_request(size_t size, DHCPMessage *request) { uint16_t udp_check = 0; uint8_t *msg_bytes = (uint8_t *)request; int res; @@ -410,8 +419,7 @@ static int test_addr_acq_recv_request(size_t size, DHCPMessage *request) return 0; }; -static int test_addr_acq_recv_discover(size_t size, DHCPMessage *discover) -{ +static int test_addr_acq_recv_discover(size_t size, DHCPMessage *discover) { uint16_t udp_check = 0; uint8_t *msg_bytes = (uint8_t *)discover; int res; @@ -438,14 +446,13 @@ static int test_addr_acq_recv_discover(size_t size, DHCPMessage *discover) assert_se(res == sizeof(test_addr_acq_offer)); if (verbose) - printf(" send DHCP Offer\n"); + printf(" sent DHCP Offer\n"); return 0; } -static void test_addr_acq(sd_event *e) -{ - usec_t time_now = now(CLOCK_MONOTONIC); +static void test_addr_acq(sd_event *e) { + usec_t time_now = now(clock_boottime_or_monotonic()); sd_dhcp_client *client; int res, r; @@ -460,38 +467,44 @@ static void test_addr_acq(sd_event *e) 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); callback_recv = test_addr_acq_recv_discover; - assert_se(sd_event_add_monotonic(e, &test_hangcheck, - time_now + 2 * USEC_PER_SEC, 0, - test_dhcp_hangcheck, NULL) >= 0); + assert_se(sd_event_add_time(e, &test_hangcheck, + 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); - sd_event_loop(e); + assert_se(sd_event_loop(e) >= 0); test_hangcheck = sd_event_source_unref(test_hangcheck); - sd_dhcp_client_set_callback(client, NULL, NULL); - sd_dhcp_client_stop(client); - sd_dhcp_client_free(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); - close(test_fd[0]); - close(test_fd[1]); + test_fd[1] = safe_close(test_fd[1]); callback_recv = NULL; xid = 0; } -int main(int argc, char *argv[]) -{ - sd_event *e; +int main(int argc, char *argv[]) { + _cleanup_event_unref_ sd_event *e; + + log_set_max_level(LOG_DEBUG); + log_parse_environment(); + log_open(); assert_se(sd_event_new(&e) >= 0);