From nobody Wed Jul 16 11:57:40 2025 X-Original-To: dev-commits-src-all@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 4bhvgn1h9kz62RRF; Wed, 16 Jul 2025 11:57:41 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bhvgm5Nhfz3qZZ; Wed, 16 Jul 2025 11:57:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752667060; 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=PZU40OTlAceH0LVwSN3RZ9qILWZVjnpowea2dwoiU58=; b=nfMINRm4b8b2I9XZWN20dWL1KoV31OjTBvr26OzPqHMtw5QjdKUKm6rYOnUayCRmUPFfBR f0gjWboj7TswX1vnEt0U3wTNQ1btCCvwZXWSa331pep1PceTnXhHDWR7Ex1doKNuwEiH17 vlk87kejvHT+2f9RJMu3aTJRitpSk7wDJKtp7fYC6efWbT6ITbL+bXakke0I/4Mbpz9ffm jzTR4AgN4HjtwD/lngruM0VxvuDTiJ0I6J19PNElICohyo1IV4fYXNvzxG/B9Ktm7e0TXV ahRLNRD3EalfjLnRVfyAf4B/Gmiyd5t5lxEScABYe7XpOF0v+GDT89GpsbZs9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752667060; 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=PZU40OTlAceH0LVwSN3RZ9qILWZVjnpowea2dwoiU58=; b=CDhQu0rDgowtWcDU3GAvwK74HYpbZY022Odd/4bhe2BDc5Hd7EDU0jMECNYLki/hujx1tF G1VSy9VkZF7TB8ybYpajv08J9/SdIvJyk/H+o4UWXoi9KlihfxfR/6qllAoM1Ej4kDP4p0 K4ZRRqM2q9bFx7wLHbMCfWMOEpynIq41p25Y5OLXRq0Q6Xk59XiiCGDWaxPywyQlxbDOsJ /JISZhpGB87TruMjkjGPcHQoDesJ8UFshHUzQ3nFcEAY/0U1Le51R2hxmgaXxOOfOIGclv 3VjxcChXwXnTzrUGTDVfch+uH9fX6ckYIa2Kg1uWBw/ZkkxYZ1VBrQIl58Ok9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752667060; a=rsa-sha256; cv=none; b=UIQJGGGbrDcyKIP/aQv0RdWlWpeJUS29/6BVQCSzerW6007czQ4kQoq0MD3KL8LbURe/l1 3XCuNJkidOvOXWgdUIlqhlJYi/HiwyJ83BkN2Itpv10EEkCymRApWKeLUxi61KEaAE0/2m JBZggODMUklL2+z0w4b/ON7E1Iklrc7ly/Ci8oqJhs2q/IZ6bF8AmTsXeuz6fGOm8d39Ry tlWkEIQpXZlix6lZI1jrnOMWkQRTGf04Civ8JNXWh/FAgiP3ZEIuf11RWkZj1yKxwfNiNZ UAFtNlS8z8ipBSESUKhS8Z5omoiMV+LEkA2xwkhe3GsB0Bkcd+Rm1RDKMK+fPA== 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 4bhvgm3vltz1Mxq; Wed, 16 Jul 2025 11:57:40 +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 56GBve1X047550; Wed, 16 Jul 2025 11:57:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56GBveEQ047547; Wed, 16 Jul 2025 11:57:40 GMT (envelope-from git) Date: Wed, 16 Jul 2025 11:57:40 GMT Message-Id: <202507161157.56GBveEQ047547@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: 451179a352a2 - main - Revert "pf: remove unused argument from pf_send_icmp()" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 451179a352a20fd08494774eaf26949981c4c9a1 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=451179a352a20fd08494774eaf26949981c4c9a1 commit 451179a352a20fd08494774eaf26949981c4c9a1 Author: Kristof Provost AuthorDate: 2025-07-16 08:44:13 +0000 Commit: Kristof Provost CommitDate: 2025-07-16 11:33:51 +0000 Revert "pf: remove unused argument from pf_send_icmp()" This reverts commit ea97c397d75c3fd108b1bc033f39d3e6d41c7dfe. The rule is used in the ALTQ case, which I missed. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 9acfb19645b7..009f7e4d78b1 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -327,7 +327,7 @@ int pf_change_icmp_af(struct mbuf *, int, sa_family_t); int pf_translate_icmp_af(int, void *); static void pf_send_icmp(struct mbuf *, u_int8_t, u_int8_t, - int, sa_family_t, int); + int, sa_family_t, struct pf_krule *, int); static void pf_detach_state(struct pf_kstate *); static int pf_state_key_attach(struct pf_state_key *, struct pf_state_key *, struct pf_kstate *); @@ -4349,11 +4349,11 @@ pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, } else if (pd->proto != IPPROTO_ICMP && pd->af == AF_INET && r->return_icmp) pf_send_icmp(pd->m, r->return_icmp >> 8, - r->return_icmp & 255, 0, pd->af, rtableid); + r->return_icmp & 255, 0, pd->af, r, rtableid); else if (pd->proto != IPPROTO_ICMPV6 && pd->af == AF_INET6 && r->return_icmp6) pf_send_icmp(pd->m, r->return_icmp6 >> 8, - r->return_icmp6 & 255, 0, pd->af, rtableid); + r->return_icmp6 & 255, 0, pd->af, r, rtableid); } static int @@ -4411,7 +4411,7 @@ pf_send_challenge_ack(struct pf_pdesc *pd, struct pf_kstate *s, static void pf_send_icmp(struct mbuf *m, u_int8_t type, u_int8_t code, int mtu, - sa_family_t af, int rtableid) + sa_family_t af, struct pf_krule *r, int rtableid) { struct pf_send_entry *pfse; struct mbuf *m0; @@ -9016,7 +9016,7 @@ pf_route(struct pf_krule *r, struct ifnet *oifp, if (ip->ip_ttl <= IPTTLDEC) { if (r->rt != PF_DUPTO) pf_send_icmp(m0, ICMP_TIMXCEED, - ICMP_TIMXCEED_INTRANS, 0, pd->af, + ICMP_TIMXCEED_INTRANS, 0, pd->af, r, pd->act.rtableid); goto bad_locked; } @@ -9162,7 +9162,7 @@ pf_route(struct pf_krule *r, struct ifnet *oifp, } pf_send_icmp(m0, ICMP_UNREACH, ICMP_UNREACH_NEEDFRAG, - ifp->if_mtu, pd->af, pd->act.rtableid); + ifp->if_mtu, pd->af, r, pd->act.rtableid); } SDT_PROBE1(pf, ip, route_to, drop, __LINE__); goto bad; @@ -9313,7 +9313,7 @@ pf_route6(struct pf_krule *r, struct ifnet *oifp, if (ip6->ip6_hlim <= IPV6_HLIMDEC) { if (r->rt != PF_DUPTO) pf_send_icmp(m0, ICMP6_TIME_EXCEEDED, - ICMP6_TIME_EXCEED_TRANSIT, 0, pd->af, + ICMP6_TIME_EXCEED_TRANSIT, 0, pd->af, r, pd->act.rtableid); goto bad_locked; } @@ -9462,7 +9462,7 @@ pf_route6(struct pf_krule *r, struct ifnet *oifp, if (r->rt != PF_DUPTO) pf_send_icmp(m0, ICMP6_PACKET_TOO_BIG, 0, - ifp->if_mtu, pd->af, pd->act.rtableid); + ifp->if_mtu, pd->af, r, pd->act.rtableid); } SDT_PROBE1(pf, ip6, route_to, drop, __LINE__); goto bad;