RT-Thread
/
rt-thread
mirror of https://github.com/RT-Thread/rt-thread
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[lwIP] fix lwip 2.0.0 compiling issue.

This commit is contained in:
bernard 2017-01-31 13:18:03 +08:00
parent c53389e46f
commit 355b926e89
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/net/lwip-2.0.0/src/arch/sys_arch.c
View File

@ -693,9 +693,7 @@ RTM_EXPORT(lwip_ioctl);
RTM_EXPORT(lwip_fcntl); RTM_EXPORT(lwip_fcntl);
RTM_EXPORT(lwip_htons); RTM_EXPORT(lwip_htons);
RTM_EXPORT(lwip_ntohs);
RTM_EXPORT(lwip_htonl); RTM_EXPORT(lwip_htonl);
RTM_EXPORT(lwip_ntohl);
#if LWIP_DNS #if LWIP_DNS
#include <lwip/netdb.h> #include <lwip/netdb.h>

7
components/net/lwip-2.0.0/src/netif/ethernetif.c
View File

@ -581,7 +581,6 @@ void list_tcps(void)
extern struct tcp_pcb *tcp_active_pcbs; extern struct tcp_pcb *tcp_active_pcbs;
extern union tcp_listen_pcbs_t tcp_listen_pcbs; extern union tcp_listen_pcbs_t tcp_listen_pcbs;
extern struct tcp_pcb *tcp_tw_pcbs; extern struct tcp_pcb *tcp_tw_pcbs;
extern const char *tcp_state_str[];
rt_enter_critical(); rt_enter_critical();
rt_kprintf("Active PCB states:\n"); rt_kprintf("Active PCB states:\n");
@ -598,7 +597,7 @@ void list_tcps(void)
pcb->remote_port, pcb->remote_port,
pcb->snd_nxt, pcb->snd_nxt,
pcb->rcv_nxt); pcb->rcv_nxt);
rt_kprintf("state: %s\n", tcp_state_str[pcb->state]); rt_kprintf("state: %s\n", tcp_debug_state_str(pcb->state));
} }
rt_kprintf("Listen PCB states:\n"); rt_kprintf("Listen PCB states:\n");
@ -606,7 +605,7 @@ void list_tcps(void)
for(pcb = (struct tcp_pcb *)tcp_listen_pcbs.pcbs; pcb != NULL; pcb = pcb->next) for(pcb = (struct tcp_pcb *)tcp_listen_pcbs.pcbs; pcb != NULL; pcb = pcb->next)
{ {
rt_kprintf("#%d local port %d ", num++, pcb->local_port); rt_kprintf("#%d local port %d ", num++, pcb->local_port);
rt_kprintf("state: %s\n", tcp_state_str[pcb->state]); rt_kprintf("state: %s\n", tcp_debug_state_str(pcb->state));
} }
rt_kprintf("TIME-WAIT PCB states:\n"); rt_kprintf("TIME-WAIT PCB states:\n");
@ -624,7 +623,7 @@ void list_tcps(void)
pcb->remote_port, pcb->remote_port,
pcb->snd_nxt, pcb->snd_nxt,
pcb->rcv_nxt); pcb->rcv_nxt);
rt_kprintf("state: %s\n", tcp_state_str[pcb->state]); rt_kprintf("state: %s\n", tcp_debug_state_str(pcb->state));
} }
rt_exit_critical(); rt_exit_critical();
} }

5
components/net/lwip_dhcpd/dhcp_server.c
View File

@ -37,6 +37,11 @@
#include <netif/etharp.h> #include <netif/etharp.h>
#include <netif/ethernetif.h> #include <netif/ethernetif.h>
#include <lwip/ip.h> #include <lwip/ip.h>
#include <lwip/init.h>
#if (LWIP_VERSION) >= 0x02000000U
#include <lwip/prot/dhcp.h>
#endif
/* DHCP server option */ /* DHCP server option */