From nobody Wed May 17 16:02:04 2023 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 4QLyXs0WCcz4BJ1k; Wed, 17 May 2023 16:02:05 +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 4QLyXr6DcSz3tPs; Wed, 17 May 2023 16:02:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684339324; 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=uFtORkzT9sOCtUszMTXpR0rUvBdQ+rFonily+7HHFhU=; b=SpVTdD6LoHOdw1KoSTVA0VgFYKYZKPsRUckB5ey+r6hLj4JOEYfS3pnMTpiwckGDbTc8qM fphRF/19hqOVzqJ5tINvrC3ICocUZQgbBbE83mj8utOlzeDF/ovGcWzkH0NYbiIUtLKMs4 i6FzZV0OtVFju1PVUaG6C77RTMTrNVU/4z4UU9WokwMebZ0aRPblc5zyemSxKwqWwcWLQ4 4Lf/zQ296KyUCH0Y59xJNeqlKoHOcYkvgwE6leTxGVtzSA2S1ImszCtvVty6g5LUUQb2qE gBC0eS3J8c+eKGX+rkvG3thOQLryAm0VPqKxi2v837868LIGLNGrqxV9W1zYkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684339324; 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=uFtORkzT9sOCtUszMTXpR0rUvBdQ+rFonily+7HHFhU=; b=O9FzcCETEEaVjuXONEfvXo7MDVAxxxVIZjU/0DVdODIMtYKbSVdmlKM6QlWCO4IMXhZStB UMK3ORyzWqGNVVP3xZd+2OEh2cSQSupM+rBootGLcCygD8DkOgK5NB/0TEgdonLf+txssO IBTFHsqdlLhJBeRAc4+2dLBdrTjAUI46M0JJq4I7JbuD59VX2qqvnu6Yh0Hricyc5DQix0 1RUCYMHnG+GHYIP+4qdXXiWbEwriMhl5b/6ehejkyupfiHWFOV17cP1RWiVMyQIB3JBWEI LixPL/vTHjIBj2yWezygFELabOmXwBdRn8bZ+Owe5HxHmveoUFsjxPgwl4l5Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684339324; a=rsa-sha256; cv=none; b=EiM4W12sAru4kkbplTmsWlUs01BI62FbLm1mYHGgWbo1VS0uZ4kKld6ByMBO1QbUf1Sl8+ FZTg+HMe7zkCujsUoPLCgny/bGnQtMomyjT9C3pEpS00kPoyxBaoB141P0rwVBgSKasQ1N 9ro/+vq7SrCZ8315i1HsSSRoehdNUwstLBxvbr9DzCjqcCh66THpLvOFPJJ9k0ioeJ5pzV hYcYdcpdWgToTPRVhtRuwutNP8q5SRsn+byim5hD3N1HbeQVxyNOHHvfIfinnQwSCMwb1o EuWBykUL3NTdiR7RKiTB6Vq/486VzYRESOJs/8sCTkfkc5y935QZNUFDOCgHjA== 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 4QLyXr5JGdz19Q2; Wed, 17 May 2023 16:02:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34HG24fF049319; Wed, 17 May 2023 16:02:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34HG244L049318; Wed, 17 May 2023 16:02:04 GMT (envelope-from git) Date: Wed, 17 May 2023 16:02:04 GMT Message-Id: <202305171602.34HG244L049318@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: 8c23afdb574e - main - pf: Standardize rtableid 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 8c23afdb574ecd78e775fc889867f272559b4c32 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8c23afdb574ecd78e775fc889867f272559b4c32 commit 8c23afdb574ecd78e775fc889867f272559b4c32 Author: Kajetan Staszkiewicz AuthorDate: 2023-05-17 13:57:42 +0000 Commit: Kristof Provost CommitDate: 2023-05-17 13:57:42 +0000 pf: Standardize rtableid Prepare for rtableid being included in struct pfsync_state where it will be int32_t. Make variables which will be set to and from it the same width. Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D40013 --- sys/net/pfvar.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index b9b7640788d1..e3e467500b94 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -631,7 +631,7 @@ struct pf_kpool { }; struct pf_rule_actions { - int rtableid; + int32_t rtableid; uint16_t qid; uint16_t pqid; uint16_t max_mss; @@ -779,7 +779,7 @@ struct pf_krule { pf_osfp_t os_fingerprint; - int rtableid; + int32_t rtableid; u_int32_t timeout[PFTM_MAX]; u_int32_t max_states; u_int32_t max_src_nodes; @@ -1053,7 +1053,7 @@ struct pf_kstate { u_int16_t dnrpipe; u_int16_t tag; u_int8_t log; - int rtableid; + int32_t rtableid; u_int8_t min_ttl; u_int8_t set_tos; u_int16_t max_mss;