From nobody Wed Mar 16 19:52:42 2022 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 10EC91A20890; Wed, 16 Mar 2022 19:52:43 +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 4KJgt272XCz3MMW; Wed, 16 Mar 2022 19:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647460363; 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=OYYH+mircfUfZTgE7kqyNsyodFBsw8HYq34TygqhTz4=; b=BPYbcsGpy0oe6TgKARY2NnwupwYeK37Iz2YdpNF6Rk6+0Ya02i7N7QZFqUvt9y6STVQijO twKXBZ3UsglSwdU8r9sT7yR468/FbKVK7ZLy4Elaa4mhdelqcxDfeLR0YFs499rIAMJr2J gTMIWr246jTKZtnPiThs/Y3KZ5mrrN9k4mkxfxiv+2pTOkKDgfA/qILOA+0Gof3Y9dIK5T Sih7oRRorRmDsI6dCTSCHBH9yjaQ71Y+6z7m+IDMhdFGKppExSvyQULDfC40i8sxfGKYdb nX/8UVWCbnFKmdaLKgUS/gH4fHCECRF7BG64lTQ5RZLN70LpdXKzxpZahqBKtQ== 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 D149C1C7BB; Wed, 16 Mar 2022 19:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22GJqg3R049926; Wed, 16 Mar 2022 19:52:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22GJqggB049925; Wed, 16 Mar 2022 19:52:42 GMT (envelope-from git) Date: Wed, 16 Mar 2022 19:52:42 GMT Message-Id: <202203161952.22GJqggB049925@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: a693d17b9985 - main - pf: fix !INET or !INET6 builds 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a693d17b9985a03bd9b5108e890d669005ab41eb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647460363; 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=OYYH+mircfUfZTgE7kqyNsyodFBsw8HYq34TygqhTz4=; b=Y1iz/CY3HjGqmuYWdgyQp7owWxOdBoBmL0wK5d65AMZZsI1M9O+PuxMpunZMGJvvySLY+i KNJbVH9m/sXm/mnQva0HM9aXIGyaV1Ojc2thpIKCNMPRiWGl7wyscoWBKHIfcXShtW32mG neEMdos52YMnoZbopDDRgVGEW7v8zeAFpM3jUncti+z46OghdNuq9CN7jgGSE2rWR8enCD MGTZ7CRS72X+XBlKSO7WEQr7rLspgLbOq6K299s2t/euk7To/hTGu141Au8BW7R//5EQPD MW5IUByGoUUS6ZT0Oh4AlJZEofaOD8E3USHIjD40um4Y1iSQpafh5dCZJDj4Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647460363; a=rsa-sha256; cv=none; b=v5dD5jtAmw5QDBupUy6JtkQJPhvNIteCDtG8AVt1pC8zuUPv34nRde+WtLt3utsh64IXXb MwOuKsZefvJFcRfNJ8UUHOTt6Guv2J6tYSPidtr14mawZmEB0jW8SP/MhptdFQPNOhHURX gVK6bueqtbwp7bvG9ke7VR8heMnhwqJqwuQRBPAir5gQ9IE28KfH5ibP73Z7g+kGRExfeG iHth4ltlV/vmjAMx4wENUCt6rEuC+ci+TIcKwT1xYBPe1DEr1wDeoXQOYzUp6jx86AiBzL 1HxaAl4e1e21PWNcvdZw5GHDg/ocFoKRpg6+c/boEOKEyUKbsS7wtOEjj8riIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a693d17b9985a03bd9b5108e890d669005ab41eb commit a693d17b9985a03bd9b5108e890d669005ab41eb Author: Gleb Smirnoff AuthorDate: 2022-03-16 19:52:07 +0000 Commit: Gleb Smirnoff CommitDate: 2022-03-16 19:52:07 +0000 pf: fix !INET or !INET6 builds Fixes: pfr_match_addr8a42005d1e4 --- sys/netpfil/pf/pf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index a900da0b8bd1..0a479c8a77e8 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -3855,6 +3855,7 @@ pf_test_eth_rule(int dir, struct pfi_kkif *kif, struct mbuf **m0) proto = ntohs(e->ether_type); switch (proto) { +#ifdef INET case ETHERTYPE_IP: { struct ip *ip; m = m_pullup(m, sizeof(struct ether_header) + @@ -3869,6 +3870,8 @@ pf_test_eth_rule(int dir, struct pfi_kkif *kif, struct mbuf **m0) dst = (struct pf_addr *)&ip->ip_dst; break; } +#endif /* INET */ +#ifdef INET6 case ETHERTYPE_IPV6: { struct ip6_hdr *ip6; m = m_pullup(m, sizeof(struct ether_header) + @@ -3883,6 +3886,7 @@ pf_test_eth_rule(int dir, struct pfi_kkif *kif, struct mbuf **m0) dst = (struct pf_addr *)&ip6->ip6_dst; break; } +#endif /* INET6 */ } e = mtod(m, struct ether_header *); *m0 = m;