[systemd-commits] 3 commits - src/libsystemd-dhcp
Tom Gundersen
tomegun at kemper.freedesktop.org
Tue Feb 18 15:23:23 CET 2014
src/libsystemd-dhcp/test-dhcp-client.c | 267 ++++++++++++++++++++++++++++++++-
1 file changed, 260 insertions(+), 7 deletions(-)
New commits:
commit 234ed3eb09f0c8b871253691e0ef9309e68eeae8
Author: Patrik Flykt <patrik.flykt at linux.intel.com>
Date: Tue Feb 18 16:07:40 2014 +0200
libsystemd-dhcp: Add a full DHCP address acquisition test case
Upon startup the DHCP library will immediately send a DHCP Discover.
Handle the additional DHCP Discover checking and DHCP Offer sending
in test_addr_acq_recv_discover(). Write a zero UDP checksum, the
received XID and the faked MAC address into place to create a DHCP
message the library can accept.
Follow exactly the same steps when receiving a DHCP Request in
test_addr_acq_recv_request() and send the Ack. Check that the proper
addresses have been found by the DHCP library before exiting the
main loop and finishing the test.
diff --git a/src/libsystemd-dhcp/test-dhcp-client.c b/src/libsystemd-dhcp/test-dhcp-client.c
index e06f581..005d6c2 100644
--- a/src/libsystemd-dhcp/test-dhcp-client.c
+++ b/src/libsystemd-dhcp/test-dhcp-client.c
@@ -43,6 +43,7 @@ typedef int (*test_callback_recv_t)(size_t size, DHCPMessage *dhcp);
static bool verbose = false;
static int test_fd[2];
static test_callback_recv_t callback_recv;
+static be32_t xid;
static void test_request_basic(sd_event *e)
{
@@ -262,6 +263,223 @@ static void test_discover_message(sd_event *e)
callback_recv = NULL;
}
+static uint8_t test_addr_acq_offer[] = {
+ 0x45, 0x10, 0x01, 0x48, 0x00, 0x00, 0x00, 0x00,
+ 0x80, 0x11, 0xb3, 0x84, 0xc0, 0xa8, 0x02, 0x01,
+ 0xc0, 0xa8, 0x02, 0xbf, 0x00, 0x43, 0x00, 0x44,
+ 0x01, 0x34, 0x00, 0x00, 0x02, 0x01, 0x06, 0x00,
+ 0x6f, 0x95, 0x2f, 0x30, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xc0, 0xa8, 0x02, 0xbf,
+ 0xc0, 0xa8, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x63, 0x82, 0x53, 0x63, 0x35, 0x01, 0x02, 0x36,
+ 0x04, 0xc0, 0xa8, 0x02, 0x01, 0x33, 0x04, 0x00,
+ 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,
+ 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static uint8_t test_addr_acq_ack[] = {
+ 0x45, 0x10, 0x01, 0x48, 0x00, 0x00, 0x00, 0x00,
+ 0x80, 0x11, 0xb3, 0x84, 0xc0, 0xa8, 0x02, 0x01,
+ 0xc0, 0xa8, 0x02, 0xbf, 0x00, 0x43, 0x00, 0x44,
+ 0x01, 0x34, 0x00, 0x00, 0x02, 0x01, 0x06, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xc0, 0xa8, 0x02, 0xbf,
+ 0xc0, 0xa8, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 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, 0x2a, 0x04, 0xc0, 0xa8, 0x02, 0x01, 0x0f,
+ 0x09, 0x6c, 0x61, 0x62, 0x2e, 0x69, 0x6e, 0x74,
+ 0x72, 0x61, 0x03, 0x04, 0xc0, 0xa8, 0x02, 0x01,
+ 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static void test_addr_acq_acquired(sd_dhcp_client *client, int event,
+ void *userdata)
+{
+ sd_event *e = userdata;
+ sd_dhcp_lease *lease;
+ struct in_addr addr;
+
+ assert(client);
+ assert(event == DHCP_EVENT_IP_ACQUIRE);
+
+ assert(sd_dhcp_client_get_lease(client, &lease) >= 0);
+ assert(lease);
+
+ assert(sd_dhcp_lease_get_address(lease, &addr) >= 0);
+ assert(memcmp(&addr.s_addr, &test_addr_acq_ack[44],
+ sizeof(addr.s_addr)) == 0);
+
+ assert(sd_dhcp_lease_get_netmask(lease, &addr) >= 0);
+ assert(memcmp(&addr.s_addr, &test_addr_acq_ack[285],
+ sizeof(addr.s_addr)) == 0);
+
+ assert(sd_dhcp_lease_get_router(lease, &addr) >= 0);
+ assert(memcmp(&addr.s_addr, &test_addr_acq_ack[308],
+ sizeof(addr.s_addr)) == 0);
+
+ if (verbose)
+ printf(" DHCP address acquired\n");
+
+ sd_event_exit(e, 0);
+}
+
+static int test_addr_acq_recv_request(size_t size, DHCPMessage *request)
+{
+ uint16_t udp_check = 0;
+ int res;
+
+ res = dhcp_option_parse(request, size, check_options, NULL);
+ assert(res == DHCP_REQUEST);
+ assert(xid == request->xid);
+
+ if (verbose)
+ printf(" recv DHCP Request 0x%08x\n", be32toh(xid));
+
+ memcpy(&test_addr_acq_ack[26], &udp_check, sizeof(udp_check));
+ memcpy(&test_addr_acq_ack[32], &xid, sizeof(xid));
+ memcpy(&test_addr_acq_ack[56], &mac_addr.ether_addr_octet,
+ ETHER_ADDR_LEN);
+
+ callback_recv = NULL;
+
+ res = write(test_fd[1], test_addr_acq_ack,
+ sizeof(test_addr_acq_ack));
+ assert(res == sizeof(test_addr_acq_ack));
+
+ if (verbose)
+ printf(" send DHCP Ack\n");
+
+ return 0;
+};
+
+static int test_addr_acq_recv_discover(size_t size, DHCPMessage *discover)
+{
+ uint16_t udp_check = 0;
+ int res;
+
+ res = dhcp_option_parse(discover, size, check_options, NULL);
+ assert(res == DHCP_DISCOVER);
+
+ xid = discover->xid;
+
+ if (verbose)
+ printf(" recv DHCP Discover 0x%08x\n", be32toh(xid));
+
+ memcpy(&test_addr_acq_offer[26], &udp_check, sizeof(udp_check));
+ memcpy(&test_addr_acq_offer[32], &xid, sizeof(xid));
+ memcpy(&test_addr_acq_offer[56], &mac_addr.ether_addr_octet,
+ ETHER_ADDR_LEN);
+
+ callback_recv = test_addr_acq_recv_request;
+
+ res = write(test_fd[1], test_addr_acq_offer,
+ sizeof(test_addr_acq_offer));
+ assert(res == sizeof(test_addr_acq_offer));
+
+ if (verbose)
+ printf(" send DHCP Offer\n");
+
+ return 0;
+}
+
+static void test_addr_acq(sd_event *e)
+{
+ sd_dhcp_client *client;
+ int res, r;
+
+ if (verbose)
+ printf("* %s\n", __FUNCTION__);
+
+ r = sd_dhcp_client_new(&client);
+ assert(r >= 0);
+ assert(client);
+
+ r = sd_dhcp_client_attach_event(client, e, 0);
+ assert(r >= 0);
+
+ assert(sd_dhcp_client_set_index(client, 42) >= 0);
+ assert(sd_dhcp_client_set_mac(client, &mac_addr) >= 0);
+
+ assert(sd_dhcp_client_set_callback(client, test_addr_acq_acquired, e)
+ >= 0);
+
+ callback_recv = test_addr_acq_recv_discover;
+
+ res = sd_dhcp_client_start(client);
+ assert(res == 0 || res == -EINPROGRESS);
+
+ sd_event_loop(e);
+
+ sd_dhcp_client_set_callback(client, NULL, NULL);
+ sd_dhcp_client_stop(client);
+ sd_dhcp_client_free(client);
+
+ close(test_fd[0]);
+ close(test_fd[1]);
+
+ callback_recv = NULL;
+ xid = 0;
+}
+
int main(int argc, char *argv[])
{
sd_event *e;
@@ -272,6 +490,7 @@ int main(int argc, char *argv[])
test_checksum();
test_discover_message(e);
+ test_addr_acq(e);
return 0;
}
commit 6c8a0f07f21fd32e840ef00f89dd226418f5f8a0
Author: Patrik Flykt <patrik.flykt at linux.intel.com>
Date: Tue Feb 18 16:07:39 2014 +0200
libsystemd-dhcp: Factor out test code for DHCP message verification
Add a callback function that will handle the test case specific checking.
diff --git a/src/libsystemd-dhcp/test-dhcp-client.c b/src/libsystemd-dhcp/test-dhcp-client.c
index 32c79eb..e06f581 100644
--- a/src/libsystemd-dhcp/test-dhcp-client.c
+++ b/src/libsystemd-dhcp/test-dhcp-client.c
@@ -38,8 +38,11 @@ static struct ether_addr mac_addr = {
.ether_addr_octet = {'A', 'B', 'C', '1', '2', '3'}
};
+typedef int (*test_callback_recv_t)(size_t size, DHCPMessage *dhcp);
+
static bool verbose = false;
static int test_fd[2];
+static test_callback_recv_t callback_recv;
static void test_request_basic(sd_event *e)
{
@@ -148,7 +151,6 @@ int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link,
size_t size;
_cleanup_free_ DHCPPacket *discover;
uint16_t ip_check, udp_check;
- int res;
assert(s >= 0);
assert(packet);
@@ -158,8 +160,6 @@ int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link,
discover = memdup(packet, len);
- assert(memcmp(discover->dhcp.chaddr,
- &mac_addr.ether_addr_octet, 6) == 0);
assert(discover->ip.ttl == IPDEFTTL);
assert(discover->ip.protocol == IPPROTO_UDP);
assert(discover->ip.saddr == INADDR_ANY);
@@ -181,11 +181,14 @@ int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link,
ip_check = ~client_checksum(&discover->ip, sizeof(discover->ip));
assert(ip_check == 0xffff);
+ assert(discover->dhcp.xid);
+ assert(memcmp(discover->dhcp.chaddr,
+ &mac_addr.ether_addr_octet, 6) == 0);
+
size = len - sizeof(struct iphdr) - sizeof(struct udphdr);
- res = dhcp_option_parse(&discover->dhcp, size, check_options, NULL);
- if (res < 0)
- return res;
+ assert(callback_recv);
+ callback_recv(size, &discover->dhcp);
return 575;
}
@@ -209,6 +212,19 @@ int dhcp_network_send_udp_socket(int s, be32_t address, uint16_t port,
return 0;
}
+static int test_discover_message_verify(size_t size, struct DHCPMessage *dhcp)
+{
+ int res;
+
+ res = dhcp_option_parse(dhcp, size, check_options, NULL);
+ assert(res == DHCP_DISCOVER);
+
+ if (verbose)
+ printf(" recv DHCP Discover 0x%08x\n", be32toh(dhcp->xid));
+
+ return 0;
+}
+
static void test_discover_message(sd_event *e)
{
sd_dhcp_client *client;
@@ -229,12 +245,21 @@ static void test_discover_message(sd_event *e)
assert(sd_dhcp_client_set_request_option(client, 248) >= 0);
+ callback_recv = test_discover_message_verify;
+
res = sd_dhcp_client_start(client);
assert(res == 0 || res == -EINPROGRESS);
+ sd_event_run(e, (uint64_t) -1);
+
+ sd_dhcp_client_stop(client);
+ sd_dhcp_client_free(client);
+
close(test_fd[0]);
close(test_fd[1]);
+
+ callback_recv = NULL;
}
int main(int argc, char *argv[])
@@ -247,7 +272,6 @@ int main(int argc, char *argv[])
test_checksum();
test_discover_message(e);
- sd_event_run(e, (uint64_t) -1);
return 0;
}
commit ede286f9d433fbf3fa46794ae8d906697a5b303d
Author: Patrik Flykt <patrik.flykt at linux.intel.com>
Date: Tue Feb 18 16:07:38 2014 +0200
libsystemd-dhcp: Add capability to print out test steps
diff --git a/src/libsystemd-dhcp/test-dhcp-client.c b/src/libsystemd-dhcp/test-dhcp-client.c
index f341b3c..32c79eb 100644
--- a/src/libsystemd-dhcp/test-dhcp-client.c
+++ b/src/libsystemd-dhcp/test-dhcp-client.c
@@ -38,6 +38,7 @@ static struct ether_addr mac_addr = {
.ether_addr_octet = {'A', 'B', 'C', '1', '2', '3'}
};
+static bool verbose = false;
static int test_fd[2];
static void test_request_basic(sd_event *e)
@@ -46,6 +47,9 @@ static void test_request_basic(sd_event *e)
sd_dhcp_client *client;
+ if (verbose)
+ printf("* %s\n", __FUNCTION__);
+
r = sd_dhcp_client_new(&client);
assert(r >= 0);
@@ -126,6 +130,9 @@ static void test_checksum(void)
0xff, 0xff, 0xff, 0xff
};
+ if (verbose)
+ printf("* %s\n", __FUNCTION__);
+
assert(client_checksum(&buf, 20) == be16toh(0x78ae));
}
@@ -207,6 +214,9 @@ static void test_discover_message(sd_event *e)
sd_dhcp_client *client;
int res, r;
+ if (verbose)
+ printf("* %s\n", __FUNCTION__);
+
r = sd_dhcp_client_new(&client);
assert(r >= 0);
assert(client);
More information about the systemd-commits
mailing list