aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/ipfilter/netinet/ip_proxy.c
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2021-10-20 03:11:40 +0000
committerCy Schubert <cy@FreeBSD.org>2021-12-04 14:33:13 +0000
commit130df64793d7d3c680c0f7177a707867a8a19665 (patch)
tree2eba79d57d0f4a8bbc6eaaa5b2042d6c827bc88c /sys/contrib/ipfilter/netinet/ip_proxy.c
parent1ca73c39a54750a4a2f584efd7c57f453bf7dbbe (diff)
downloadsrc-130df64793d7d3c680c0f7177a707867a8a19665.tar.gz
src-130df64793d7d3c680c0f7177a707867a8a19665.zip
ipfilter: Avoid more null if-then-else blocks
As in 73db3b64f167, when WITHOUT_INET6 is selected, null if-then-else blocks are generated because #if statements are incorrectly placed. Moving the #if statements reduces unnecessary runtime comparisons or compiler optimizations. MFC after: 3 days
Diffstat (limited to 'sys/contrib/ipfilter/netinet/ip_proxy.c')
-rw-r--r--sys/contrib/ipfilter/netinet/ip_proxy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/sys/contrib/ipfilter/netinet/ip_proxy.c
index b90ad09d8c00..af5ed81a5765 100644
--- a/sys/contrib/ipfilter/netinet/ip_proxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_proxy.c
@@ -1367,8 +1367,8 @@ ipf_proxy_rule_rev(nat)
if (ipn->in_v[0] == 4) {
ipn->in_snip = ntohl(nat->nat_odstaddr);
ipn->in_dnip = ntohl(nat->nat_osrcaddr);
- } else {
#ifdef USE_INET6
+ } else {
ipn->in_snip6 = nat->nat_odst6;
ipn->in_dnip6 = nat->nat_osrc6;
#endif
@@ -1443,8 +1443,8 @@ ipf_proxy_rule_fwd(nat)
if (ipn->in_v[0] == 4) {
ipn->in_snip = ntohl(nat->nat_nsrcaddr);
ipn->in_dnip = ntohl(nat->nat_ndstaddr);
- } else {
#ifdef USE_INET6
+ } else {
ipn->in_snip6 = nat->nat_nsrc6;
ipn->in_dnip6 = nat->nat_ndst6;
#endif