libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[lwIP] Use RT_LWIP_IPADDR/GWADDR/MSKADDR 

Use RT_LWIP_IPADDR/GWADDR/MSKADDR to replace old options:
RT_LWIP_GWADDR0/1/2/3 etc.
This commit is contained in:
bernard 2017-10-25 17:37:59 +08:00
parent 67fff44fdd
commit 1f76e1b8ec
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/net/lwip-1.3.2/src/arch/sys_arch_init.c
View File

@ -123,9 +123,9 @@ void lwip_system_init(void)
{ {
struct ip_addr ipaddr, netmask, gw; struct ip_addr ipaddr, netmask, gw;
IP4_ADDR(&ipaddr, RT_LWIP_IPADDR0, RT_LWIP_IPADDR1, RT_LWIP_IPADDR2, RT_LWIP_IPADDR3); ipaddr.addr = inet_addr(RT_LWIP_IPADDR);
IP4_ADDR(&gw, RT_LWIP_GWADDR0, RT_LWIP_GWADDR1, RT_LWIP_GWADDR2, RT_LWIP_GWADDR3); gw.addr = inet_addr(RT_LWIP_GWADDR);
IP4_ADDR(&netmask, RT_LWIP_MSKADDR0, RT_LWIP_MSKADDR1, RT_LWIP_MSKADDR2, RT_LWIP_MSKADDR3); netmask.addr = inet_addr(RT_LWIP_MSKADDR);
netifapi_netif_set_addr(netif_default, &ipaddr, &netmask, &gw); netifapi_netif_set_addr(netif_default, &ipaddr, &netmask, &gw);
} }

6
components/net/lwip-1.4.1/src/arch/sys_arch.c
View File

@ -167,9 +167,9 @@ int lwip_system_init(void)
{ {
struct ip_addr ipaddr, netmask, gw; struct ip_addr ipaddr, netmask, gw;
IP4_ADDR(&ipaddr, RT_LWIP_IPADDR0, RT_LWIP_IPADDR1, RT_LWIP_IPADDR2, RT_LWIP_IPADDR3); ipaddr.addr = inet_addr(RT_LWIP_IPADDR);
IP4_ADDR(&gw, RT_LWIP_GWADDR0, RT_LWIP_GWADDR1, RT_LWIP_GWADDR2, RT_LWIP_GWADDR3); gw.addr = inet_addr(RT_LWIP_GWADDR);
IP4_ADDR(&netmask, RT_LWIP_MSKADDR0, RT_LWIP_MSKADDR1, RT_LWIP_MSKADDR2, RT_LWIP_MSKADDR3); netmask.addr = inet_addr(RT_LWIP_MSKADDR);
netifapi_netif_set_addr(netif_default, &ipaddr, &netmask, &gw); netifapi_netif_set_addr(netif_default, &ipaddr, &netmask, &gw);
} }

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

@ -240,9 +240,9 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16
else else
#endif #endif
{ {
IP4_ADDR(&ipaddr, RT_LWIP_IPADDR0, RT_LWIP_IPADDR1, RT_LWIP_IPADDR2, RT_LWIP_IPADDR3); ipaddr.addr = inet_addr(RT_LWIP_IPADDR);
IP4_ADDR(&gw, RT_LWIP_GWADDR0, RT_LWIP_GWADDR1, RT_LWIP_GWADDR2, RT_LWIP_GWADDR3); gw.addr = inet_addr(RT_LWIP_GWADDR);
IP4_ADDR(&netmask, RT_LWIP_MSKADDR0, RT_LWIP_MSKADDR1, RT_LWIP_MSKADDR2, RT_LWIP_MSKADDR3); netmask.addr = inet_addr(RT_LWIP_MSKADDR);
} }
netifapi_netif_add(netif, &ipaddr, &netmask, &gw, dev, eth_netif_device_init, tcpip_input); netifapi_netif_add(netif, &ipaddr, &netmask, &gw, dev, eth_netif_device_init, tcpip_input);

11
components/net/lwip-2.0.2/src/arch/sys_arch.c
View File

