From nobody Wed Apr 09 09:51:44 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 4ZXdWk6TsHz5sqMw; Wed, 09 Apr 2025 09:51:46 +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 4ZXdWj1zZcz3y9K; Wed, 09 Apr 2025 09:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744192305; 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=65sxmJnelcFDSVJfsxyyVXiEoH9c97/QFWxbABGtmvE=; b=piRphkqbCezn3Auo6WgVwWwX7eNpfsRNjS+mVC+kw3N8x5SXdXwjX7TG91dSmt6/gneOzN bJ7Y4uSsIXoFH674FFtcQu56M4FuLARF3St62CQ/aWtG8qWvkPGoJyrxj4FLoF9lU7rKKh g2na5KprWf6F7SqjsC/Zqk9jK9zOCbTVTk2Qn+ijfUjJZoNAbeb9xolk+9vFDuimY5KDUb jglRFbS6dTl2AU3UTrDjEDwoPX0nU5L7usEW+mE/dEhqxFyYgN1GpUu6KKqfAumPPdEWsf oVXQ3l2wVBPDTQt216vsn4PPioZZlB7VSKS7CYUvTDWLyKegNJIDi+/WBu7shQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744192305; a=rsa-sha256; cv=none; b=B6Hmxjl51/Zb0fua+cfVpnTYqGfDy6MpFLNVZavIWuL7xlTyYPmJkdkwXDrsX/bZJ7Q6CH Cu/ra7D4EMhultjuoR2Pw1Q9FhkzWO/n5DCZnbGzhcrNtg5X/5LlA5BWqUUGddG7/JrYzV JeIU+brnVCMVKejJdwKsnFbEPQT0hTbQqrcxAl1wVQfAhi0VjOXQs8upOscnsai1VcqvY0 9XGEWOx4McO7K1nHbpPLQfK/Vp2f6v7apx/t4CEWqUYkPsnPzp78VedIwweIoRnU7L1GCN l4CsEcBrSCTUd49wTedqji1Sy1bxepTviRWEcEI9U4vvunvFDf64YNnAZV7TJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744192305; 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=65sxmJnelcFDSVJfsxyyVXiEoH9c97/QFWxbABGtmvE=; b=qvg9SXZ8jAcL34mwf7ch3WNCvUV4J+nS8kLJ42fqBY0dQF5Sq2/yq/w+sn0Nyw7QrAs40b 4A66qxsKsQ5Sfe+aQKC8y9h+h/0X8pIkZrtg0E04IUHUpxZK4nLGg6PlUzjU3SvJSaK14F w/9lMhSrhO+Ey0TchyeK6JZZWqtqmVMCbVXg/PIluUNfR1qWbu4yC9Ok24zUUQh1c3Rd+R imVbfiFXZis7voMqGoV94G7Mi6+Ofwo4wib5wm8sdsrresetNtPfEfgfc0GTdlBvd83ZmV coTXncQVIIvdzJCllnrjnlziu72JkshFP3yJADQ5dI2ycjWK22tavgf6jY635w== 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 4ZXdWj0mtxz1BSc; Wed, 09 Apr 2025 09:51:45 +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 5399pjfb091004; Wed, 9 Apr 2025 09:51:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5399piKS091001; Wed, 9 Apr 2025 09:51:44 GMT (envelope-from git) Date: Wed, 9 Apr 2025 09:51:44 GMT Message-Id: <202504090951.5399piKS091001@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: 8e7d333f9207 - main - pf: added /* FALLTHROUGH */ comments, typecasts (u_int32_t)-1, ... 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: 8e7d333f9207f0e03f2953887b3364e7bc02b010 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8e7d333f9207f0e03f2953887b3364e7bc02b010 commit 8e7d333f9207f0e03f2953887b3364e7bc02b010 Author: Kristof Provost AuthorDate: 2025-04-09 08:50:27 +0000 Commit: Kristof Provost CommitDate: 2025-04-09 09:09:24 +0000 pf: added /* FALLTHROUGH */ comments, typecasts (u_int32_t)-1, ... ok mpi@ Obtained from: OpenBSD, sashan , a17121a67f Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 10 ++++++++++ sys/netpfil/pf/pf_if.c | 16 +++++++++------- sys/netpfil/pf/pf_ioctl.c | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index ccf679813f35..d05469ad959b 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -2206,6 +2206,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, switch (type) { case ICMP_ECHO: *icmp_dir = PF_IN; + /* FALLTHROUGH */ case ICMP_ECHOREPLY: *virtual_type = ICMP_ECHO; *virtual_id = pd->hdr.icmp.icmp_id; @@ -2213,6 +2214,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, case ICMP_TSTAMP: *icmp_dir = PF_IN; + /* FALLTHROUGH */ case ICMP_TSTAMPREPLY: *virtual_type = ICMP_TSTAMP; *virtual_id = pd->hdr.icmp.icmp_id; @@ -2220,6 +2222,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, case ICMP_IREQ: *icmp_dir = PF_IN; + /* FALLTHROUGH */ case ICMP_IREQREPLY: *virtual_type = ICMP_IREQ; *virtual_id = pd->hdr.icmp.icmp_id; @@ -2227,6 +2230,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, case ICMP_MASKREQ: *icmp_dir = PF_IN; + /* FALLTHROUGH */ case ICMP_MASKREPLY: *virtual_type = ICMP_MASKREQ; *virtual_id = pd->hdr.icmp.icmp_id; @@ -2234,6 +2238,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, case ICMP_IPV6_WHEREAREYOU: *icmp_dir = PF_IN; + /* FALLTHROUGH */ case ICMP_IPV6_IAMHERE: *virtual_type = ICMP_IPV6_WHEREAREYOU; *virtual_id = 0; /* Nothing sane to match on! */ @@ -2241,6 +2246,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, case ICMP_MOBILE_REGREQUEST: *icmp_dir = PF_IN; + /* FALLTHROUGH */ case ICMP_MOBILE_REGREPLY: *virtual_type = ICMP_MOBILE_REGREQUEST; *virtual_id = 0; /* Nothing sane to match on! */ @@ -2248,6 +2254,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, case ICMP_ROUTERSOLICIT: *icmp_dir = PF_IN; + /* FALLTHROUGH */ case ICMP_ROUTERADVERT: *virtual_type = ICMP_ROUTERSOLICIT; *virtual_id = 0; /* Nothing sane to match on! */ @@ -2283,6 +2290,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, switch (type) { case ICMP6_ECHO_REQUEST: *icmp_dir = PF_IN; + /* FALLTHROUGH */ case ICMP6_ECHO_REPLY: *virtual_type = ICMP6_ECHO_REQUEST; *virtual_id = pd->hdr.icmp6.icmp6_id; @@ -2304,6 +2312,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, } case MLD_MTRACE: *icmp_dir = PF_IN; + /* FALLTHROUGH */ case MLD_MTRACE_RESP: *virtual_type = MLD_MTRACE; *virtual_id = 0; /* Nothing sane to match on! */ @@ -2311,6 +2320,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, case ND_NEIGHBOR_SOLICIT: *icmp_dir = PF_IN; + /* FALLTHROUGH */ case ND_NEIGHBOR_ADVERT: { *virtual_type = ND_NEIGHBOR_SOLICIT; *virtual_id = 0; diff --git a/sys/netpfil/pf/pf_if.c b/sys/netpfil/pf/pf_if.c index 31fc8b152719..389b74d09d37 100644 --- a/sys/netpfil/pf/pf_if.c +++ b/sys/netpfil/pf/pf_if.c @@ -86,10 +86,10 @@ static void pfi_attach_ifgroup(struct ifg_group *, struct pfi_kkif *); static void pfi_kkif_update(struct pfi_kkif *); static void pfi_dynaddr_update(struct pfi_dynaddr *dyn); -static void pfi_table_update(struct pfr_ktable *, struct pfi_kkif *, int, +static void pfi_table_update(struct pfr_ktable *, struct pfi_kkif *, uint8_t, int); -static void pfi_instance_add(struct ifnet *, int, int); -static void pfi_address_add(struct sockaddr *, int, int); +static void pfi_instance_add(struct ifnet *, uint8_t, int); +static void pfi_address_add(struct sockaddr *, sa_family_t, uint8_t); static int pfi_kkif_compare(struct pfi_kkif *, struct pfi_kkif *); static int pfi_skip_if(const char *, struct pfi_kkif *); static int pfi_unmask(void *); @@ -682,7 +682,8 @@ pfi_dynaddr_update(struct pfi_dynaddr *dyn) } static void -pfi_table_update(struct pfr_ktable *kt, struct pfi_kkif *kif, int net, int flags) +pfi_table_update(struct pfr_ktable *kt, struct pfi_kkif *kif, uint8_t net, + int flags) { int e, size2 = 0; struct ifg_member *ifgm; @@ -705,11 +706,12 @@ pfi_table_update(struct pfr_ktable *kt, struct pfi_kkif *kif, int net, int flags } static void -pfi_instance_add(struct ifnet *ifp, int net, int flags) +pfi_instance_add(struct ifnet *ifp, uint8_t net, int flags) { struct ifaddr *ia; int got4 = 0, got6 = 0; - int net2, af; + sa_family_t af; + uint8_t net2; NET_EPOCH_ASSERT(); @@ -773,7 +775,7 @@ pfi_instance_add(struct ifnet *ifp, int net, int flags) } static void -pfi_address_add(struct sockaddr *sa, int af, int net) +pfi_address_add(struct sockaddr *sa, sa_family_t af, uint8_t net) { struct pfr_addr *p; int i; diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 787715412fc2..45e6e9f0bb9a 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -342,7 +342,7 @@ pfattach_vnet(void) /* default rule should never be garbage collected */ V_pf_default_rule.entries.tqe_prev = &V_pf_default_rule.entries.tqe_next; V_pf_default_rule.action = V_default_to_drop ? PF_DROP : PF_PASS; - V_pf_default_rule.nr = -1; + V_pf_default_rule.nr = (uint32_t)-1; V_pf_default_rule.rtableid = -1; pf_counter_u64_init(&V_pf_default_rule.evaluations, M_WAITOK);