From nobody Mon Feb 07 13:55:58 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CAD2619B0BEC; Mon, 7 Feb 2022 13:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JsnjW4slBz51sb; Mon, 7 Feb 2022 13:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644242160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fY0yz3dJq1gFMHakqvdnNHtfp+qgg/QBCqd4+4cEmpk=; b=DgEJM5YXjpWwSGH+DeUTG1Oes8KRpUS78WNhgKA4ifZA2zbTmuJAknnS4qHpbr79jwveeS 3M/Md75KcyLHwWO8ElZIiCgRKcp59SuKL1kZgbTI4jFvwCDuApLpmO2OGQkYDsvJTlpdxW h8tbxm1LScpjYRxDc1N6TaLEmnF7t7o42ucU2y1JzqlLaHZB2dQ+hkiyDI73CUkPLlG1c+ JB5Qn3fvTRNm8VSzlOeI3lF4SGUfKNe9gMcexvUa3V3OIwCEw7epjfGbibuQhOsohr+E5o 6ZtxXUJmlJfdLoCdzqsg+MSxqA32uabwLbRWdLvvNjjTs8FUrpkh3Pyc3zTJgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4660B26E8B; Mon, 7 Feb 2022 13:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 217Dtwmv085269; Mon, 7 Feb 2022 13:55:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217DtwvK085268; Mon, 7 Feb 2022 13:55:58 GMT (envelope-from git) Date: Mon, 7 Feb 2022 13:55:58 GMT Message-Id: <202202071355.217DtwvK085268@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 53817881b6bd - stable/12 - ipfilter module: Remove trailing whitespace List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 53817881b6bdffbaec20c71950c22ff24faed41a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644242160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fY0yz3dJq1gFMHakqvdnNHtfp+qgg/QBCqd4+4cEmpk=; b=mu7wNlvhOjj0+UrlIXw5gVzPjrAL37JQU8XJDcgOfT2lEpP/w6fTfbCITAkS0rNFbBkCtP MQFBY4ivWh/8xyz1Pud1ffZCxL4GaEidGckwU3JKkS77Q1rJaItiTWyHa/fLsrsaOV7aa7 Yu4Ig6fxUIFT8IWNaQddSUwfTkiLKfS3YtS+/V1a5avv2gX34n0IguZUJCDy65ymOqcsX/ n3SeFJq47tHYWoB7/sgdjhcSxxvJ4wUPw1IeTxIBFUay5ozYdw/00nhzM1xZnLvfsj7Qm5 zVKhg79KbOE/yFjEffeDnwUHCfqJn2j5kUUwBiSrGEhfpFPhMnGkp2WmkGt2qQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644242160; a=rsa-sha256; cv=none; b=d5p1I1Y2ik6shcHjlw3UkR3bQ8IFfoAX4oMiqEjEvG2J5s9tQZK4fdYN4aVBJBR2BJR9v4 OA2+l4pp4uXA3nRjsL5xvf39+sTFf22ELmEEitWp+mJAYK+0CyoXgRaKMoqPQ0T0NjXoAr 3q8eSHVrMyn8ZpB2tTjtUeItoxKjAxdyokI6YN1Uye+50XI/ODsl+E3bU99XvaAtVTzLz5 IXATps+Fl/KsFnHoyhyD4Y85HM1W/8DuqYXmORl4Yu8DkCrW986PJoTG4qSO7aoQxVLTLE S5Zbzp0va/p22RDxJIKK6h6hPCiFru/rtoKVHIlpenJnOOxzLtbJmLrM6/OSlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=53817881b6bdffbaec20c71950c22ff24faed41a commit 53817881b6bdffbaec20c71950c22ff24faed41a Author: Cy Schubert AuthorDate: 2021-12-22 03:06:01 +0000 Commit: Cy Schubert CommitDate: 2022-02-07 13:55:12 +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 :