summaryrefslogtreecommitdiff
path: root/lib/networking
diff options
context:
space:
mode:
authorElwin Huang <[email protected]>2025-07-25 18:58:33 +0800
committerGitHub <[email protected]>2025-07-25 18:58:33 +0800
commitbf18444e97ac845501b60e57a68848e820ae9ae6 (patch)
tree1f30d1b8ccc2417fd3e7ed15c9af44668de59b70 /lib/networking
parentc1d3fc803155ea3b4b805b82097412169ed10c2d (diff)
Fix compile error.
Diffstat (limited to 'lib/networking')
-rw-r--r--lib/networking/dhserver.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/networking/dhserver.c b/lib/networking/dhserver.c
index e2f6d7611..b61ec4a33 100644
--- a/lib/networking/dhserver.c
+++ b/lib/networking/dhserver.c
@@ -234,14 +234,16 @@ int fill_options(void *dest,
static ip_addr_t get_dhcp_destination(struct netif *netif, const DHCP_TYPE *dhcp,
const ip4_addr_t *yiaddr, bool is_nak)
{
- bool giaddr_zero = ip4_addr_isany_val(*((ip4_addr_t*)dhcp->dp_giaddr));
- bool ciaddr_zero = ip4_addr_isany_val(*((ip4_addr_t*)dhcp->dp_ciaddr));
+ ip4_addr_t giaddr = get_ip(dhcp->dp_giaddr);
+ ip4_addr_t ciaddr = get_ip(dhcp->dp_ciaddr);
+ bool giaddr_zero = ip4_addr_isany_val(giaddr);
+ bool ciaddr_zero = ip4_addr_isany_val(ciaddr);
bool broadcast_flag = (dhcp->dp_flags & htons(0x8000)) != 0;
ip_addr_t dest_addr;
if (!giaddr_zero) {
// If giaddr is not zero, send to giaddr (relay agent)
- ip_addr_set_ip4_u32(&dest_addr, get_ip(dhcp->dp_giaddr).addr);
+ ip_addr_set_ip4_u32(&dest_addr, giaddr.addr);
return dest_addr;
}
@@ -254,7 +256,7 @@ static ip_addr_t get_dhcp_destination(struct netif *netif, const DHCP_TYPE *dhcp
if (!ciaddr_zero) {
// RFC 2131: "If the 'giaddr' field is zero and the 'ciaddr' field is nonzero,
// then the server unicasts DHCPOFFER and DHCPACK messages to the address in 'ciaddr'"
- ip_addr_set_ip4_u32(&dest_addr, get_ip(dhcp->dp_ciaddr).addr);
+ ip_addr_set_ip4_u32(&dest_addr, ciaddr.addr);
return dest_addr;
}