From nobody Fri Feb 14 17:50:25 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 4Yvfhy3LlYz5nQtl; Fri, 14 Feb 2025 17:50:26 +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 4Yvfhx6sHRz3KF5; Fri, 14 Feb 2025 17:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739555426; 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=vRP77Ozg6eLpj61Yq/VYT1x+hYjhU0WzVM+75Nt7N9E=; b=MqZ+bv7G8irjBmi6BIuGJ/fK7GOXnPZqgWCCWOEhvQpTG4JBNVJBKNGrf6fYaw5cr156Ke jl5j6DH4hk0d3Fbz/6eVc8KGHOsVKge+gxyA6um5Wq6XjkiRmfrlYnNrmRdgXiEXGJqUT7 kplH+hqzGbCK25GgBA3eFE+cbCMSuj8troLRAF1UHf0L+yrAtnF0Zalx9emH6QsEvk2FwC c9V+srxcvrHC6MlidOAvcNk+x4hQ7m2qlemuDdjT9n6rmyP3tab3fB/AgbLNEVE/Wjkbm7 mhHx/TFGrijogDhbWyV469oB/5sB8X7KSlbLnQ3jdtvQvCSsLNuCsL7mYtwyOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739555426; 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=vRP77Ozg6eLpj61Yq/VYT1x+hYjhU0WzVM+75Nt7N9E=; b=Str+E9XTWiIzxk9IfbHjCQLHDybk/+HccAIVZWqhtcSLw0ShThWHcHfkrQCH9w7VyUAXDM IvyFt2EC7KiW9AmXQ9GVrsmkJkFS2/Bt8QcCnlEqFaLFO8n4zGvkwn2yzfUXp5TaWjMtme JuJuLg1kCdAUjGm56y2wTojxYja7UQEn2dG3JsLiltuMydDARJqon8RdZF5KDYHj9ravNL EcBkMlsOJu6G6TWuR8NtlXWFadep5h9No85epHOpE6gZh4+T8HT+z23Vlk2+is13Auz/w9 Vsfn3DHP/e0127dboANdUSv74LE7QbPRYB4mtFqj/3IAS2bwX1A14Y5stw1qzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739555426; a=rsa-sha256; cv=none; b=D4ChqbNAcjpUYac4UY4n0Abz3gZDTNQJN/vR0eJgkhfb52khmEPchRVPbnizFd7Vcwm2Ct PLUjp2c/m6CyWNGZAatZgR0RpNpZRkZmh4MVsotRleqfjOwR2L/PsiG3v/MYZEfKOptJH2 xPyuxSyBM/yYIk1fFXkneub512VYC4QL9RUWoicZ6b6KsNUgjZGPz5uIK8DYLDMCPZi3lY m3SPJKNDVCZ3WOpWapIUAzXcGkRm38a3e5yK5SChw4qt+sbs798zI3CZxi9bBRobs+b2hQ m2XszwkbclqRWUJhwwLuKsbxV61iXzvhI112sxn3lIwfVhxT+gFeyojHeGpTCg== 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 4Yvfhx6SFZzhcw; Fri, 14 Feb 2025 17:50:25 +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 51EHoP2K061378; Fri, 14 Feb 2025 17:50:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EHoPEf061375; Fri, 14 Feb 2025 17:50:25 GMT (envelope-from git) Date: Fri, 14 Feb 2025 17:50:25 GMT Message-Id: <202502141750.51EHoPEf061375@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: d2bb19883f78 - main - pf: introduce a way to match "any" interface, excluding loopback ones 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: d2bb19883f780ea17a794787d6b67e75059b085e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d2bb19883f780ea17a794787d6b67e75059b085e commit d2bb19883f780ea17a794787d6b67e75059b085e Author: Kristof Provost AuthorDate: 2025-02-11 09:59:12 +0000 Commit: Kristof Provost CommitDate: 2025-02-14 17:47:52 +0000 pf: introduce a way to match "any" interface, excluding loopback ones pfi_kkif_attach() annotates the kif with a flag indicating it is the "any" match. pfi_kif_match obeys() that flag. ok benno Obtained from: OpenBSD, henning , 4be478ce5d Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 1 + sys/netpfil/pf/pf_if.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 964a1d41f353..0295bcc125f8 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1600,6 +1600,7 @@ struct pfi_kkif { #define PFI_IFLAG_REFS 0x0001 /* has state references */ #define PFI_IFLAG_SKIP 0x0100 /* skip filtering on interface */ +#define PFI_IFLAG_ANY 0x0200 /* match any non-loopback interface */ #ifdef _KERNEL struct pf_sctp_multihome_job; diff --git a/sys/netpfil/pf/pf_if.c b/sys/netpfil/pf/pf_if.c index d2b1b6a781f4..31fc8b152719 100644 --- a/sys/netpfil/pf/pf_if.c +++ b/sys/netpfil/pf/pf_if.c @@ -357,6 +357,11 @@ pfi_kkif_attach(struct pfi_kkif *kif, const char *kif_name) kif->pfik_tzero = time_second > 1 ? time_second : 0; TAILQ_INIT(&kif->pfik_dynaddrs); + if (!strcmp(kif->pfik_name, "any")) { + /* both so it works in the ioctl and the regular case */ + kif->pfik_flags |= PFI_IFLAG_ANY; + } + RB_INSERT(pfi_ifhead, &V_pfi_ifs, kif); return (kif); @@ -474,6 +479,10 @@ pfi_kkif_match(struct pfi_kkif *rule_kif, struct pfi_kkif *packet_kif) return (1); } + if (rule_kif->pfik_flags & PFI_IFLAG_ANY && packet_kif->pfik_ifp && + !(packet_kif->pfik_ifp->if_flags & IFF_LOOPBACK)) + return (1); + return (0); }