diff options
| author | melifaro <melifaro@FreeBSD.org> | 2013-03-02 14:47:10 +0000 |
|---|---|---|
| committer | melifaro <melifaro@FreeBSD.org> | 2013-03-02 14:47:10 +0000 |
| commit | 063bdc75f87d3604c970760a9806706da5e9d4ec (patch) | |
| tree | bdb6cc0b8f35b2491015b7725f2bfa9d27b8fd08 | |
| parent | 5d33901b24a0ca4496b12ca2299df4b62dfdfd35 (diff) | |
| download | FreeBSD-src-063bdc75f87d3604c970760a9806706da5e9d4ec.zip FreeBSD-src-063bdc75f87d3604c970760a9806706da5e9d4ec.tar.gz | |
Fix callout expiring dynamic rules.
PR: kern/175530
Submitted by: Vladimir Spiridenkov <vs@gtn.ru>
MFC after: 2 weeks
| -rw-r--r-- | sys/netpfil/ipfw/ip_fw_dynamic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netpfil/ipfw/ip_fw_dynamic.c b/sys/netpfil/ipfw/ip_fw_dynamic.c index 656e826..b0456d3 100644 --- a/sys/netpfil/ipfw/ip_fw_dynamic.c +++ b/sys/netpfil/ipfw/ip_fw_dynamic.c @@ -980,8 +980,8 @@ ipfw_dyn_tick(void * vnetx) chain = &V_layer3_chain; - /* Run keepalive checks every keepalive_interval iff ka is enabled */ - if ((V_dyn_keepalive_last + V_dyn_keepalive_interval >= time_uptime) && + /* Run keepalive checks every keepalive_period iff ka is enabled */ + if ((V_dyn_keepalive_last + V_dyn_keepalive_period <= time_uptime) && (V_dyn_keepalive != 0)) { V_dyn_keepalive_last = time_uptime; check_ka = 1; @@ -1320,7 +1320,7 @@ ipfw_dyn_init(struct ip_fw_chain *chain) V_dyn_keepalive_interval = 20; V_dyn_keepalive_period = 5; V_dyn_keepalive = 1; /* do send keepalives */ - V_dyn_keepalive = time_uptime; + V_dyn_keepalive_last = time_uptime; V_dyn_max = 4096; /* max # of dynamic rules */ |
