diff options
| author | Bernard Xiong <[email protected]> | 2018-10-18 15:58:35 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-10-18 15:58:35 +0800 |
| commit | 29b49f46ddd495aaeb7c75880d8515623d656982 (patch) | |
| tree | 56150ff4babcc9ed4f01bbf9811ed6f83a88d095 /components | |
| parent | 9c255e7d2f0cfb696634ab51572f2dce66fb4672 (diff) | |
| parent | e05cdc69a0e95b2262a4bb01ed7915c3d33af3ff (diff) | |
Merge pull request #1905 from enkiller/dev
[components][net] dhcpd Support LWIP2.0 and LWIP1.4
Diffstat (limited to 'components')
| -rw-r--r-- | components/net/lwip_dhcpd/dhcp_server.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/net/lwip_dhcpd/dhcp_server.c b/components/net/lwip_dhcpd/dhcp_server.c index 47717fb894..3f0e7a6daf 100644 --- a/components/net/lwip_dhcpd/dhcp_server.c +++ b/components/net/lwip_dhcpd/dhcp_server.c @@ -222,11 +222,12 @@ static void dhcpd_thread_entry(void *parameter) { #if (LWIP_VERSION) >= 0x02000000U ip4_addr_t addr; + ip4addr_aton(DHCPD_SERVER_IP, &addr); #else struct ip_addr addr; + ipaddr_aton(DHCPD_SERVER_IP, &addr); #endif /* LWIP_VERSION */ - ip4addr_aton(DHCPD_SERVER_IP, &addr); DHCPD_SERVER_IPADDR0 = (ntohl(addr.addr) >> 24) & 0xFF; DHCPD_SERVER_IPADDR1 = (ntohl(addr.addr) >> 16) & 0xFF; DHCPD_SERVER_IPADDR2 = (ntohl(addr.addr) >> 8) & 0xFF; |