From nobody Fri Feb 14 17:50:24 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 4Yvfhw6h5xz5nQtk; Fri, 14 Feb 2025 17:50:24 +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 4Yvfhw5wQTz3KKG; Fri, 14 Feb 2025 17:50:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739555424; 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=CvYmho+h/iQ3SJLlJmD+CktYSrBvZyF0XAtaMDW/yho=; b=VuO4n9+JaOLRR3kO1gSf+kAlSLasVqzt69CKUOFK8DUV77Ho12Q9aqDoB/3jHnc++sWr94 +smaujh9vAyHsNSuAM81URovlC5v4e/YiRBQrcJqyfRIuVKNiuwCZ1WrfldGcelTDKwoVK d8l6wa+YBAZfb6mT8o46W2CexD4uWxMmXPx+uZbAzCEVzj2Ag7PYMi0rpIgIjcmVxMst55 tBxrFGj0os0m6pL701icEFE7PoRT7mCYxCZjzkj4brr20n9K0ykf3uq4n8K/fKxmrEU7ld 6Jla6rAO4cS4DbRZ9fuq7nKjs1sjpZDfvjsm0ubtqSetOR4+DpZKgxqUuAMZeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739555424; 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=CvYmho+h/iQ3SJLlJmD+CktYSrBvZyF0XAtaMDW/yho=; b=QTwGkEsX6PO9OfxDK7l23AQHmSkBh1qVUL9mRCvcxpLMmL5HjL2RQOEkqFT/XvU45m4xt7 S+Npk6bfpml6CuZGPebDX3Pt5R1lHG4ivhp0FIZMhZ6m0rWw52uyb26k4wjmn1xju/8Ncb FPFQVK8fwEvS9Abv9QIGTYwJYcVtT6x7S/LjXCLUV7zsWYknJlJeOw23voSY8DlzowoFbL l3dmeC6BrC+ptjp+bYGLdlb83YsSkr4lDZ2w+cusshB1hix6d7lgpmQI2wPO2PIfb04Gmk soPpu69n0PNf4jvEY9rKc4DHxY/lZcr4jUGYSVk6qXs+R+nPyqk5hKpF733ReA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739555424; a=rsa-sha256; cv=none; b=yCrYiCFCwSLd2YikFDoGPTK6xHrrGof8AJHHDI6K5s2tJGJ/7U5i6gajr1w9yIMGUqhVV7 cR90DElPWJWSEQAC6WjiZtz+lanqZqFlQEhaMa3ZnP9WenkCPa0ZegHeKWXoGLBQ1qMbSi v9qbj7jFv+ZzQTi4Kam8Cz0MDC2OW0kU+hmThk5KdmBVBMDsCjlz7P4jOcR99tZMwkv3U/ 9Kn/njpXm+bTrOYhh/Lz7WZnlwGIqSWmweNcLyJMmhJ1nNhK+ja6Ck/rxh1YRNzY0LOV7R TDQ/YzCpnZAz/bi0KAY9YXv4vQt1Tk3mTeL8yDlKFMYhoEdOydhWTg4cG9Zs5Q== 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 4Yvfhw5V6SzgxR; Fri, 14 Feb 2025 17:50:24 +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 51EHoOpg061345; Fri, 14 Feb 2025 17:50:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EHoOFm061342; Fri, 14 Feb 2025 17:50:24 GMT (envelope-from git) Date: Fri, 14 Feb 2025 17:50:24 GMT Message-Id: <202502141750.51EHoOFm061342@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: 7e7f88001d7d - main - pf: use time_t for storing time_t values 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: 7e7f88001d7dfec83cd7568369be6a587d4a51ff Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7e7f88001d7dfec83cd7568369be6a587d4a51ff commit 7e7f88001d7dfec83cd7568369be6a587d4a51ff Author: Kristof Provost AuthorDate: 2025-02-07 10:29:26 +0000 Commit: Kristof Provost CommitDate: 2025-02-14 17:47:52 +0000 pf: use time_t for storing time_t values No change to the underlying type, so no ABI change. We define __time_t as uint64_t if __LP64__, otherwise uint32_t, and only define __LP64__ if long is 64 bits. In other words: __time_t == long. ok henning@ deraadt@ Obtained from: OpenBSD, guenther , 6c1b69a0ff Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D48963 --- share/man/man4/pf.4 | 4 ++-- sys/net/pfvar.h | 12 ++++++------ sys/netpfil/pf/pf_table.c | 40 ++++++++++++++++++++-------------------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4 index 92e1a6fdf87b..9ab46558a2d6 100644 --- a/share/man/man4/pf.4 +++ b/share/man/man4/pf.4 @@ -682,7 +682,7 @@ struct pfr_tstats { [PFR_DIR_MAX][PFR_OP_TABLE_MAX]; u_int64_t pfrts_match; u_int64_t pfrts_nomatch; - long pfrts_tzero; + time_t pfrts_tzero; int pfrts_cnt; int pfrts_refcnt[PFR_REFCNT_MAX]; }; @@ -822,7 +822,7 @@ struct pfr_astats { [PFR_DIR_MAX][PFR_OP_ADDR_MAX]; u_int64_t pfras_bytes [PFR_DIR_MAX][PFR_OP_ADDR_MAX]; - long pfras_tzero; + time_t pfras_tzero; }; .Ed .It Dv DIOCRCLRASTATS Fa "struct pfioc_table *io" diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 076027e436dc..964a1d41f353 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1434,7 +1434,7 @@ struct pfr_astats { struct pfr_addr pfras_a; u_int64_t pfras_packets[PFR_DIR_MAX][PFR_OP_ADDR_MAX]; u_int64_t pfras_bytes[PFR_DIR_MAX][PFR_OP_ADDR_MAX]; - long pfras_tzero; + time_t pfras_tzero; }; enum { PFR_REFCNT_RULE, PFR_REFCNT_ANCHOR, PFR_REFCNT_MAX }; @@ -1445,7 +1445,7 @@ struct pfr_tstats { u_int64_t pfrts_bytes[PFR_DIR_MAX][PFR_OP_TABLE_MAX]; u_int64_t pfrts_match; u_int64_t pfrts_nomatch; - long pfrts_tzero; + time_t pfrts_tzero; int pfrts_cnt; int pfrts_refcnt[PFR_REFCNT_MAX]; }; @@ -1507,7 +1507,7 @@ struct pfr_ktstats { struct pfr_kstate_counter pfrkts_bytes[PFR_DIR_MAX][PFR_OP_TABLE_MAX]; struct pfr_kstate_counter pfrkts_match; struct pfr_kstate_counter pfrkts_nomatch; - long pfrkts_tzero; + time_t pfrkts_tzero; int pfrkts_cnt; int pfrkts_refcnt[PFR_REFCNT_MAX]; }; @@ -1528,7 +1528,7 @@ union sockaddr_union { struct pfr_kcounters { counter_u64_t pfrkc_counters; - long pfrkc_tzero; + time_t pfrkc_tzero; }; #define pfr_kentry_counter(kc, dir, op, t) \ ((kc)->pfrkc_counters + \ @@ -1586,7 +1586,7 @@ struct pfi_kkif { #define pfik_list _pfik_glue._pfik_list struct pf_counter_u64 pfik_packets[2][2][2]; struct pf_counter_u64 pfik_bytes[2][2][2]; - u_int32_t pfik_tzero; + time_t pfik_tzero; u_int pfik_flags; struct ifnet *pfik_ifp; struct ifg_group *pfik_group; @@ -2489,7 +2489,7 @@ int pfr_get_tstats(struct pfr_table *, struct pfr_tstats *, int *, int); int pfr_clr_tstats(struct pfr_table *, int, int *, int); int pfr_set_tflags(struct pfr_table *, int, int, int, int *, int *, int); int pfr_clr_addrs(struct pfr_table *, int *, int); -int pfr_insert_kentry(struct pfr_ktable *, struct pfr_addr *, long); +int pfr_insert_kentry(struct pfr_ktable *, struct pfr_addr *, time_t); int pfr_add_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int); int pfr_del_addrs(struct pfr_table *, struct pfr_addr *, int, int *, diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c index 03efa0b738da..666ec18ec377 100644 --- a/sys/netpfil/pf/pf_table.c +++ b/sys/netpfil/pf/pf_table.c @@ -139,11 +139,11 @@ static struct pfr_kentry *pfr_create_kentry(struct pfr_addr *, bool); static void pfr_destroy_kentries(struct pfr_kentryworkq *); static void pfr_destroy_kentry(struct pfr_kentry *); static void pfr_insert_kentries(struct pfr_ktable *, - struct pfr_kentryworkq *, long); + struct pfr_kentryworkq *, time_t); static void pfr_remove_kentries(struct pfr_ktable *, struct pfr_kentryworkq *); static void pfr_clstats_kentries(struct pfr_ktable *, - struct pfr_kentryworkq *, long, int); + struct pfr_kentryworkq *, time_t, int); static void pfr_reset_feedback(struct pfr_addr *, int); static void pfr_prepare_network(union sockaddr_union *, int, int); static int pfr_route_kentry(struct pfr_ktable *, @@ -153,16 +153,16 @@ static int pfr_unroute_kentry(struct pfr_ktable *, static int pfr_walktree(struct radix_node *, void *); static int pfr_validate_table(struct pfr_table *, int, int); static int pfr_fix_anchor(char *); -static void pfr_commit_ktable(struct pfr_ktable *, long); +static void pfr_commit_ktable(struct pfr_ktable *, time_t); static void pfr_insert_ktables(struct pfr_ktableworkq *); static void pfr_insert_ktable(struct pfr_ktable *); static void pfr_setflags_ktables(struct pfr_ktableworkq *); static void pfr_setflags_ktable(struct pfr_ktable *, int); -static void pfr_clstats_ktables(struct pfr_ktableworkq *, long, +static void pfr_clstats_ktables(struct pfr_ktableworkq *, time_t, int); -static void pfr_clstats_ktable(struct pfr_ktable *, long, int); +static void pfr_clstats_ktable(struct pfr_ktable *, time_t, int); static struct pfr_ktable - *pfr_create_ktable(struct pfr_table *, long, int); + *pfr_create_ktable(struct pfr_table *, time_t, int); static void pfr_destroy_ktables(struct pfr_ktableworkq *, int); static void pfr_destroy_ktable(struct pfr_ktable *, int); static int pfr_ktable_compare(struct pfr_ktable *, @@ -245,7 +245,7 @@ pfr_add_addrs(struct pfr_table *tbl, struct pfr_addr *addr, int size, struct pfr_kentry *p, *q; struct pfr_addr *ad; int i, rv, xadd = 0; - long tzero = time_second; + time_t tzero = time_second; PF_RULES_WASSERT(); @@ -397,7 +397,7 @@ pfr_set_addrs(struct pfr_table *tbl, struct pfr_addr *addr, int size, struct pfr_kentry *p, *q; struct pfr_addr ad; int i, rv, xadd = 0, xdel = 0, xchange = 0; - long tzero = time_second; + time_t tzero = time_second; PF_RULES_WASSERT(); @@ -584,7 +584,7 @@ pfr_get_astats(struct pfr_table *tbl, struct pfr_astats *addr, int *size, struct pfr_walktree w; struct pfr_kentryworkq workq; int rv; - long tzero = time_second; + time_t tzero = time_second; PF_RULES_RASSERT(); @@ -828,7 +828,7 @@ pfr_destroy_kentry(struct pfr_kentry *ke) static void pfr_insert_kentries(struct pfr_ktable *kt, - struct pfr_kentryworkq *workq, long tzero) + struct pfr_kentryworkq *workq, time_t tzero) { struct pfr_kentry *p; int rv, n = 0; @@ -847,7 +847,7 @@ pfr_insert_kentries(struct pfr_ktable *kt, } int -pfr_insert_kentry(struct pfr_ktable *kt, struct pfr_addr *ad, long tzero) +pfr_insert_kentry(struct pfr_ktable *kt, struct pfr_addr *ad, time_t tzero) { struct pfr_kentry *p; int rv; @@ -896,7 +896,7 @@ pfr_clean_node_mask(struct pfr_ktable *kt, static void pfr_clstats_kentries(struct pfr_ktable *kt, struct pfr_kentryworkq *workq, - long tzero, int negchange) + time_t tzero, int negchange) { struct pfr_kentry *p; int i; @@ -1173,7 +1173,7 @@ pfr_add_tables(struct pfr_table *tbl, int size, int *nadd, int flags) struct pfr_ktableworkq addq, changeq; struct pfr_ktable *p, *q, *r, key; int i, rv, xadd = 0; - long tzero = time_second; + time_t tzero = time_second; ACCEPT_FLAGS(flags, PFR_FLAG_DUMMY); SLIST_INIT(&addq); @@ -1318,7 +1318,7 @@ pfr_get_tstats(struct pfr_table *filter, struct pfr_tstats *tbl, int *size, struct pfr_ktable *p; struct pfr_ktableworkq workq; int n, nn; - long tzero = time_second; + time_t tzero = time_second; int pfr_dir, pfr_op; /* XXX PFR_FLAG_CLSTATS disabled */ @@ -1375,7 +1375,7 @@ pfr_clr_tstats(struct pfr_table *tbl, int size, int *nzero, int flags) struct pfr_ktableworkq workq; struct pfr_ktable *p, key; int i, xzero = 0; - long tzero = time_second; + time_t tzero = time_second; ACCEPT_FLAGS(flags, PFR_FLAG_DUMMY | PFR_FLAG_ADDRSTOO); SLIST_INIT(&workq); @@ -1619,7 +1619,7 @@ pfr_ina_commit(struct pfr_table *trs, u_int32_t ticket, int *nadd, struct pfr_ktableworkq workq; struct pf_kruleset *rs; int xadd = 0, xchange = 0; - long tzero = time_second; + time_t tzero = time_second; PF_RULES_WASSERT(); @@ -1657,7 +1657,7 @@ pfr_ina_commit(struct pfr_table *trs, u_int32_t ticket, int *nadd, } static void -pfr_commit_ktable(struct pfr_ktable *kt, long tzero) +pfr_commit_ktable(struct pfr_ktable *kt, time_t tzero) { counter_u64_t *pkc, *qkc; struct pfr_ktable *shadow = kt->pfrkt_shadow; @@ -1882,7 +1882,7 @@ pfr_setflags_ktable(struct pfr_ktable *kt, int newf) } static void -pfr_clstats_ktables(struct pfr_ktableworkq *workq, long tzero, int recurse) +pfr_clstats_ktables(struct pfr_ktableworkq *workq, time_t tzero, int recurse) { struct pfr_ktable *p; @@ -1891,7 +1891,7 @@ pfr_clstats_ktables(struct pfr_ktableworkq *workq, long tzero, int recurse) } static void -pfr_clstats_ktable(struct pfr_ktable *kt, long tzero, int recurse) +pfr_clstats_ktable(struct pfr_ktable *kt, time_t tzero, int recurse) { struct pfr_kentryworkq addrq; int pfr_dir, pfr_op; @@ -1914,7 +1914,7 @@ pfr_clstats_ktable(struct pfr_ktable *kt, long tzero, int recurse) } static struct pfr_ktable * -pfr_create_ktable(struct pfr_table *tbl, long tzero, int attachruleset) +pfr_create_ktable(struct pfr_table *tbl, time_t tzero, int attachruleset) { struct pfr_ktable *kt; struct pf_kruleset *rs;