From nobody Mon Feb 14 23:04:20 2022 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 926C919C90AD; Mon, 14 Feb 2022 23:04:20 +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 4JyKY03cgyz3GqW; Mon, 14 Feb 2022 23:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644879860; 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=s1DjUQ6dtiejwWBXk5Lxrz46JeqVGB7/VT45q04XlA8=; b=rEdobm25ysDGop76RIsXFn7wdCSRX6XHWdPxMtGsuKk+FpeM67O+FPSDkn2rmmCZ/Y44rR jbXFPi519JMvvExieMDPtzbkteiPnuk6eHC6xABZdeGPQVKkpkOkbP0ohjQvkgBNO45MYZ Ws5lMl2K7OuFHW1+qMmTHaoTWsRZIStZbSUGslS6jjhEPPpGA4uNwlhYf1JusJI7eJ+NQs 0uWDhp5VHKwUbZ+ZpuFD6fWRJa0tGXre4L9t/tAVxvpQFpyIIqpbHFZAJpajP/8GS2CUeD 2TmCvl3NlXoec9CFG6ggiMNlVF6NdIWG+Y09rNcEncs1oJFy6phfvZikBJdq6Q== 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 5BBB7174C6; Mon, 14 Feb 2022 23:04:20 +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 21EN4K4n005649; Mon, 14 Feb 2022 23:04:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21EN4KUZ005648; Mon, 14 Feb 2022 23:04:20 GMT (envelope-from git) Date: Mon, 14 Feb 2022 23:04:20 GMT Message-Id: <202202142304.21EN4KUZ005648@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: 0143a6bb7f63 - main - pf: fix set_prio after nv conversion 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: 0143a6bb7f634c5984b34db1834313bdb47e6ccd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644879860; 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=s1DjUQ6dtiejwWBXk5Lxrz46JeqVGB7/VT45q04XlA8=; b=Bc71vIwau62Mz12V4rZJyAovi3FawuUV3HQC0cO5o9LJeOVOR3OK57HqSrZ27UeGUK2429 RQw8poJrSB5hfWrR51vfGZN2pTTuUhxxsxM9Oo1a9ILBrQrOdaGOz+RoxCJuygGgAPx3At 46xdsmSOaI039Ju8Nqin5EX3vcItl4PhzMzSJ5KllnA7gg4dr5fgFB1DnWS4PcWOS+3bYS EYJoqxRVdFp7g3ItnJnVeWg3VnfHkfmOaI1x8jg7lZoChRK4TsRB1YAP3NHDecxsNl+sod z2DyszFu3VHqQp/jCzveex1bhA/XstgoXaybdtNNaWtjwsqAwD9DbQ10P8v95A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644879860; a=rsa-sha256; cv=none; b=uCHprEwX98n85PDZx16mS5LxChh3JnnQVxE48pDK0nXx2XqWJBfBfiAHiyTH4w8qKVdFwW Sg2uNlK16DyG1ZU3COi0HX+sLefqimjgkg4GZi1OENdV4OnRNc5lP33vc68HGlzOofw0lQ 0kwENl/WSNpUMGxeQGTIBT1QiNTw2+/NnxR4gv1V+PQkHq8c/WNZjWz6pZVY/UHb3QZO5+ Lc89IgLlYDRkbxQcWnj+sTFqCe8ROgN7dxt5+MzKDKwQnZWzBRYao/t/nG7k2hJwjeFjHh xoLMchAmZUN+DoRlIiUMh30lN09j08AeiCsQ430K4uxAyqFIEiQz81+Bf71QlQ== 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=0143a6bb7f634c5984b34db1834313bdb47e6ccd commit 0143a6bb7f634c5984b34db1834313bdb47e6ccd Author: Franco Fichtner AuthorDate: 2022-02-14 19:26:39 +0000 Commit: Kristof Provost CommitDate: 2022-02-14 21:51:10 +0000 pf: fix set_prio after nv conversion Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D34266 --- sys/netpfil/pf/pf_nv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf_nv.c b/sys/netpfil/pf/pf_nv.c index b4b844c4edd5..f3a28bf770b1 100644 --- a/sys/netpfil/pf/pf_nv.c +++ b/sys/netpfil/pf/pf_nv.c @@ -626,7 +626,7 @@ pf_nvrule_to_krule(const nvlist_t *nvl, struct pf_krule *rule) PFNV_CHK(pf_nvuint8(nvl, "flush", &rule->flush)); PFNV_CHK(pf_nvuint8(nvl, "prio", &rule->prio)); - PFNV_CHK(pf_nvuint8_array(nvl, "set_prio", &rule->prio, 2, NULL)); + PFNV_CHK(pf_nvuint8_array(nvl, "set_prio", rule->set_prio, 2, NULL)); if (nvlist_exists_nvlist(nvl, "divert")) { const nvlist_t *nvldivert = nvlist_get_nvlist(nvl, "divert"); @@ -809,7 +809,7 @@ pf_krule_to_nvrule(struct pf_krule *rule) nvlist_add_number(nvl, "flush", rule->flush); nvlist_add_number(nvl, "prio", rule->prio); - pf_uint8_array_nv(nvl, "set_prio", &rule->prio, 2); + pf_uint8_array_nv(nvl, "set_prio", rule->set_prio, 2); tmp = pf_divert_to_nvdivert(rule); if (tmp == NULL)