svn commit: r302015 - stable/10/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Sun Jun 19 00:39:23 2016
New Revision: 302015
URL: https://svnweb.freebsd.org/changeset/base/302015

Log:
  MFC r300259:
  
    Enable the two ip_frag tuneables. The code is there but the two
    ip_frag tuneables aren't registered in the ipf_tuners linked list.
    This commmit enables the two existing ip_frag tuneables by registering
    them.
  
  MFC r300260:
  
    Remove extraneous blank line.

Modified:
  stable/10/sys/contrib/ipfilter/netinet/ip_frag.c
  stable/10/sys/contrib/ipfilter/netinet/ip_frag.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/contrib/ipfilter/netinet/ip_frag.c
==============================================================================
--- stable/10/sys/contrib/ipfilter/netinet/ip_frag.c	Sat Jun 18 23:18:04 2016	(r302014)
+++ stable/10/sys/contrib/ipfilter/netinet/ip_frag.c	Sun Jun 19 00:39:23 2016	(r302015)
@@ -112,7 +112,7 @@ static void ipf_frag_free __P((ipf_frag_
 
 static frentry_t ipfr_block;
 
-const ipftuneable_t ipf_tuneables[] = {
+static ipftuneable_t ipf_frag_tuneables[] = {
 	{ { (void *)offsetof(ipf_frag_softc_t, ipfr_size) },
 		"frag_size",		1,	0x7fffffff,
 		stsizeof(ipf_frag_softc_t, ipfr_size),
@@ -189,6 +189,18 @@ ipf_frag_soft_create(softc)
 	RWLOCK_INIT(&softf->ipfr_frag, "ipf fragment rwlock");
 	RWLOCK_INIT(&softf->ipfr_natfrag, "ipf NAT fragment rwlock");
 
+	softf->ipf_frag_tune = ipf_tune_array_copy(softf,
+						   sizeof(ipf_frag_tuneables),
+						   ipf_frag_tuneables);
+	if (softf->ipf_frag_tune == NULL) {
+		ipf_frag_soft_destroy(softc, softf);
+		return NULL;
+	}
+	if (ipf_tune_array_link(softc, softf->ipf_frag_tune) == -1) {
+		ipf_frag_soft_destroy(softc, softf);
+		return NULL;
+	}
+
 	softf->ipfr_size = IPFT_SIZE;
 	softf->ipfr_ttl = IPF_TTLVAL(60);
 	softf->ipfr_lock = 1;
@@ -219,6 +231,12 @@ ipf_frag_soft_destroy(softc, arg)
 	RW_DESTROY(&softf->ipfr_frag);
 	RW_DESTROY(&softf->ipfr_natfrag);
 
+	if (softf->ipf_frag_tune != NULL) {
+		ipf_tune_array_unlink(softc, softf->ipf_frag_tune);
+		KFREES(softf->ipf_frag_tune, sizeof(ipf_frag_tuneables));
+		softf->ipf_frag_tune = NULL;
+	}
+
 	KFREE(softf);
 }
 

Modified: stable/10/sys/contrib/ipfilter/netinet/ip_frag.h
==============================================================================
--- stable/10/sys/contrib/ipfilter/netinet/ip_frag.h	Sat Jun 18 23:18:04 2016	(r302014)
+++ stable/10/sys/contrib/ipfilter/netinet/ip_frag.h	Sun Jun 19 00:39:23 2016	(r302015)
@@ -78,6 +78,7 @@ typedef struct ipf_frag_softc_s  {
 	int		ipfr_ttl;
 	int		ipfr_lock;
 	int		ipfr_inited;
+	ipftuneable_t	*ipf_frag_tune;
 	ipfr_t		*ipfr_list;
 	ipfr_t		**ipfr_tail;
 	ipfr_t		*ipfr_natlist;