The branch main has been updated by kp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=8e7d333f9207f0e03f2953887b3364e7bc02b010
commit 8e7d333f9207f0e03f2953887b3364e7bc02b010
Author: Kristof Provost <k...@freebsd.org>
AuthorDate: 2025-04-09 08:50:27 +0000
Commit: Kristof Provost <k...@freebsd.org>
CommitDate: 2025-04-09 09:09:24 +0000
pf: added /* FALLTHROUGH */ comments, typecasts (u_int32_t)-1, ...
ok mpi@
Obtained from: OpenBSD, sashan <sas...@openbsd.org>, 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);
