提交 52d1c50e 编写于 作者: Lawlieta's avatar Lawlieta

[net][lwip] Fix set_if() compile error when enable dhcpd fucntion and close finsh.

[net][dhcpd]Fix dhcpd fucntion compile error in lwIP 2.1.0.
上级 dcd8b802
...@@ -686,8 +686,6 @@ int eth_system_device_init(void) ...@@ -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) ...@@ -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
......
...@@ -715,8 +715,6 @@ int eth_system_device_init_private(void) ...@@ -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) ...@@ -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
......
...@@ -720,8 +720,6 @@ int eth_system_device_init_private(void) ...@@ -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) ...@@ -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,7 +2,7 @@ from building import * ...@@ -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']
......
...@@ -97,6 +97,10 @@ ...@@ -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.
*/ */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册