From nobody Wed Nov 29 14:02:49 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 4SgLcn5zg6z52llm; Wed, 29 Nov 2023 14:02:49 +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 4SgLcn5QJKz4S97; Wed, 29 Nov 2023 14:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701266569; 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=ygWHcW4Hz3hi4GzvjFYe1Al9cb6jp1XSIBigYMHi2zE=; b=U35svE7zGvqSgMODCVzpKW3WqwcLJaOXFZkv0V+QOV3icbwtsZ1479GVp2d9WP1LrCqkqx KiJz5RZ3GUz6WCzRaLIcGHdVEYzFxLaLM/3ouM+Mdw859nDDYBha13epjq0K/xMVjST2TG b18KHbbtvyu8rbIgXFU0cUbm/z+4QDBvaK1jHyDzXXS6vmZYFC2jLhR/X8qjzoRdfXl+kW NEDwg90Yy5uTip06N2eCVwVxuPG2GrLdA1DMIRgFaCimgxQpGFgrZ+J85R62/gTlIC9Gl4 vVs+Y6DJfZNuaKCkRCjkz47cKIK9BMZJUfzZtGVcqZS/Gf2j5ryXBcSK1oMQvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701266569; 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=ygWHcW4Hz3hi4GzvjFYe1Al9cb6jp1XSIBigYMHi2zE=; b=EhG/lZ56hLrYV9xBQMleX//wYysrW2c2+ZiXNHTZrNkLLTEgRvr9QmKMOeQnTG0+jD4qgn ZezbAxuUDvTRJ2OCbTr4hwQV2Yap4PDo+idfwu2iyqonQGX0MieDFm/SL3zKFxsKrbQxhv /CSukwNnXg4+blhVfpVejZJwBJsWEXpyUDGVEgNZY0Kgo2xAFXlStCKo8P0X6EJfHiE7ki SgGwJ4+XvT+mg+WfZMmdKXHKo41yfEhhkE5v3LIm32cc+aMhMMZk2gEq6k353638Kijo7W U18Ec2wzY1Ss3AtFiOEoKT1jIuDvV2zwgusJPMR6BYcgE+rg9sB4T9DTZI0mUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701266569; a=rsa-sha256; cv=none; b=VyPdRsggSIdFxRLNPa3hQQRyFOjJsCOWN+HDl2x6MboPounV+JCVwbzsmeecuMnqpp0ZPP YK2QM8lrVSoAAazwTpIMuZYT67S1lugk6ySQ7OINoUfeCYxqTKhKH38EjQl0wm8KnURKPQ Lad8GM/My9bioEWE9cCUNuH5Ia8sqPMb93nULyjAxWJecE5O/YhDMOC9wA4quzah5qQZbF HUaYI/lOYbaHIFTeCwvrWWbJfUBzuxBhE9RIoGoFnhRrNcBFbdAjMXQ1etp7h9Lz5QQC5J VKCsEW4a9u8Y2PWj4M8wmq72qtRVEyTlRCYy1yZfSO0NHYA91Ul9F70dt/PE3w== 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 4SgLcn4StTz17fR; Wed, 29 Nov 2023 14:02:49 +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 3ATE2ngD084594; Wed, 29 Nov 2023 14:02:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATE2nMf084591; Wed, 29 Nov 2023 14:02:49 GMT (envelope-from git) Date: Wed, 29 Nov 2023 14:02:49 GMT Message-Id: <202311291402.3ATE2nMf084591@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 0b9242dea68c - stable/13 - ng_ipfw: allow use of 32 bits wide cookies 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0b9242dea68c44dc630921d3802f3f80f4d84b48 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=0b9242dea68c44dc630921d3802f3f80f4d84b48 commit 0b9242dea68c44dc630921d3802f3f80f4d84b48 Author: Eugene Grosbein AuthorDate: 2023-11-14 09:36:08 +0000 Commit: Eugene Grosbein CommitDate: 2023-11-29 14:01:35 +0000 ng_ipfw: allow use of 32 bits wide cookies There is no reason in truncating 32 bits cookie value to 16 bits. Reviewed by: glebius (cherry picked from commit 20e1f207cc789a28783344614d6d1d1c639c5797) --- sys/netgraph/ng_ipfw.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/netgraph/ng_ipfw.c b/sys/netgraph/ng_ipfw.c index b660a825c814..01592a4bbb7d 100644 --- a/sys/netgraph/ng_ipfw.c +++ b/sys/netgraph/ng_ipfw.c @@ -69,7 +69,7 @@ static ng_findhook_t ng_ipfw_findhook; static ng_rcvdata_t ng_ipfw_rcvdata; static ng_disconnect_t ng_ipfw_disconnect; -static hook_p ng_ipfw_findhook1(node_p, u_int16_t ); +static hook_p ng_ipfw_findhook1(node_p, uint32_t ); static int ng_ipfw_input(struct mbuf **, struct ip_fw_args *, bool); /* We have only one node */ @@ -94,7 +94,7 @@ MODULE_DEPEND(ng_ipfw, ipfw, 3, 3, 3); /* Information we store for each hook */ struct ng_ipfw_hook_priv { hook_p hook; - u_int16_t rulenum; + uint32_t cookie; }; typedef struct ng_ipfw_hook_priv *hpriv_p; @@ -152,7 +152,7 @@ static int ng_ipfw_newhook(node_p node, hook_p hook, const char *name) { hpriv_p hpriv; - u_int16_t rulenum; + uint32_t cookie; const char *cp; char *endptr; @@ -166,7 +166,7 @@ ng_ipfw_newhook(node_p node, hook_p hook, const char *name) return (EINVAL); /* Convert it to integer */ - rulenum = (u_int16_t)strtol(name, &endptr, 10); + cookie = (uint32_t)strtoul(name, &endptr, 10); if (*endptr != '\0') return (EINVAL); @@ -176,7 +176,7 @@ ng_ipfw_newhook(node_p node, hook_p hook, const char *name) return (ENOMEM); hpriv->hook = hook; - hpriv->rulenum = rulenum; + hpriv->cookie = cookie; NG_HOOK_SET_PRIVATE(hook, hpriv); @@ -198,10 +198,10 @@ ng_ipfw_connect(hook_p hook) static hook_p ng_ipfw_findhook(node_p node, const char *name) { - u_int16_t n; /* numeric representation of hook */ + uint32_t n; /* numeric representation of hook */ char *endptr; - n = (u_int16_t)strtol(name, &endptr, 10); + n = (uint32_t)strtoul(name, &endptr, 10); if (*endptr != '\0') return NULL; return ng_ipfw_findhook1(node, n); @@ -209,14 +209,14 @@ ng_ipfw_findhook(node_p node, const char *name) /* Look up hook by rule number */ static hook_p -ng_ipfw_findhook1(node_p node, u_int16_t rulenum) +ng_ipfw_findhook1(node_p node, uint32_t cookie) { hook_p hook; hpriv_p hpriv; LIST_FOREACH(hook, &node->nd_hooks, hk_hooks) { hpriv = NG_HOOK_PRIVATE(hook); - if (NG_HOOK_IS_VALID(hook) && (hpriv->rulenum == rulenum)) + if (NG_HOOK_IS_VALID(hook) && (hpriv->cookie == cookie)) return (hook); }