patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

tests: net: dhcpv4: server: Fix tests after including client ID

Browse source 
Client ID option is now expected in Request/Ack responses so tests need
to be updated accordingly.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
This commit is contained in:
Robert Lubos 2024-03-20 09:55:15 +01:00 committed by Carles Cufí
parent fd113b7102
commit 09c4328b2a
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/net/dhcpv4/server/src/main.c
View file

@ -433,7 +433,7 @@ static void verify_no_option(struct net_pkt *pkt, uint8_t opt_type)
}
static void verify_option(struct net_pkt *pkt, uint8_t opt_type,
void *optval, uint8_t optlen)
const void *optval, uint8_t optlen)
{
struct net_pkt_cursor cursor;
@ -567,11 +567,12 @@ static void verify_offer(bool broadcast)
NET_DHCPV4_MSG_TYPE_OFFER);
verify_option(pkt, DHCPV4_OPTIONS_SERVER_ID, server_addr.s4_addr,
sizeof(struct in_addr));
verify_option(pkt, DHCPV4_OPTIONS_CLIENT_ID, test_ctx.client_id,
strlen(test_ctx.client_id));
verify_option(pkt, DHCPV4_OPTIONS_SUBNET_MASK, netmask.s4_addr,
sizeof(struct in_addr));
verify_no_option(pkt, DHCPV4_OPTIONS_REQ_IPADDR);
verify_no_option(pkt, DHCPV4_OPTIONS_REQ_LIST);
verify_no_option(pkt, DHCPV4_OPTIONS_CLIENT_ID);
}
static void reserved_address_cb(struct net_if *iface,
@ -754,11 +755,16 @@ static void verify_ack(bool inform, bool renew)
NET_DHCPV4_MSG_TYPE_ACK);
verify_option(pkt, DHCPV4_OPTIONS_SERVER_ID, server_addr.s4_addr,
sizeof(struct in_addr));
if (inform) {
verify_no_option(pkt, DHCPV4_OPTIONS_CLIENT_ID);
} else {
verify_option(pkt, DHCPV4_OPTIONS_CLIENT_ID, test_ctx.client_id,
strlen(test_ctx.client_id));
}
verify_option(pkt, DHCPV4_OPTIONS_SUBNET_MASK, netmask.s4_addr,
sizeof(struct in_addr));
verify_no_option(pkt, DHCPV4_OPTIONS_REQ_IPADDR);
verify_no_option(pkt, DHCPV4_OPTIONS_REQ_LIST);
verify_no_option(pkt, DHCPV4_OPTIONS_CLIENT_ID);
}
static void allocated_address_cb(struct net_if *iface,