From nobody Wed Apr 13 23:09:38 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 A9B891B40EAF; Wed, 13 Apr 2022 23:09:39 +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 4KdywL4V0wz4lrs; Wed, 13 Apr 2022 23:09:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891378; 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=OwAWUMMfMBbH8XsQzpIrghWZwpwXymMqNSfdrjfy0Gs=; b=Wlie83+8h9b39dxKJndQBTBVfklSD7mW6kKOlQsJWQATXvLoBMD8n481qjYTHCEynts0zH 5oJt5xuZDV9i+z/zkn8vzbQIwh1EhPh9R2mZRTu6bA5BzCVTUka7rj4LS6J0TXiWSxBKzt Mid9mG4e23QCfSibVlYDApIcWaapDChQBiwvGTnpGFf60wXUfn1hT+buH5BeDwcwk3N2gX 4wQVev9ETRyHACafa+CHBHBRgVamP8gIKqzIh0ITz6sSC5K5hgTsIAfpuwAu30ofJHyStp xZ634Y7GCgGsCg3rptQ5Fp7DdKC31O7OBvvv7tZQLkCANZyC0h6nvTceIyOMAg== 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 6585D1502F; Wed, 13 Apr 2022 23:09:38 +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 23DN9cml074637; Wed, 13 Apr 2022 23:09:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DN9cHc074636; Wed, 13 Apr 2022 23:09:38 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:09:38 GMT Message-Id: <202204132309.23DN9cHc074636@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3320ca120591 - main - ipfw: icmp6_type is only used for INET6. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3320ca120591d05f1e2ac0dc4d5235f54b2694f4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891378; 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=OwAWUMMfMBbH8XsQzpIrghWZwpwXymMqNSfdrjfy0Gs=; b=ThZnnheBLcA3h9IMM4BhYzZ+ieYgSjfJ7C07ph5w3hRm8Ae4yPmvKnuCAKiuNRckHvLe82 uApSPYKBcOJ1Sth4F09dOm4gs6lWgDjU0QflBgQarttOQmRH6WS/lFzTGDFweXUB+brDwT UbIlClTUg6noNKyjNwpXWLc8YcEVXUMFAmKdM4KiQ2O4X2pxhU0ReesTnDxRq61rGwYggK GaM43hnzkMLbHNgNAYw1aJ1UHVpfQ5aXj65kmZMDCBO01sUCNqJ0Yl7t+ZPoL+7uWQXn0S jsNT4hMdCNAOwGBwkvi19eyd+JJ3YO81AfK7cN6wi57gJyWWJSxupiANeTm7RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891378; a=rsa-sha256; cv=none; b=pbzuDAPoDvIswHdWmZ04rWyQF2Hm7jqDoNP5bN4VCBmwjJuk91IbbQIk+h1+DZyToqeK1A 76x0HUSuO1qu7i8l7OpVK9VkYvBfplSjjUi37WNWfvxodTqAG1++hVv+tBhV5cKHsPHk/1 b3y3LycGZFHv6y/kHyFdsPpRPVKl44h1uJT1+2EE019ONiOmyxj0JUGmkYtTjdPyFE19eL LRj5DkVHY85kA9lyxScfEHoUdSzQ03UgbtQauQ0YhcIG2l01nOtwl7NooD2QI6/WfvVBuz jt3tT/1lKZJ2/1rSonPOyPEysYY/UBfZ+w65GUg45xD7GkJ/x9V20paoF5myfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3320ca120591d05f1e2ac0dc4d5235f54b2694f4 commit 3320ca120591d05f1e2ac0dc4d5235f54b2694f4 Author: John Baldwin AuthorDate: 2022-04-13 23:08:21 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:21 +0000 ipfw: icmp6_type is only used for INET6. --- sys/netpfil/ipfw/ip_fw2.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c index 7775b519270f..aaca2e2b2fcd 100644 --- a/sys/netpfil/ipfw/ip_fw2.c +++ b/sys/netpfil/ipfw/ip_fw2.c @@ -1438,7 +1438,9 @@ ipfw_chk(struct ip_fw_args *args) /* XXX ipv6 variables */ int is_ipv6 = 0; +#ifdef INET6 uint8_t icmp6_type = 0; +#endif uint16_t ext_hd = 0; /* bits vector for extension header filtering */ /* end of ipv6 variables */ @@ -1550,7 +1552,9 @@ do { \ switch (proto) { case IPPROTO_ICMPV6: PULLUP_TO(hlen, ulp, struct icmp6_hdr); +#ifdef INET6 icmp6_type = ICMP6(ulp)->icmp6_type; +#endif break; case IPPROTO_TCP: