diff --git a/components/net/lwip-2.0.0/src/arch/sys_arch.c b/components/net/lwip-2.0.0/src/arch/sys_arch.c index 4bbb88c836009ed324862301aa799f4adae72f8e..7db873f1308a889ca29bcec6563d99a6cd5be268 100644 --- a/components/net/lwip-2.0.0/src/arch/sys_arch.c +++ b/components/net/lwip-2.0.0/src/arch/sys_arch.c @@ -693,9 +693,7 @@ RTM_EXPORT(lwip_ioctl); RTM_EXPORT(lwip_fcntl); RTM_EXPORT(lwip_htons); -RTM_EXPORT(lwip_ntohs); RTM_EXPORT(lwip_htonl); -RTM_EXPORT(lwip_ntohl); #if LWIP_DNS #include diff --git a/components/net/lwip-2.0.0/src/netif/ethernetif.c b/components/net/lwip-2.0.0/src/netif/ethernetif.c index 4dd5933bf4741f3ea04c65c4af4b3f3c577f2697..5b4e40ac69bdb19a6b5b3402709c06466c2bff9c 100644 --- a/components/net/lwip-2.0.0/src/netif/ethernetif.c +++ b/components/net/lwip-2.0.0/src/netif/ethernetif.c @@ -581,7 +581,6 @@ void list_tcps(void) extern struct tcp_pcb *tcp_active_pcbs; extern union tcp_listen_pcbs_t tcp_listen_pcbs; extern struct tcp_pcb *tcp_tw_pcbs; - extern const char *tcp_state_str[]; rt_enter_critical(); rt_kprintf("Active PCB states:\n"); @@ -598,7 +597,7 @@ void list_tcps(void) pcb->remote_port, pcb->snd_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"); @@ -606,7 +605,7 @@ void list_tcps(void) 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("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"); @@ -624,7 +623,7 @@ void list_tcps(void) pcb->remote_port, pcb->snd_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(); } diff --git a/components/net/lwip_dhcpd/dhcp_server.c b/components/net/lwip_dhcpd/dhcp_server.c index cb3fc0f46447e4a8acec755e80044640b5d9ed27..4acfb9cba0fae857387a197cdaf4a88d159e4c4f 100644 --- a/components/net/lwip_dhcpd/dhcp_server.c +++ b/components/net/lwip_dhcpd/dhcp_server.c @@ -37,6 +37,11 @@ #include #include #include +#include + +#if (LWIP_VERSION) >= 0x02000000U +#include +#endif /* DHCP server option */