From nobody Mon Aug 10 14:34:20 2026 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 4hJchZ0gg5z6nsDN for ; Mon, 10 Aug 2026 14:34:22 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hJchY4l31z3b6h for ; Mon, 10 Aug 2026 14:34:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786372461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xXf/fE7mXeRDfCVxYK/+I+ulE+8eh7U5aGsohCzNp8g=; b=CItOeZyazII0msYnyYZaVG9CBsAgmYroLY17xFUJSqzYDSwNlHgwbG3k0d9HQW9zXOIzQ8 h3j6/iWS4OVQgVcLy/ZgkumzlBkqyY8Tup8tU6y8g5iTwjb2d5hG13x7aQWNGYjFD0fUqr ot02cVXIVe7lrSxRF2a1RsQ5HRMMqmep/Mj9eYFcm5dvQW4RENRAqKKYBU7daKz4NHciW4 iKkbSlLtlrtuvFQJM/8dtpfeEu2lBy9c0eTprfl+gqMKrRnjR9d6TI7wXRytu09mS4r4Ft LCEvZXvJeTLXhr/+RkrYhsJiQm1tkYC0lcrKefH4c6HY5+F8ngHN+AKEzfWOKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786372461; a=rsa-sha256; cv=none; b=qr3GRYVHXok/MFiY5BTsaO4IH8Ttm5k70d4RDTpVESipNe4ZMsizf31zDg9w3kAQTlGNVU tSLqOjrwJ3f6OJzbvR/fIiiRSAKSSS1En7HmAAWtu/NFSsznBma2N6tBfJ+opCwi33SZUK KVpGbT077bBTTdMpLYuYQl4bvwWRghWZlHp9wMlLdX8LCylJx9+FT81M2eEopCXZzXo5Ab PZ2P/3VwTof+HDNMtnBN3cXIh/6bUA7JpnNEPN8pwZDJxOZxT+fR2INyexjfLxSs2HKGuH MoD8K2H7Fz+rj1QV/HlQSzB5kP4a+AFLJjXxdf+IwOZ+1xzIGFiOOZo4HT5mcg== 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=1786372461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xXf/fE7mXeRDfCVxYK/+I+ulE+8eh7U5aGsohCzNp8g=; b=IjUkotMXHWiC3tf7aNJv/Hp4NfXsWrWJ5pDXEPaOweFlzXEtAr7kmj0SegqMjb7lHYCQ+3 7NyZhfgnhVXtRCxyhK0U2Ro3c3QjM2HOI9bv5AZYGXJ36X+SXGhDV//dj6qlppz37a1ZNu mOXlc8ENOv2pM05UR1deaIePX7/1Z9NyWj5VQVzt1lVoxAVjDT8PsOGjdkkFk8GYPuw4rQ 5MCEOSQL1QZtEUSjm4P0so3Y1FG0zI5uuladXVlYyU/Tj5HzGKBs6mwVwBKQIACPO3nMFQ phc9okXLEpKfRlFukmgy1s0E6nNS5qxH9SpOCSL8M2a1WmRD47OmBmBOBUpI3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hJchX3RCvz1CCD for ; Mon, 10 Aug 2026 14:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 247ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 10 Aug 2026 14:34:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ishan Agrawal From: Kristof Provost Subject: git: 15c0c9df3a4a - main - libsysdecode: use decoder table for PF netlink commands 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 15c0c9df3a4af27176d8bbefcd21b68e2a952835 Auto-Submitted: auto-generated Date: Mon, 10 Aug 2026 14:34:20 +0000 Message-Id: <6a79e16c.247ac.783bf0c5@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=15c0c9df3a4af27176d8bbefcd21b68e2a952835 commit 15c0c9df3a4af27176d8bbefcd21b68e2a952835 Author: Ishan Agrawal AuthorDate: 2026-08-08 06:22:18 +0000 Commit: Kristof Provost CommitDate: 2026-08-10 14:33:32 +0000 libsysdecode: use decoder table for PF netlink commands Introduce a PF netlink command decoder table mapping PFNL commands to their attribute decoder sets. This replaces the existing switch-based dispatch and makes it easier to add support for additional PF netlink commands. Signed-off-by: Ishan Agrawal Sponsored-by: Google LLC (GSoC 2026) Reviewed by: kp --- lib/libsysdecode/netlink.c | 70 ++++++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 24 deletions(-) diff --git a/lib/libsysdecode/netlink.c b/lib/libsysdecode/netlink.c index 344822f18fcb..56b5671b129d 100644 --- a/lib/libsysdecode/netlink.c +++ b/lib/libsysdecode/netlink.c @@ -48,6 +48,11 @@ struct nlattr_decoder_set { size_t count; /*Attribute Count*/ }; +struct pfnl_cmd_decoder { + int cmd_num; /* PFNL CMD */ + const struct nlattr_decoder_set *ds; /* PFNL CMD Decoder set */ +}; + #define NL_DECLARE_ATTR_DECODER(_name, _np) \ static const struct nlattr_decoder_set _name = { \ .decoders = &((_np)[0]), \ @@ -213,6 +218,33 @@ search_decoders(const struct nlattr_decoder *ps, size_t pslen, int key) return (NULL); } +static const struct pfnl_cmd_decoder * +search_cmd_decoders(const struct pfnl_cmd_decoder *ps, size_t pslen, int key) +{ + size_t left_i = 0, right_i = pslen - 1; + + if (pslen == 0) + return (NULL); + + if (key < ps[0].cmd_num || key > ps[pslen - 1].cmd_num) + return (NULL); + + while (left_i + 1 < right_i) { + size_t mid_i = (left_i + right_i) / 2; + if (key < ps[mid_i].cmd_num) + right_i = mid_i; + else if (key > ps[mid_i].cmd_num) + left_i = mid_i + 1; + else + return (&ps[mid_i]); + } + if (ps[left_i].cmd_num == key) + return (&ps[left_i]); + else if (ps[right_i].cmd_num == key) + return (&ps[right_i]); + return (NULL); +} + static void nl_decode_attrs_raw(FILE *fp, const struct nlattr *nla_head, size_t len, const struct nlattr_decoder *ps, size_t pslen) @@ -307,6 +339,14 @@ static const struct nlattr_decoder nla_d_clear_states[] = { }; NL_DECLARE_ATTR_DECODER(killclear_states_decoder, nla_d_clear_states); +static const struct pfnl_cmd_decoder cmd_decoder[] = { + { .cmd_num = PFNL_CMD_GETRULES, .ds = &getrules_decoder }, + { .cmd_num = PFNL_CMD_KILLSTATES, .ds = &killclear_states_decoder }, + { .cmd_num = PFNL_CMD_GET_LIMIT, .ds = &set_limit_decoder }, + { .cmd_num = PFNL_CMD_GET_ADDRS, .ds = &addr_decoder }, + { .cmd_num = PFNL_CMD_GET_ADDR, .ds = &addr_decoder }, +}; + static void sysdecode_netlink_pf(FILE *fp, const struct genlmsghdr *genl, size_t nlm_len) { @@ -321,30 +361,12 @@ sysdecode_netlink_pf(FILE *fp, const struct genlmsghdr *genl, size_t nlm_len) const struct nlattr *nla = (const struct nlattr *)(const void *) ((const char *)genl + sizeof(struct genlmsghdr)); - switch (cmd) { - case PFNL_CMD_GETRULES: - nl_decode_attrs_raw(fp, nla, nlm_len, - getrules_decoder.decoders, getrules_decoder.count); - break; - case PFNL_CMD_GET_LIMIT: - nl_decode_attrs_raw(fp, nla, nlm_len, - set_limit_decoder.decoders, set_limit_decoder.count); - break; - case PFNL_CMD_GET_ADDR: - nl_decode_attrs_raw(fp, nla, nlm_len, - addr_decoder.decoders, addr_decoder.count); - break; - case PFNL_CMD_GET_ADDRS: - nl_decode_attrs_raw(fp, nla, nlm_len, - addr_decoder.decoders, addr_decoder.count); - break; - case PFNL_CMD_KILLSTATES: - nl_decode_attrs_raw(fp, nla, nlm_len, - killclear_states_decoder.decoders, - killclear_states_decoder.count); - break; - default: - break; + const struct pfnl_cmd_decoder *d; + + d = search_cmd_decoders(cmd_decoder, nitems(cmd_decoder), cmd); + if (d != NULL) { + nl_decode_attrs_raw(fp, nla, nlm_len, + d->ds->decoders, d->ds->count); } }