From nobody Mon Jun 2 15:30:35 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 4b9yTm0cDCz5wyDQ; Mon, 02 Jun 2025 15:30:36 +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 4b9yTl5Qphz47Py; Mon, 02 Jun 2025 15:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748878235; 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=g3Odz5MoetP7klza5VPGLdZqzPpXmV7mZm5KtV9vnYQ=; b=jn2tJg+cWNC8s5b5W/zbh64YbnKvJY4kci6hSSH5fwnQlYm6LNb1sxVwtOqK/Bgp35VWNN ajAshKzSEuRYxFh4E8Po16ldYKYBnuKuEkQMt0PtmHzl0+JurGTZQjT1XmLyBuD8JcVqJn xUNyIIb8/gN+9tTH8BGQNGaFhc4hf3zLvH9kKDoM0JMq5ZVQnUCRq5BCerf1NRDk+BIXch RPUEyS+wencXuT0FZISJQZ1aEpxefYbBfkldQYu1Px6j0htU84FBJ6JoFPhK+Uu5x1vHEu 4Pfqhu6df5TXvoIdx3LFn9eaelesG7LqkN1YPLQM9T7Zjsx9PFERcleh/kZXEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748878235; 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=g3Odz5MoetP7klza5VPGLdZqzPpXmV7mZm5KtV9vnYQ=; b=eYsyw0Z7ERBfrKXxEwbV4oPATK3XoJMS5Rc2tD/mroqoA5WJHss6/4v1PRdzlI30S7PN4H JQ34fMrSqtN81g51axXpVZDj3D7Oq5JmDL7wmGDByESmDLYdCYSgjOR/zIx5/6y7lsCUaP G+5QOuEX9RsA5f7Q6wi+7Ehb1KJ35ZZwZGzZbMxhPbeylrGrtBhcgW8SyRkJxlJNOxPC5x nNKwRKnIQfyhhYhwQw5wGoaRNquP00EhMpuOIDipbz/y3xTmXqKOPsLy37sOfq/U9tykIz RMZnU0t2LjH+2XqNODt0NSQBsNo10cTFUsDSsiqX9bdTesTtQ8MOFweiI82l5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748878235; a=rsa-sha256; cv=none; b=wkKdx6AJDJ6epYPVapFPiXr96BRWUo8Dp9gfBPrILtuSCZF1FflSQ2/OZWvB7WitHjtHQi Fw75FVhjVkWmBLMpMikuz9XJ4/tHjMh2bWVRCLWyCIS8Uj0bFr9kCNjVv7zIyd3jT4EiPk lmO8HzK9VArlu3Q2fK/1fRrZsCW8Be1ZasXY6e8AZ9VU9O1C/FO5KFOJcT8NicUePDYerA BpxgcfNyniRL05fuqAyem9xKSZqYlcyhzILoYW+nGbGR7Jh8K3C60DJds1TYoPFvA7xol0 9LfxQtukqfgQuGUSHpPnRllrIyp5w4mWPf9snh0n3DChO6Wxm+n1nprd2zZFIQ== 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 4b9yTl2lv8z1DDc; Mon, 02 Jun 2025 15:30:35 +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 552FUZsg049912; Mon, 2 Jun 2025 15:30:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 552FUZF4049884; Mon, 2 Jun 2025 15:30:35 GMT (envelope-from git) Date: Mon, 2 Jun 2025 15:30:35 GMT Message-Id: <202506021530.552FUZF4049884@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: 1e4c562fdfb2 - main - pf: remove unused argument from pf_get_translation() 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: 1e4c562fdfb211c6f23179dba3952757ed7b8ee3 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1e4c562fdfb211c6f23179dba3952757ed7b8ee3 commit 1e4c562fdfb211c6f23179dba3952757ed7b8ee3 Author: Kristof Provost AuthorDate: 2025-06-02 08:23:43 +0000 Commit: Kristof Provost CommitDate: 2025-06-02 15:30:18 +0000 pf: remove unused argument from pf_get_translation() No functional change. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 2 +- sys/netpfil/pf/pf.c | 2 +- sys/netpfil/pf/pf_lb.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index b3e3260d80a6..c77744d55314 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2739,7 +2739,7 @@ u_short pf_map_addr_sn(u_int8_t, struct pf_krule *, int pf_get_transaddr_af(struct pf_krule *, struct pf_pdesc *); u_short pf_get_translation(struct pf_pdesc *, - int, struct pf_state_key **, struct pf_state_key **, + struct pf_state_key **, struct pf_state_key **, struct pf_test_ctx *, struct pf_udp_mapping **udp_mapping); u_short pf_get_transaddr(struct pf_pdesc *, struct pf_state_key **, struct pf_state_key **, diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index a5f51d69ab2b..7fb544460b02 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5789,7 +5789,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, pd->odport = pd->ndport; /* check packet for BINAT/NAT/RDR */ - transerror = pf_get_translation(pd, pd->off, &ctx.sk, &ctx.nk, &ctx, + transerror = pf_get_translation(pd, &ctx.sk, &ctx.nk, &ctx, &ctx.udp_mapping); switch (transerror) { default: diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index ed87aa2cec4d..697f680c97bf 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -843,7 +843,7 @@ done: } u_short -pf_get_translation(struct pf_pdesc *pd, int off, +pf_get_translation(struct pf_pdesc *pd, struct pf_state_key **skp, struct pf_state_key **nkp, struct pf_test_ctx *ctx, struct pf_udp_mapping **udp_mapping) {