talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipfilter: Avoid more null if-then-else blocks 

As in 73db3b64f1, 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
This commit is contained in:
Cy Schubert 2021-10-19 20:11:40 -07:00
parent 1ca73c39a5
commit 130df64793
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/contrib/ipfilter/netinet/ip_proxy.c
View File

@ -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