Commit 8ead3044 authored by Cy Schubert's avatar Cy Schubert
Browse files

ipfilter: Avoid more null if-then-else blocks

As in 73db3b64, 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.

(cherry picked from commit 130df647)
parent 116c7f03
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment