libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2831 from Lawlieta/develop 

[net][lwip][dhcpd] Fix dhcp server compile error in lwIP 2.1.0
This commit is contained in:
Bernard Xiong 2019-07-05 17:09:57 +08:00 committed by GitHub
parent b70791d9dc 52d1c50efe
commit 3eb3a736de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/net/lwip-1.4.1/src/netif/ethernetif.c
View File

@ -686,8 +686,6 @@ int eth_system_device_init(void)
} }
INIT_PREV_EXPORT(eth_system_device_init); INIT_PREV_EXPORT(eth_system_device_init);
#ifdef RT_USING_FINSH
#include <finsh.h>
void set_if(char* netif_name, char* ip_addr, char* gw_addr, char* nm_addr) void set_if(char* netif_name, char* ip_addr, char* gw_addr, char* nm_addr)
{ {
struct ip_addr *ip; struct ip_addr *ip;
@ -733,6 +731,9 @@ void set_if(char* netif_name, char* ip_addr, char* gw_addr, char* nm_addr)
netif_set_netmask(netif, ip); netif_set_netmask(netif, ip);
} }
} }
#ifdef RT_USING_FINSH
#include <finsh.h>
FINSH_FUNCTION_EXPORT(set_if, set network interface address); FINSH_FUNCTION_EXPORT(set_if, set network interface address);
#if LWIP_DNS #if LWIP_DNS

5
components/net/lwip-2.0.2/src/netif/ethernetif.c
View File

@ -715,8 +715,6 @@ int eth_system_device_init_private(void)
return (int)result; return (int)result;
} }
#ifdef RT_USING_FINSH
#include <finsh.h>
void set_if(char* netif_name, char* ip_addr, char* gw_addr, char* nm_addr) void set_if(char* netif_name, char* ip_addr, char* gw_addr, char* nm_addr)
{ {
ip4_addr_t *ip; ip4_addr_t *ip;
@ -762,6 +760,9 @@ void set_if(char* netif_name, char* ip_addr, char* gw_addr, char* nm_addr)
netif_set_netmask(netif, ip); netif_set_netmask(netif, ip);
} }
} }
#ifdef RT_USING_FINSH
#include <finsh.h>
FINSH_FUNCTION_EXPORT(set_if, set network interface address); FINSH_FUNCTION_EXPORT(set_if, set network interface address);
#if LWIP_DNS #if LWIP_DNS

5
components/net/lwip-2.1.0/src/netif/ethernetif.c
View File

@ -720,8 +720,6 @@ int eth_system_device_init_private(void)
return (int)result; return (int)result;
} }
#ifdef RT_USING_FINSH
#include <finsh.h>
void set_if(char* netif_name, char* ip_addr, char* gw_addr, char* nm_addr) void set_if(char* netif_name, char* ip_addr, char* gw_addr, char* nm_addr)
{ {
ip4_addr_t *ip; ip4_addr_t *ip;
@ -767,6 +765,9 @@ void set_if(char* netif_name, char* ip_addr, char* gw_addr, char* nm_addr)
netif_set_netmask(netif, ip); netif_set_netmask(netif, ip);
} }
} }
#ifdef RT_USING_FINSH
#include <finsh.h>
FINSH_FUNCTION_EXPORT(set_if, set network interface address); FINSH_FUNCTION_EXPORT(set_if, set network interface address);
#if LWIP_DNS #if LWIP_DNS

2
components/net/lwip_dhcpd/SConscript
View File

@ -2,7 +2,7 @@ from building import *
cwd = GetCurrentDir() cwd = GetCurrentDir()
if GetDepend('RT_USING_LWIP202'): if GetDepend('RT_USING_LWIP202') or GetDepend('RT_USING_LWIP210') :
src = ['dhcp_server_raw.c'] src = ['dhcp_server_raw.c']
else: else:
src = ['dhcp_server.c'] src = ['dhcp_server.c']

4
components/net/lwip_dhcpd/dhcp_server_raw.c
View File

@ -97,6 +97,10 @@
#define LWIP_NETIF_LOCK(...) #define LWIP_NETIF_LOCK(...)
#define LWIP_NETIF_UNLOCK(...) #define LWIP_NETIF_UNLOCK(...)
#ifndef DHCP_SERVER_PORT
#define DHCP_SERVER_PORT 67
#endif
/** /**
* The dhcp client node struct. * The dhcp client node struct.
*/ */