From nobody Mon Aug 21 13:24:59 2023 X-Original-To: dev-commits-src-main@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 4RTtWJ036tz4qmtk; Mon, 21 Aug 2023 13:25:00 +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 4RTtWH6cJbz3MgM; Mon, 21 Aug 2023 13:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692624299; 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=M7duUgs3uTHs/bvMF9W0YOAcLqqNFziLfy+lYaUBgi8=; b=BloBnuHZGX7jxPy4B5ZxS7exsSQPPrpNKy5SAuNjpi6SwLbd7tbChnnfZ6JUUrv3QW93v2 UwJVkwc1+Uk0LOJP5EsrS7CZcNKizQK6hPNuwoz+Owmf7WRTuPeTLg7c9o2hwgU3b0OCOx A69JyKDXaNhuGit0DRp1CSFiTpbbaOTIcudwPwkT0er1GjUlk/QAQzJteKHcqLLWF/oIWF bkcx+pwCqstgUWJjNUNowoxpxyFBppx30gaUlw9wzrMZ2gyOc1mRzbVy2wxJJwb/hBAUJw Mri/InPOb4xf7NorVvnX3YhDrqXGZD+9hwReFI1UJn+rAa/chqvbw8hj0rKzFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692624299; 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=M7duUgs3uTHs/bvMF9W0YOAcLqqNFziLfy+lYaUBgi8=; b=To9nQ6/POwQ5fSiV8UDpuZThr29rb+nt9u2dOYFFTi8YT4MmNPIasCl/cuWWjpVvgBjBb4 w2c41Ve6W3g0qhmUtkfpYbjiIc/HQxUvNTT3wLPbTJb/O+Xww3YfzCZ6VSdx7+ByGdwlTc secwDXKAmYVlClC5kS2IZuNnOJZjt3aPGo35iDlzERbXzC6nsuT0vtLEvvZ0gNmVZKgVUc x+qVU9W+Wg0wjkMBlpDO3iG7seFgKjagzPKBp3DSNq7d3SEwK3k5oLvoNIAyhcATZ78qfA nwINMkbWiwu8MTrXJAzYfcULkrWMNTAY6JMm4xyk0oEGzzfmZEBmXcGJt3UlWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692624299; a=rsa-sha256; cv=none; b=DFmQAnI+bVsJNQ980Lc3Si4iED0dF+exrN9yynwhx29Xkrh/xp+QWv5jhAvNqfzw9FjvFq 2qr4xfhWSq7glX0TrzUoxPICMotWKlvoJUV0zHECDIqw7HdVDCOGVcKp1s3YAaBp66ESWv 57quwTkmC87R2RV2cVq9k1CTrmeugp/jneU13lzxLl0xAvbvm7QRqmTS2CGUO4lWWsuts+ YqxKEcy0qNYZFNuaEkGIsBlM4D4T1AGTr6qHNlrz4AuD0CKag6qMjFJ9W2N0ks9BNp8lyD YolYaPlKQZ7vcCk0gjV7HTRTT6SftLFZW+n07VX1qkNWZ1R+9wyavcnZ1EGVsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RTtWH5fZSz75f; Mon, 21 Aug 2023 13:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LDOxff014212; Mon, 21 Aug 2023 13:24:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LDOxlK014209; Mon, 21 Aug 2023 13:24:59 GMT (envelope-from git) Date: Mon, 21 Aug 2023 13:24:59 GMT Message-Id: <202308211324.37LDOxlK014209@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 9642d948c08d - main - pf: reduce indentation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9642d948c08d80a41679f2eaab26e85a8b9e3080 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9642d948c08d80a41679f2eaab26e85a8b9e3080 commit 9642d948c08d80a41679f2eaab26e85a8b9e3080 Author: Kajetan Staszkiewicz AuthorDate: 2023-08-21 05:59:49 +0000 Commit: Kristof Provost CommitDate: 2023-08-21 11:18:52 +0000 pf: reduce indentation Early-return to reduce syncookie-related indentation. No functional change. MFC after: 1 week Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D41502 --- sys/netpfil/pf/pf.c | 44 +++++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 7fb47a297f9e..c2b9ee21d04c 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7542,40 +7542,34 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, pd.dir == PF_IN) { struct mbuf *msyn; - msyn = pf_syncookie_recreate_syn(h->ip_ttl, - off,&pd); + msyn = pf_syncookie_recreate_syn(h->ip_ttl, off, + &pd); if (msyn == NULL) { action = PF_DROP; break; } - action = pf_test(dir, pflags, ifp, &msyn, inp, &pd.act); + action = pf_test(dir, pflags, ifp, &msyn, inp, + &pd.act); m_freem(msyn); + if (action != PF_PASS) + break; - if (action == PF_PASS) { - action = pf_test_state_tcp(&s, kif, m, - off, h, &pd, &reason); - if (action != PF_PASS || s == NULL) { - action = PF_DROP; - break; - } - - s->src.seqhi = ntohl(pd.hdr.tcp.th_ack) - - 1; - s->src.seqlo = ntohl(pd.hdr.tcp.th_seq) - - 1; - pf_set_protostate(s, PF_PEER_SRC, - PF_TCPS_PROXY_DST); - - action = pf_synproxy(&pd, &s, &reason); - if (action != PF_PASS) - break; + action = pf_test_state_tcp(&s, kif, m, off, h, + &pd, &reason); + if (action != PF_PASS || s == NULL) { + action = PF_DROP; + break; } + + s->src.seqhi = ntohl(pd.hdr.tcp.th_ack) - 1; + s->src.seqlo = ntohl(pd.hdr.tcp.th_seq) - 1; + pf_set_protostate(s, PF_PEER_SRC, PF_TCPS_PROXY_DST); + action = pf_synproxy(&pd, &s, &reason); break; - } - else { - action = pf_test_rule(&r, &s, kif, m, off, - &pd, &a, &ruleset, inp); + } else { + action = pf_test_rule(&r, &s, kif, m, off, &pd, + &a, &ruleset, inp); } } break;