git: d10d5bc1cc6b - stable/13 - ipfilter module: Remove trailing whitespace
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 07 Feb 2022 13:51:59 UTC
The branch stable/13 has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=d10d5bc1cc6bb2d871151e65409d7fecdada61a1
commit d10d5bc1cc6bb2d871151e65409d7fecdada61a1
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2021-12-22 03:06:01 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2022-02-07 13:51:16 +0000
ipfilter module: Remove trailing whitespace
(cherry picked from commit 2eef572879afe0309e3c538017c7909c1b7307d0)
---
sys/netpfil/ipfilter/netinet/ip_fil.h | 2 +-
sys/netpfil/ipfilter/netinet/ip_nat6.c | 4 ++--
sys/netpfil/ipfilter/netinet/ip_proxy.c | 8 ++++----
sys/netpfil/ipfilter/netinet/ip_tftp_pxy.c | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys/netpfil/ipfilter/netinet/ip_fil.h b/sys/netpfil/ipfilter/netinet/ip_fil.h
index a01bd28e7270..bf553faf2abe 100644
--- a/sys/netpfil/ipfilter/netinet/ip_fil.h
+++ b/sys/netpfil/ipfilter/netinet/ip_fil.h
@@ -694,7 +694,7 @@ typedef struct frentry {
int fr_group; /* group to which this rule belongs */
int fr_grhead; /* group # which this rule starts */
int fr_isctag;
- int fr_rpc; /* XID Filtering */
+ int fr_rpc; /* XID Filtering */
ipftag_t fr_nattag;
/*
* These are all options related to stateful filtering
diff --git a/sys/netpfil/ipfilter/netinet/ip_nat6.c b/sys/netpfil/ipfilter/netinet/ip_nat6.c
index ee45784ccd51..92f530031f5c 100644
--- a/sys/netpfil/ipfilter/netinet/ip_nat6.c
+++ b/sys/netpfil/ipfilter/netinet/ip_nat6.c
@@ -313,8 +313,8 @@ ipf_nat6_delrdr(ipf_nat_softc_t *softn, ipnat_t *n)
*n->in_prnext = n->in_rnext;
n->in_use--;
}
-
-
+
+
/* ------------------------------------------------------------------------ */
/* Function: ipf_nat6_delmap */
/* Returns: Nil */
diff --git a/sys/netpfil/ipfilter/netinet/ip_proxy.c b/sys/netpfil/ipfilter/netinet/ip_proxy.c
index 8d9e67243e8a..dfba2263b085 100644
--- a/sys/netpfil/ipfilter/netinet/ip_proxy.c
+++ b/sys/netpfil/ipfilter/netinet/ip_proxy.c
@@ -1265,7 +1265,7 @@ ipf_proxy_fixseqack(fr_info_t *fin, ip_t *ip, ap_session_t *aps, int inc)
/* */
/* This function creates a NAT rule that is based upon the reverse packet */
/* flow associated with this NAT session. Thus if this NAT session was */
-/* created with a map rule then this function will create a rdr rule. */
+/* created with a map rule then this function will create a rdr rule. */
/* Only address fields and network interfaces are assigned in this function */
/* and the address fields are formed such that an exact is required. If the */
/* original rule had a netmask, that is not replicated here not is it */
@@ -1275,7 +1275,7 @@ ipf_proxy_fixseqack(fr_info_t *fin, ip_t *ip, ap_session_t *aps, int inc)
/* to be setup, based on the addresses used for the control connection. In */
/* that case, this function is used to handle creating NAT rules to support */
/* data connections with the PORT and EPRT commands. */
-/* ------------------------------------------------------------------------ */
+/* ------------------------------------------------------------------------ */
ipnat_t *
ipf_proxy_rule_rev(nat_t *nat)
{
@@ -1358,11 +1358,11 @@ ipf_proxy_rule_rev(nat_t *nat)
/* */
/* The purpose and rationale of this function is much the same as the above */
/* function, ipf_proxy_rule_rev, except that a rule is created that matches */
-/* the same direction as that of the existing NAT session. Thus if this NAT */
+/* the same direction as that of the existing NAT session. Thus if this NAT */
/* session was created with a map rule then this function will also create */
/* a data structure to represent a map rule. Whereas ipf_proxy_rule_rev is */
/* used to support PORT/EPRT, this function supports PASV/EPSV. */
-/* ------------------------------------------------------------------------ */
+/* ------------------------------------------------------------------------ */
ipnat_t *
ipf_proxy_rule_fwd(nat_t *nat)
{
diff --git a/sys/netpfil/ipfilter/netinet/ip_tftp_pxy.c b/sys/netpfil/ipfilter/netinet/ip_tftp_pxy.c
index de046f64f0b4..2ba51f3272af 100644
--- a/sys/netpfil/ipfilter/netinet/ip_tftp_pxy.c
+++ b/sys/netpfil/ipfilter/netinet/ip_tftp_pxy.c
@@ -420,7 +420,7 @@ ipf_p_tftp_client(ipf_tftp_softc_t *softt, fr_info_t *fin, ap_session_t *aps,
switch (opcode)
{
case TFTP_CMD_WRITE :
- if (softt->ipf_p_tftp_readonly != 0)
+ if (softt->ipf_p_tftp_readonly != 0)
break;
/* FALLTHROUGH */
case TFTP_CMD_READ :