From nobody Mon Jan 31 18:13:40 2022 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 DABF419816A6; Mon, 31 Jan 2022 18:13:40 +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 4Jnbm45VJwz4m1J; Mon, 31 Jan 2022 18:13:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643652820; 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=rDygg6v2SK0QhOss6k131j/2T5eBXF39ZtebwfNvCH8=; b=Qs0+J6XvL3Mhb4ReLu8ASRp+Kew0ixDe3p41Qjj0oGi/eGNwXIGJoKDQzmXCXhWQst4tyM 2m9n3URHTFOX/xBHyshjFLlge/fTFO9T5HwcbIi7iTmoPqC0xT1rynTmnNzyHLjMdJG1/d V7NKINboEawU+AZM2/QwqZU2RgTRtYahTylHTi0Y8CQS5T5LOMMNm4oZHaCVYw6yQp+Yny Fqyv574A++DJKtNsAUcYmnPPRIU3XytYzO710jgAzU7C/Xj8VYxsKcmOdBldnN9r8EycXH rRGauTeMVbFuNO7DOnwalHD4XBJlYGqUOWLI9Ff+LOOMIF5wy+jEu/dfWSfMVQ== 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 9C58C211B2; Mon, 31 Jan 2022 18:13:40 +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 20VIDeAL049979; Mon, 31 Jan 2022 18:13:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20VIDeP4049978; Mon, 31 Jan 2022 18:13:40 GMT (envelope-from git) Date: Mon, 31 Jan 2022 18:13:40 GMT Message-Id: <202201311813.20VIDeP4049978@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: 6f47a72d8ebf - main - libpfctl: fix pfctl_kill_states() 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: 6f47a72d8ebf444641bda192b33eb217c9013811 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643652820; 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=rDygg6v2SK0QhOss6k131j/2T5eBXF39ZtebwfNvCH8=; b=gGCXgugKD+a99BaTXeNTmtNohSlUcoafZjgGCF7U7w+moaeFpqlRXeeMjFgyuvrVbrps59 +DBbtNCdFryMBt2DB5wbzG2n859OSYEFAH6zPArVVZi0tLZN0og0nYURhTT199Lrh2zjQt 3aLLm4iFv0bQwJC1+I9dD10Tv3o4diiyfscLNdYxNxLKEr2+Vc99e70B2zpwB8hVfRxIjP Gr6is3ptw4nRL37eZFNajWq+sPUZHuhb4M3Fv3BJcvg1BzR+zSGjqRF+J6HkwJJm/M+o4y QhtSAprcS4NMwRyTbyJhgGw9Jip0I+MZqzZqXNnwATxidZpLTOw2Gc4PystcaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643652820; a=rsa-sha256; cv=none; b=DvMxMNsHgQHdEatzWHBwtLAlvDxNuUhME7UFHka4lg8GkeR6NT6aQIkZYckVBwEulmsWPY xBspD0jWyhM0hW/Zyb7ooahvjswEPB8b/zcuSI1Dax1FxYyLArwlCou5UF6OWWBHh2zYdm nTsEOhwz7V3EYJ/Jogstr2cpXTXcKLTBa/cW04JgN6bsOmp/xT9Qwb6GLVFNnnPqydvxuY GwLtwMRdTat3chtcXa7kb/fmZlGzOoFkKji7WIfjSHprnUuo2eZj4tbxTa2t7YxABDz0Qu m7U6i89ImdSBrQFf1QFjBQTyVtRSAiJ4JhyTlF2pXu45jzHxWVfMbfS5pn9a2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6f47a72d8ebf444641bda192b33eb217c9013811 commit 6f47a72d8ebf444641bda192b33eb217c9013811 Author: Kristof Provost AuthorDate: 2022-01-31 17:31:53 +0000 Commit: Kristof Provost CommitDate: 2022-01-31 18:13:26 +0000 libpfctl: fix pfctl_kill_states() 735748f30a changed the output of the states so that the creator id endianness would be consistent. This means that we need to convert the host endianness creatorid back to big-endian before we give it to the kernel. MFC after: 3 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 58bae146cf6a..66f7f61cc1fa 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -764,7 +764,7 @@ pfctl_nv_add_state_cmp(nvlist_t *nvl, const char *name, nv = nvlist_create(0); nvlist_add_number(nv, "id", cmp->id); - nvlist_add_number(nv, "creatorid", cmp->creatorid); + nvlist_add_number(nv, "creatorid", htonl(cmp->creatorid)); nvlist_add_number(nv, "direction", cmp->direction); nvlist_add_nvlist(nvl, name, nv);