Author: ae
Date: Tue Dec  4 09:16:20 2018
New Revision: 341461
URL: https://svnweb.freebsd.org/changeset/base/341461

Log:
  MFC r341073:
    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

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  Tue Dec  4 07:48:43 2018        
(r341460)
+++ stable/12/sys/netpfil/ipfw/ip_fw_dynamic.c  Tue Dec  4 09:16:20 2018        
(r341461)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to