andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix compile error.

Browse Source
This commit is contained in:
Elwin Huang
2025-07-25 18:58:33 +08:00
committed by GitHub
parent c1d3fc8031
commit bf18444e97
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/networking/dhserver.c
View File

@@ -234,14 +234,16 @@ int fill_options(void *dest,
static ip_addr_t get_dhcp_destination(struct netif *netif, const DHCP_TYPE *dhcp, static ip_addr_t get_dhcp_destination(struct netif *netif, const DHCP_TYPE *dhcp,
const ip4_addr_t *yiaddr, bool is_nak) const ip4_addr_t *yiaddr, bool is_nak)
{ {
bool giaddr_zero = ip4_addr_isany_val(*((ip4_addr_t*)dhcp->dp_giaddr)); ip4_addr_t giaddr = get_ip(dhcp->dp_giaddr);
bool ciaddr_zero = ip4_addr_isany_val(*((ip4_addr_t*)dhcp->dp_ciaddr)); 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; bool broadcast_flag = (dhcp->dp_flags & htons(0x8000)) != 0;
ip_addr_t dest_addr; ip_addr_t dest_addr;
if (!giaddr_zero) { if (!giaddr_zero) {
// If giaddr is not zero, send to giaddr (relay agent) // 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; return dest_addr;
} }
@@ -254,7 +256,7 @@ static ip_addr_t get_dhcp_destination(struct netif *netif, const DHCP_TYPE *dhcp
if (!ciaddr_zero) { if (!ciaddr_zero) {
// RFC 2131: "If the 'giaddr' field is zero and the 'ciaddr' field is nonzero, // 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'" // 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; return dest_addr;
} }