svn commit: r340530 - stable/12/sys/netpfil/ipfw

[Andrey V. Elsukov]

Author: ae
Date: Sat Nov 17 23:58:55 2018
New Revision: 340530
URL: https://svnweb.freebsd.org/changeset/base/340530

Log:
  MFC r339545:
    Do not decrement RST life time if keep_alive is not turned on.
  
    This allows use differen values configured by user for sysctl variable
    net.inet.ip.fw.dyn_rst_lifetime.
  
    Obtained from:	Yandex LLC
    Sponsored by:	Yandex LLC

Modified:
  stable/12/sys/netpfil/ipfw/ip_fw_dynamic.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netpfil/ipfw/ip_fw_dynamic.c
==============================================================================
--- stable/12/sys/netpfil/ipfw/ip_fw_dynamic.c	Sat Nov 17 23:57:46 2018	(r340529)
+++ stable/12/sys/netpfil/ipfw/ip_fw_dynamic.c	Sat Nov 17 23:58:55 2018	(r340530)
@@ -979,7 +979,8 @@ dyn_update_tcp_state(struct dyn_data *data, const stru
 		break;
 
 	default:
-		if (V_dyn_rst_lifetime >= V_dyn_keepalive_period)
+		if (V_dyn_keepalive != 0 &&
+		    V_dyn_rst_lifetime >= V_dyn_keepalive_period)
 			V_dyn_rst_lifetime = V_dyn_keepalive_period - 1;
 		expire = time_uptime + V_dyn_rst_lifetime;
 	}