svn commit: r341073 - head/sys/netpfil/ipfw

[Andrey V. Elsukov]

Author: ae
Date: Tue Nov 27 16:51:01 2018
New Revision: 341073
URL: https://svnweb.freebsd.org/changeset/base/341073

Log:
  Do not limit the mbuf queue length for keepalive packets.
  
  It was unlimited before overhaul, and one user reported that this limit
  can be reached easily.
  
  PR:		233562
  MFC after:	1 week

Modified:
  head/sys/netpfil/ipfw/ip_fw_dynamic.c

Modified: head/sys/netpfil/ipfw/ip_fw_dynamic.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_dynamic.c	Tue Nov 27 16:23:17 2018	(r341072)
+++ head/sys/netpfil/ipfw/ip_fw_dynamic.c	Tue Nov 27 16:51:01 2018	(r341073)
@@ -349,7 +349,6 @@ VNET_DEFINE_STATIC(uint32_t, dyn_short_lifetime);
  * dyn_rst_lifetime and dyn_fin_lifetime should be strictly lower
  * than dyn_keepalive_period.
  */
-#define	DYN_KEEPALIVE_MAXQ		512
 VNET_DEFINE_STATIC(uint32_t, dyn_keepalive_interval);
 VNET_DEFINE_STATIC(uint32_t, dyn_keepalive_period);
 VNET_DEFINE_STATIC(uint32_t, dyn_keepalive);
@@ -2351,7 +2350,7 @@ dyn_send_keepalive_ipv4(struct ip_fw_chain *chain)
 	struct dyn_ipv4_state *s;
 	uint32_t bucket;
 
-	mbufq_init(&q, DYN_KEEPALIVE_MAXQ);
+	mbufq_init(&q, INT_MAX);
 	IPFW_UH_RLOCK(chain);
 	/*
 	 * It is safe to not use hazard pointer and just do lockless
@@ -2458,7 +2457,7 @@ dyn_send_keepalive_ipv6(struct ip_fw_chain *chain)
 	struct dyn_ipv6_state *s;
 	uint32_t bucket;
 
-	mbufq_init(&q, DYN_KEEPALIVE_MAXQ);
+	mbufq_init(&q, INT_MAX);
 	IPFW_UH_RLOCK(chain);
 	/*
 	 * It is safe to not use hazard pointer and just do lockless