aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2021-02-05 14:26:04 +0000
committerCy Schubert <cy@FreeBSD.org>2021-02-16 00:40:49 +0000
commit46f4eb3f1eb3ec582331941a173abad904ba198d (patch)
treee03461ec3b2da6c13f3130104eb2c58edd0bc7f0
parent98cf94afab4dc1e259c6d12e417ce9f7bda2d447 (diff)
downloadsrc-46f4eb3f1eb3ec582331941a173abad904ba198d.tar.gz
src-46f4eb3f1eb3ec582331941a173abad904ba198d.zip
MFC 344f1083e128d8d41ca31853dac513ca3efd9d1f:
ipfilter: Use the softn (NAT softc) host map size in ip_nat6 calculation. The ipfilter NAT table host map size is a tunable that defaults to a macro value defined at build time. HOSTMAP_SIZE is saved in softn (the ipnat softc) at initialization. It can be tuned (changed) at runtime using the ipf -T command. If the hostmap_size tunable is adjusted the calculation to determine where to put new entries in the table was incorrect. Use the tunable in the NAT softc instead of the static build time value. (cherry picked from commit 344f1083e128d8d41ca31853dac513ca3efd9d1f)
-rw-r--r--sys/contrib/ipfilter/netinet/ip_nat6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_nat6.c b/sys/contrib/ipfilter/netinet/ip_nat6.c
index b2713aec812a..13fa6fb6bc30 100644
--- a/sys/contrib/ipfilter/netinet/ip_nat6.c
+++ b/sys/contrib/ipfilter/netinet/ip_nat6.c
@@ -390,7 +390,7 @@ ipf_nat6_hostmap(softn, np, src, dst, map, port)
hv += dst->i6[2];
hv += dst->i6[1];
hv += dst->i6[0];
- hv %= HOSTMAP_SIZE;
+ hv %= softn->ipf_nat_hostmap_sz;
for (hm = softn->ipf_hm_maptable[hv]; hm; hm = hm->hm_next)
if (IP6_EQ(&hm->hm_osrc6, src) &&
IP6_EQ(&hm->hm_odst6, dst) &&