From nobody Thu Aug 31 08:56:44 2023 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 4Rbw583fQMz4rwV5; Thu, 31 Aug 2023 08:56:44 +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 4Rbw582v67z4ZB8; Thu, 31 Aug 2023 08:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693472204; 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=veOtsd1m8ehJ+bNU6YdiNiLYkwI51vLM1/WFTzZ6Gsc=; b=Vx8twVQSS8/skyVk1YSVI0j2RP/XGJBaGZ+WEdqFRYQ9S3ZWhe7xDK/h0XvF/2DUFkD9gQ VnzS7nUtkhJf/UMlQJNH+UQf1vmyzzltuZ2ODIHx7ZyDebYCSYKqwSG/W2dhZ0mdbR6+Ck xrvt6lV+ScRUh9VJsMsD5wX+JuHJegs3P70OF3kKHQ3LTN7nd3yQUDTsltf2eqZF1DJGzu qXlqGALhG15wO3Wl4DcSO0pIpzqgFXUSVvRDrArZAivQ0GUbc+AvVqYI6DRF/e1zfMMjcr f/ZxU65avK2Xu9pUFiTmhGas/I+UPTMS59xGMnV1u1aNI7YtYUYZYXOzWwP+Bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693472204; a=rsa-sha256; cv=none; b=nWYJkztZ8EmZTUc5qKZfDv/7o68ntNTEXq/eYzC5EJgipn08MUctCvpVPomAApeFP0zSIq ea8iVdn12uReg8zC9kqoPLIIQoIcVgu5TQuhw2WgqM0xmaFaf0kMrhfSNyCp/8eHMqPJZ+ 9e2B7cSvOPjYXCpPQEgkgIg37AYP6CaeY8Z2BQLlrmcvoadt6qwhi2k5z+39SjZ+kvI+mO 6BUHv843JuD1e6mM+7abNRu7BkX1sP/LOJM+/XED86+KiK17CCML9VcB1NTOOmH5Vx1+4S u1oMudV6mbzfUFPUbIjXPrII/9+o6yxYXI3EaLQ5EmSW8XG0IvOfekXpqyn1Lg== 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=1693472204; 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=veOtsd1m8ehJ+bNU6YdiNiLYkwI51vLM1/WFTzZ6Gsc=; b=gdlJdISq3LBDKfIC3rRHroEw97flIcbKNLRPyPUUATQUQxQ68mLCZY/5JwfQp9AfpiXLv9 fC1+xWOP2mle0VDT2ooiZsDovOcmHccgCxl39qxU6s6O/FES+pj2mmGQBnmvIJmQT9eJ9v 0H1LOzIqfvtixFaYkB2bD8KxiZ1+3W/fvOsY3ogcKtNZshRcOiWGoGv20Q+br/JgP1ak4K q2KTzYI5rgiESg4lH8QnYPGNCWMGpSNW7t+J1LzB9fSutyXm8b9x4WcrjXemW6lpc0yvmT UgZ658Mgf9y6yr1HhCZGrvXzgEK2L1YzQBrtu2hiiSJncoCyTaC/MYIZl7sFaQ== 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 4Rbw581cxWz19dL; Thu, 31 Aug 2023 08:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37V8ui25083242; Thu, 31 Aug 2023 08:56:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37V8uiVQ083239; Thu, 31 Aug 2023 08:56:44 GMT (envelope-from git) Date: Thu, 31 Aug 2023 08:56:44 GMT Message-Id: <202308310856.37V8uiVQ083239@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: e3d3d61a7d94 - main - libpfctl: implement status counter accessor functions 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3d3d61a7d94a4155ef70048a8b578985fca8383 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e3d3d61a7d94a4155ef70048a8b578985fca8383 commit e3d3d61a7d94a4155ef70048a8b578985fca8383 Author: Kristof Provost AuthorDate: 2023-08-29 15:04:17 +0000 Commit: Kristof Provost CommitDate: 2023-08-31 08:56:31 +0000 libpfctl: implement status counter accessor functions The new nvlist-based status call allows us to easily add new counters. However, the libpfctl interface defines a TAILQ, so it's not quite trivial to find the counter consumers are interested in. Provide convenience functions to access the counters. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41649 --- lib/libpfctl/libpfctl.c | 31 +++++++++++++++++++++++++++++++ lib/libpfctl/libpfctl.h | 3 +++ 2 files changed, 34 insertions(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 7d79d0abb970..1eccf3dfbcdf 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -252,6 +252,37 @@ pfctl_get_status(int dev) return (status); } +static uint64_t +_pfctl_status_counter(struct pfctl_status_counters *counters, uint64_t id) +{ + struct pfctl_status_counter *c; + + TAILQ_FOREACH(c, counters, entry) { + if (c->id == id) + return (c->counter); + } + + return (0); +} + +uint64_t +pfctl_status_counter(struct pfctl_status *status, int id) +{ + return (_pfctl_status_counter(&status->counters, id)); +} + +uint64_t +pfctl_status_fcounter(struct pfctl_status *status, int id) +{ + return (_pfctl_status_counter(&status->fcounters, id)); +} + +uint64_t +pfctl_status_scounter(struct pfctl_status *status, int id) +{ + return (_pfctl_status_counter(&status->scounters, id)); +} + void pfctl_free_status(struct pfctl_status *status) { diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 35c662816f3b..2559fc9c4843 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -385,6 +385,9 @@ struct pfctl_syncookies { }; struct pfctl_status* pfctl_get_status(int dev); +uint64_t pfctl_status_counter(struct pfctl_status *status, int id); +uint64_t pfctl_status_fcounter(struct pfctl_status *status, int id); +uint64_t pfctl_status_scounter(struct pfctl_status *status, int id); void pfctl_free_status(struct pfctl_status *status); int pfctl_get_eth_rulesets_info(int dev,