From nobody Wed Apr 23 11:56:52 2025 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 4ZjHdc3Vgwz5tHNm; Wed, 23 Apr 2025 11:56:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZjHdc2gMNz3yjt; Wed, 23 Apr 2025 11:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745409412; 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=NaHNTpa9p124KVJDbnI4wXOPMHxVkx6zljuhH29xGpA=; b=GYumdMK5sFTCvkw0cXXXc8Ffgto5Orh+Hyxeyt8wJa8cmP4SMvawAyVbrhR3YrgZUKkWbl w+N+UbDlCUw0iknOooq3QWlyWB5rcARVPMItjdg6R4aCRM8fotIzFxNA4mswZZhZRuwvSm YqXAx/mZwZmneyHphQNCCjBE9TFwzQEqnlUSpX2nAs9Fp1ZoitAnBiOyqksFlGejLpXkBG ovSoEEx47MeuuGin4wDOGWugT/u8xFoqqf52eKTOBKbxkK2SmMZcsVPXnEpEyTjURru/zZ Xqf7ZhM/ApFxb650QczgWMDjK0DRj7AZxoNIjHe0/PiYHJYuejbc1GwENl6tkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745409412; a=rsa-sha256; cv=none; b=l8YW5jDCtypJsaNMyH84bkBxW5diniuEcFdW+dk0zS8XQEkmV/LOqUWcIgtZCRnFBm+f5m EZYNOuf8u9ZXwwPcDcjMneFGWbEX2s7CwPQsMp/wFCgPdsCgvPo4LyzRCAC3ItqNPkeyov 2+ybWriwnu8NaWVV00/7F1y22g7bvvFkEbN2pbnWsy3eC87O1qzX3d69/XD13//u3vHfTM SmEdkPtOQstpv5Kz1a1bw7owtITkCb8YFeKt9GAlZYNENpGPTZbQpAAFD+4ZOmhXb3Ma6S JIG8PUzmM4f0tGy7aMfSw4tHQLxGkHXDsr46dCQRaLYS73BNQsSIVtTvuDZ3/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745409412; 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=NaHNTpa9p124KVJDbnI4wXOPMHxVkx6zljuhH29xGpA=; b=RpHdnvmVgLYeN4t2coBsO5J2TVWT7IavUaw0hZUi0KJ8KESVUSEuzqcKChFgkL84cB00kR Rv36gHur5uIHcDc/xsNmPTbDlPRcuEaSnK9Z7YwQLnKC8h4T+fUhuDI/0Ko3sosUiU8x6x DElIdT33Hflsvyv+4hl2jSzMGHU75oda2b9Gj8iB8xkzqMeMEwijTCOzFrXm0jdvIdKoSa zx7ElSJHHgrV3zBeJXoevULlEWZRah4PmtIhJFu6UBu5u04OTpNOkf61V7gNwJDdKST91y WFxGXvwxeW39hQd1sY9sSutG1USs+J4el5H52KmBzd2ustHmvU7XBklfQnmcCw== 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 4ZjHdc25spz137F; Wed, 23 Apr 2025 11:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53NBuqjs075619; Wed, 23 Apr 2025 11:56:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53NBuq7W075616; Wed, 23 Apr 2025 11:56:52 GMT (envelope-from git) Date: Wed, 23 Apr 2025 11:56:52 GMT Message-Id: <202504231156.53NBuq7W075616@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: 332219c93baf - main - pf: deduplicate code 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 332219c93baf85691af957f22bc66848f2636168 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=332219c93baf85691af957f22bc66848f2636168 commit 332219c93baf85691af957f22bc66848f2636168 Author: Kristof Provost AuthorDate: 2025-04-21 15:30:37 +0000 Commit: Kristof Provost CommitDate: 2025-04-23 08:15:08 +0000 pf: deduplicate code In pf_translate() the TCP, UDP and SCTP cases were identical. Deduplicate them. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 95dc6a318dd4..a4a24148da72 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6328,19 +6328,8 @@ pf_translate(struct pf_pdesc *pd, struct pf_addr *saddr, u_int16_t sport, switch (pd->proto) { case IPPROTO_TCP: - if (afto || *pd->sport != sport) { - pf_change_ap(pd, pd->src, pd->sport, - saddr, sport); - rewrite = 1; - } - if (afto || *pd->dport != dport) { - pf_change_ap(pd, pd->dst, pd->dport, - daddr, dport); - rewrite = 1; - } - break; - case IPPROTO_UDP: + case IPPROTO_SCTP: if (afto || *pd->sport != sport) { pf_change_ap(pd, pd->src, pd->sport, saddr, sport); @@ -6353,20 +6342,6 @@ pf_translate(struct pf_pdesc *pd, struct pf_addr *saddr, u_int16_t sport, } break; - case IPPROTO_SCTP: { - if (afto || *pd->sport != sport) { - pf_change_ap(pd, pd->src, pd->sport, - saddr, sport); - rewrite = 1; - } - if (afto || *pd->dport != dport) { - pf_change_ap(pd, pd->dst, pd->dport, - daddr, dport); - rewrite = 1; - } - break; - } - #ifdef INET case IPPROTO_ICMP: /* pf_translate() is also used when logging invalid packets */