diff options
| author | Bernard Xiong <[email protected]> | 2021-01-29 14:21:33 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-29 14:21:33 +0800 |
| commit | c4d16d706e493169472075f77f020ef9af1fd096 (patch) | |
| tree | 4e7e1d1ae0310980c30a5a0e3a55263ab7b7f7e2 /components | |
| parent | 8b0d2bd323ac266898d657466e62a8abc5b78a1f (diff) | |
| parent | 74691ea7831fe155a54d5784939ad523cca1c3c7 (diff) | |
Merge pull request #4243 from zhouji92/master
[fix] 修复使用lwip 2.1.2作为协议栈，并使能dhcp server选项时，编译报错问题。
Diffstat (limited to 'components')
| -rw-r--r-- | components/net/lwip_dhcpd/SConscript | 2 | ||||
| -rw-r--r-- | components/net/lwip_dhcpd/dhcp_server.c | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/components/net/lwip_dhcpd/SConscript b/components/net/lwip_dhcpd/SConscript index 16c673036a..837eb043e4 100644 --- a/components/net/lwip_dhcpd/SConscript +++ b/components/net/lwip_dhcpd/SConscript @@ -2,7 +2,7 @@ from building import * cwd = GetCurrentDir() -if GetDepend('RT_USING_LWIP202') or GetDepend('RT_USING_LWIP210') : +if GetDepend('RT_USING_LWIP202') or GetDepend('RT_USING_LWIP212') : src = ['dhcp_server_raw.c'] else: src = ['dhcp_server.c'] diff --git a/components/net/lwip_dhcpd/dhcp_server.c b/components/net/lwip_dhcpd/dhcp_server.c index 93b4ad16f0..b37d038b86 100644 --- a/components/net/lwip_dhcpd/dhcp_server.c +++ b/components/net/lwip_dhcpd/dhcp_server.c @@ -80,6 +80,22 @@ #define LWIP_DHCP 1 #include <lwip/dhcp.h> +#ifndef DHCP_CLIENT_PORT +#define DHCP_CLIENT_PORT 68 +#endif + +#ifndef DHCP_SERVER_PORT +#define DHCP_SERVER_PORT 67 +#endif + +#ifndef ETHADDR32_COPY +#define ETHADDR32_COPY(dst, src) SMEMCPY(dst, src, ETH_HWADDR_LEN) +#endif + +#ifndef ETHADDR16_COPY +#define ETHADDR16_COPY(dst, src) SMEMCPY(dst, src, ETH_HWADDR_LEN) +#endif + /* buffer size for receive DHCP packet */ #define BUFSZ 1024 |