aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/ipfilter/netinet
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2021-03-23 03:11:58 +0000
committerCy Schubert <cy@FreeBSD.org>2021-03-24 08:57:56 +0000
commit874b1a35486b570513680c3d456b062ba097e1d9 (patch)
treecb5fa015346dc3003d8dc35ede8012cc3a484e96 /sys/contrib/ipfilter/netinet
parent9e5aeba51b431256adfd18b087ee61b09bfd6a79 (diff)
downloadsrc-874b1a35486b570513680c3d456b062ba097e1d9.tar.gz
src-874b1a35486b570513680c3d456b062ba097e1d9.zip
ipfilter: simplify ipf_proxy_check() return codes
ipf_proxy_check() returns -1 for an error and 0 or 1 for success. ipf_proxy_check()'s callers check for error and if the return code is 0, they change it to 1 prior to returning to their callers. Simply by returning -1 or 1 we reduce complexity and cycles burned changing 0 to 1. MFC after: 1 week
Diffstat (limited to 'sys/contrib/ipfilter/netinet')
-rw-r--r--sys/contrib/ipfilter/netinet/ip_nat.c4
-rw-r--r--sys/contrib/ipfilter/netinet/ip_nat6.c4
-rw-r--r--sys/contrib/ipfilter/netinet/ip_proxy.c3
3 files changed, 3 insertions, 8 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/sys/contrib/ipfilter/netinet/ip_nat.c
index 9ce6063eb7f3..41e51880b3dd 100644
--- a/sys/contrib/ipfilter/netinet/ip_nat.c
+++ b/sys/contrib/ipfilter/netinet/ip_nat.c
@@ -5318,9 +5318,7 @@ ipf_nat_out(fin, nat, natadd, nflags)
/* ------------------------------------------------------------- */
if ((np != NULL) && (np->in_apr != NULL)) {
i = ipf_proxy_check(fin, nat);
- if (i == 0) {
- i = 1;
- } else if (i == -1) {
+ if (i == -1) {
NBUMPSIDED(1, ns_ipf_proxy_fail);
}
} else {
diff --git a/sys/contrib/ipfilter/netinet/ip_nat6.c b/sys/contrib/ipfilter/netinet/ip_nat6.c
index 921eefc0ea3f..baa3c302504a 100644
--- a/sys/contrib/ipfilter/netinet/ip_nat6.c
+++ b/sys/contrib/ipfilter/netinet/ip_nat6.c
@@ -2976,9 +2976,7 @@ ipf_nat6_out(fin, nat, natadd, nflags)
/* ------------------------------------------------------------- */
if ((np != NULL) && (np->in_apr != NULL)) {
i = ipf_proxy_check(fin, nat);
- if (i == 0) {
- i = 1;
- } else if (i == -1) {
+ if (i == -1) {
NBUMPSIDE6D(1, ns_ipf_proxy_fail);
}
} else {
diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/sys/contrib/ipfilter/netinet/ip_proxy.c
index b4773bb6f358..87051b6e6839 100644
--- a/sys/contrib/ipfilter/netinet/ip_proxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_proxy.c
@@ -1048,9 +1048,8 @@ ipf_proxy_check(fin, nat)
}
aps->aps_bytes += fin->fin_plen;
aps->aps_pkts++;
- return 1;
}
- return 0;
+ return 1;
}