@ -28,6 +28,7 @@
#include "lwip/sio.h" #include "lwip/sio.h"
#include "lwip/init.h" #include "lwip/init.h"
#include "lwip/dhcp.h" #include "lwip/dhcp.h"
#include "lwip/inet.h"
#include <string.h> #include <string.h>
@ -166,16 +167,16 @@ int lwip_system_init(void)
{ {
struct ip4_addr ipaddr, netmask, gw; struct ip4_addr ipaddr, netmask, gw;
IP4_ADDR(&ipaddr, RT_LWIP_IPADDR0, RT_LWIP_IPADDR1, RT_LWIP_IPADDR2, RT_LWIP_IPADDR3); ipaddr.addr = inet_addr(RT_LWIP_IPADDR);
IP4_ADDR(&gw, RT_LWIP_GWADDR0, RT_LWIP_GWADDR1, RT_LWIP_GWADDR2, RT_LWIP_GWADDR3); gw.addr = inet_addr(RT_LWIP_GWADDR);
IP4_ADDR(&netmask, RT_LWIP_MSKADDR0, RT_LWIP_MSKADDR1, RT_LWIP_MSKADDR2, RT_LWIP_MSKADDR3); netmask.addr = inet_addr(RT_LWIP_MSKADDR);
netifapi_netif_set_addr(netif_default, &ipaddr, &netmask, &gw); netifapi_netif_set_addr(netif_default, &ipaddr, &netmask, &gw);
} }
#endif #endif
rt_kprintf("lwIP-%d.%d.%d initialized!\n", LWIP_VERSION_MAJOR, LWIP_VERSION_MINOR, LWIP_VERSION_REVISION); rt_kprintf("lwIP-%d.%d.%d initialized!\n", LWIP_VERSION_MAJOR, LWIP_VERSION_MINOR, LWIP_VERSION_REVISION);
return 0; return 0;
} }
INIT_COMPONENT_EXPORT(lwip_system_init); INIT_COMPONENT_EXPORT(lwip_system_init);

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

@ -74,6 +74,8 @@
#include "netif/etharp.h" #include "netif/etharp.h"
#include "netif/ethernetif.h" #include "netif/ethernetif.h"
#include "lwip/inet.h"
#define netifapi_netif_set_link_up(n) netifapi_netif_common(n, netif_set_link_up, NULL) #define netifapi_netif_set_link_up(n) netifapi_netif_common(n, netif_set_link_up, NULL)
#define netifapi_netif_set_link_down(n) netifapi_netif_common(n, netif_set_link_down, NULL) #define netifapi_netif_set_link_down(n) netifapi_netif_common(n, netif_set_link_down, NULL)
@ -246,15 +248,14 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16
ip_addr_t ipaddr, netmask, gw; ip_addr_t ipaddr, netmask, gw;
#if !LWIP_DHCP #if !LWIP_DHCP
IP4_ADDR(&ipaddr, RT_LWIP_IPADDR0, RT_LWIP_IPADDR1, RT_LWIP_IPADDR2, RT_LWIP_IPADDR3); ipaddr.addr = inet_addr(RT_LWIP_IPADDR);
IP4_ADDR(&gw, RT_LWIP_GWADDR0, RT_LWIP_GWADDR1, RT_LWIP_GWADDR2, RT_LWIP_GWADDR3); gw.addr = inet_addr(RT_LWIP_GWADDR);
IP4_ADDR(&netmask, RT_LWIP_MSKADDR0, RT_LWIP_MSKADDR1, RT_LWIP_MSKADDR2, RT_LWIP_MSKADDR3); netmask.addr = inet_addr(RT_LWIP_MSKADDR);
#else #else
IP4_ADDR(&ipaddr, 0, 0, 0, 0); IP4_ADDR(&ipaddr, 0, 0, 0, 0);
IP4_ADDR(&gw, 0, 0, 0, 0); IP4_ADDR(&gw, 0, 0, 0, 0);
IP4_ADDR(&netmask, 0, 0, 0, 0); IP4_ADDR(&netmask, 0, 0, 0, 0);
#endif #endif
netifapi_netif_add(netif, &ipaddr, &netmask, &gw, dev, eth_netif_device_init, tcpip_input); netifapi_netif_add(netif, &ipaddr, &netmask, &gw, dev, eth_netif_device_init, tcpip_input);
} }