shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

libsystemd-dhcp: Update client test case for client id and end option

Browse Source 
Check that the client identifier is formatted as suggested in the
RFC and that the messages sent ends with an end option.
This commit is contained in:
Patrik Flykt 2014-03-20 10:31:49 +02:00
parent 9d7bf1d58c
commit d790d3f173
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libsystemd-network/test-dhcp-client.c
View File

@ -128,6 +128,17 @@ static void test_checksum(void)
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,
void *user_data) void *user_data)
{ {
switch(code) {
case DHCP_OPTION_CLIENT_IDENTIFIER:
assert_se(len == 7);
assert_se(option[0] == 0x01);
assert_se(memcmp(&option[1], &mac_addr, ETH_ALEN) == 0);
break;
default:
break;
}
return 0; return 0;
} }
@ -370,12 +381,15 @@ static void test_addr_acq_acquired(sd_dhcp_client *client, int event,
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; uint16_t udp_check = 0;
uint8_t *msg_bytes = (uint8_t *)request;
int res; int res;
res = dhcp_option_parse(request, size, check_options, NULL); res = dhcp_option_parse(request, size, check_options, NULL);
assert_se(res == DHCP_REQUEST); assert_se(res == DHCP_REQUEST);
assert_se(xid == request->xid); assert_se(xid == request->xid);
assert_se(msg_bytes[size - 1] == DHCP_OPTION_END);
if (verbose) if (verbose)
printf(" recv DHCP Request 0x%08x\n", be32toh(xid)); printf(" recv DHCP Request 0x%08x\n", be32toh(xid));
@ -399,11 +413,14 @@ static int test_addr_acq_recv_request(size_t size, DHCPMessage *request)
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; uint16_t udp_check = 0;
uint8_t *msg_bytes = (uint8_t *)discover;
int res; int res;
res = dhcp_option_parse(discover, size, check_options, NULL); res = dhcp_option_parse(discover, size, check_options, NULL);
assert_se(res == DHCP_DISCOVER); assert_se(res == DHCP_DISCOVER);
assert_se(msg_bytes[size - 1] == DHCP_OPTION_END);
xid = discover->xid; xid = discover->xid;
if (verbose) if (verbose)