chinky/rtt-f030
chinky
/
rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #616 from hchunhui/lwip_nat-fix 

fix various bugs in lwip-nat
This commit is contained in:
Bernard Xiong 2016-03-16 20:40:54 +08:00
parent e0998e3c23 7290ff5d76
commit e41c6c6c0c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/net/lwip_nat/ipv4_nat.c
View File

@ -229,7 +229,7 @@ nat_timer(void *arg)
LWIP_DEBUGF(TIMERS_DEBUG, ("tcpip: nat_timer()\n"));
ip_nat_tmr();
sys_timeout(LWIP_NAT_TMR_INTERVAL_SEC, nat_timer, NULL);
sys_timeout(LWIP_NAT_TMR_INTERVAL_SEC * 1000, nat_timer, NULL);
}
/** Initialize this module */
@ -255,7 +255,7 @@ ip_nat_init(void)
rt_enter_critical();
/* add a lwip timer for NAT */
sys_timeout(LWIP_NAT_TMR_INTERVAL_SEC, nat_timer, NULL);
sys_timeout(LWIP_NAT_TMR_INTERVAL_SEC * 1000, nat_timer, NULL);
/* un-protect */
rt_exit_critical();
@ -370,12 +370,12 @@ ip_nat_reset_state(ip_nat_conf_t *cfg)
}
}
for (i = 0; i < LWIP_NAT_DEFAULT_STATE_TABLES_TCP; i++) {
if(ip_nat_icmp_table[i].common.cfg == cfg) {
if(ip_nat_tcp_table[i].common.cfg == cfg) {
IPNAT_ENTRY_RESET(&ip_nat_tcp_table[i].common);
}
}
for (i = 0; i < LWIP_NAT_DEFAULT_STATE_TABLES_UDP; i++) {
if(ip_nat_icmp_table[i].common.cfg == cfg) {
if(ip_nat_udp_table[i].common.cfg == cfg) {
IPNAT_ENTRY_RESET(&ip_nat_udp_table[i].common);
}
}
@ -622,7 +622,7 @@ ip_nat_tmr(void)
}
}
/** Vheck if we want to perform NAT with this packet. If so, send it out on
/** Check if we want to perform NAT with this packet. If so, send it out on
* the correct interface.
*
* @param p the packet to test/send

2
components/net/lwip_nat/ipv4_nat.h
View File

@ -67,7 +67,7 @@
#include "lwip/opt.h"
/** Timer interval at which to call ip_nat_tmr() */
#define LWIP_NAT_TMR_INTERVAL_SEC (30*1000)
#define LWIP_NAT_TMR_INTERVAL_SEC (30)
#ifdef __cplusplus
extern "C" {