From nobody Mon Apr 11 14:53:19 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 A52501AAB726;
	Mon, 11 Apr 2022 14:53: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 4KcX0b4z3Nz3Qf1;
	Mon, 11 Apr 2022 14:53:19 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1649688800;
	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=Tv2UFIBgm7IGEqFHzKa9lWgxouQQzZz7V3iq7K5c8pQ=;
	b=LDFQz/zedtBUI0B8YcH3zaMpP90i017TiEs62qEHH74Dy4RBrbgnZv91yr+A2N4Tgc1ADM
	z/7Gfx0wgPyBrUQjltJOF/EqnmnSS5Ei/ZFPYFCUIL8DsV5ChoEo7scNPgVOZGHbClI0+c
	9DJyupSMipws+OLYL6L73edF16VAT26xmEM4GsUcrYf76moG+gky7NHIHpXj5lIMj4RdZ4
	e04iWlpx9jC1jxNYG4Jcs1otp/OaUUtho4PbmO8HGlIOX+/dfw4nCbfl6VRPnPspxl0GoZ
	AiwKMu8b7D6Ql3HfilA1JChiCS/0bi5Se4q9pS0Dh84dEKbFLsF54JkkrFW/7Q==
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 68D3924D58;
	Mon, 11 Apr 2022 14:53:19 +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 23BErJOs023141;
	Mon, 11 Apr 2022 14:53:19 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23BErJSK023140;
	Mon, 11 Apr 2022 14:53:19 GMT
	(envelope-from git)
Date: Mon, 11 Apr 2022 14:53:19 GMT
Message-Id: <202204111453.23BErJSK023140@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: 1a5f7b44690a - stable/12 - libpfctl: relocate implementations of pfr_add/get/set_addrs
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
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/stable/12
X-Git-Reftype: branch
X-Git-Commit: 1a5f7b44690af620291a8e4110942ceebab585b0
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1649688800;
	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=Tv2UFIBgm7IGEqFHzKa9lWgxouQQzZz7V3iq7K5c8pQ=;
	b=Y28WJUAlrEx+0NNfJb4koyhm8nCwUxUp3iIsU+qIi4KFhR4wmyOidPECSbErebyWSDP0Bc
	0Y9GJiTDeq5ddhB8KuYQaezynQMFkRq1NJhikg0N4zcgdz98L4xTtLDMrWi1Ml0u49bELS
	zHf2+pmk/Wzkdxv1QMNLL9ki6hY4E+AscFN7EmH4GqDfnIjaPKRRsSbTmVpU7EG3ZBOGfp
	9YEv/O2dVOHO4uYhd7uRcpmrQoJ/aVTHl9edo5gJd9T4elhsFfXlhn1rQirJRmc6KL5ldG
	SyIG22Tuz0Xvp0YF6526V+wcwAfRDNcNIs0QkeDztNxw+0xepsnAq+pkE6RrtQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649688800; a=rsa-sha256; cv=none;
	b=ZQ4AUCwhsVATLWxwuM5r+DF+ZZuSm3HDPRwdTUQrGIN/t6z3dS8aABEo/yAFxG/6aRFwyX
	wIXSQatGbcxmC5gGRqJ3NJJnSiOe3+QTPSLgMfJTDurnZlUo0d+T/2HlJdQDjYjoPWET28
	w7m5rNVw8bWa/kB/3fDcSZ10y8LBcAeRU2xmcqQd+JLawPPD+die7uOlN3qX39vXCEkaKC
	A7W/ucNOVqHLWOrxDJj4dDmsRNNiktZ2H5E7DEGYvi96afYfSc8KZYUBOf+w4zbs+1x/q2
	tWGzn5wy5mDd1SrMzj7gUhvEDCJkR/LYaaZ0UOo/lQm/wg8kkdfpdI/FiENfnw==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
X-ThisMailContainsUnwantedMimeParts: N

The branch stable/12 has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=1a5f7b44690af620291a8e4110942ceebab585b0

commit 1a5f7b44690af620291a8e4110942ceebab585b0
Author:     Reid Linnemann <rlinnemann@netgate.com>
AuthorDate: 2022-04-04 14:43:38 +0000
Commit:     Kristof Provost <kp@FreeBSD.org>
CommitDate: 2022-04-11 14:52:52 +0000

    libpfctl: relocate implementations of pfr_add/get/set_addrs
    
    Reviewed by:    kp
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D34740
    
    (cherry picked from commit 4823489ab61dbaef4405cf03d2a48e77e593ce9c)
---
 lib/libpfctl/libpfctl.c  | 96 ++++++++++++++++++++++++++++++++++++++++++++++++
 lib/libpfctl/libpfctl.h  | 10 ++++-
 sbin/pfctl/pfctl_radix.c | 76 +++++++++-----------------------------
 3 files changed, 122 insertions(+), 60 deletions(-)

diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c
index 3a06600f396c..638f1de7a070 100644
--- a/lib/libpfctl/libpfctl.c
+++ b/lib/libpfctl/libpfctl.c
@@ -1127,3 +1127,99 @@ pfctl_get_syncookies(int dev, struct pfctl_syncookies *s)
 
 	return (0);
 }
+
+int
+pfctl_table_add_addrs(int dev, struct pfr_table *tbl, struct pfr_addr
+    *addr, int size, int *nadd, int flags)
+{
+	struct pfioc_table io;
+
+	if (tbl == NULL || size < 0 || (size && addr == NULL)) {
+		return (EINVAL);
+	}
+	bzero(&io, sizeof io);
+	io.pfrio_flags = flags;
+	io.pfrio_table = *tbl;
+	io.pfrio_buffer = addr;
+	io.pfrio_esize = sizeof(*addr);
+	io.pfrio_size = size;
+
+	if (ioctl(dev, DIOCRADDADDRS, &io))
+		return (errno);
+	if (nadd != NULL)
+		*nadd = io.pfrio_nadd;
+	return (0);
+}
+
+int
+pfctl_table_del_addrs(int dev, struct pfr_table *tbl, struct pfr_addr
+    *addr, int size, int *ndel, int flags)
+{
+	struct pfioc_table io;
+
+	if (tbl == NULL || size < 0 || (size && addr == NULL)) {
+		return (EINVAL);
+	}
+	bzero(&io, sizeof io);
+	io.pfrio_flags = flags;
+	io.pfrio_table = *tbl;
+	io.pfrio_buffer = addr;
+	io.pfrio_esize = sizeof(*addr);
+	io.pfrio_size = size;
+
+	if (ioctl(dev, DIOCRDELADDRS, &io))
+		return (errno);
+	if (ndel != NULL)
+		*ndel = io.pfrio_ndel;
+	return (0);
+}
+
+int
+pfctl_table_set_addrs(int dev, struct pfr_table *tbl, struct pfr_addr
+    *addr, int size, int *size2, int *nadd, int *ndel, int *nchange, int flags)
+{
+	struct pfioc_table io;
+
+	if (tbl == NULL || size < 0 || (size && addr == NULL)) {
+		return (EINVAL);
+	}
+	bzero(&io, sizeof io);
+	io.pfrio_flags = flags;
+	io.pfrio_table = *tbl;
+	io.pfrio_buffer = addr;
+	io.pfrio_esize = sizeof(*addr);
+	io.pfrio_size = size;
+	io.pfrio_size2 = (size2 != NULL) ? *size2 : 0;
+	if (ioctl(dev, DIOCRSETADDRS, &io))
+		return (-1);
+	if (nadd != NULL)
+		*nadd = io.pfrio_nadd;
+	if (ndel != NULL)
+		*ndel = io.pfrio_ndel;
+	if (nchange != NULL)
+		*nchange = io.pfrio_nchange;
+	if (size2 != NULL)
+		*size2 = io.pfrio_size2;
+	return (0);
+}
+
+int pfctl_table_get_addrs(int dev, struct pfr_table *tbl, struct pfr_addr *addr,
+    int *size, int flags)
+{
+	struct pfioc_table io;
+
+	if (tbl == NULL || size == NULL || *size < 0 ||
+	    (*size && addr == NULL)) {
+		return (EINVAL);
+	}
+	bzero(&io, sizeof io);
+	io.pfrio_flags = flags;
+	io.pfrio_table = *tbl;
+	io.pfrio_buffer = addr;
+	io.pfrio_esize = sizeof(*addr);
+	io.pfrio_size = *size;
+	if (ioctl(dev, DIOCRGETADDRS, &io))
+		return (-1);
+	*size = io.pfrio_size;
+	return (0);
+}
diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h
index 726ec89cd3d6..f9893566c2dd 100644
--- a/lib/libpfctl/libpfctl.h
+++ b/lib/libpfctl/libpfctl.h
@@ -315,5 +315,13 @@ int	pfctl_clear_rules(int dev, const char *anchorname);
 int	pfctl_clear_nat(int dev, const char *anchorname);
 int	pfctl_set_syncookies(int dev, const struct pfctl_syncookies *s);
 int	pfctl_get_syncookies(int dev, struct pfctl_syncookies *s);
-
+int	pfctl_table_add_addrs(int dev, struct pfr_table *tbl, struct pfr_addr
+	    *addr, int size, int *nadd, int flags);
+int	pfctl_table_del_addrs(int dev, struct pfr_table *tbl, struct pfr_addr
+	    *addr, int size, int *ndel, int flags);
+int     pfctl_table_set_addrs(int dev, struct pfr_table *tbl, struct pfr_addr
+	    *addr, int size, int *size2, int *nadd, int *ndel, int *nchange,
+	    int flags);
+int	pfctl_table_get_addrs(int dev, struct pfr_table *tbl, struct pfr_addr
+	    *addr, int *size, int flags);
 #endif
diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c
index 6b303c6211f5..f26382e9ef24 100644
--- a/sbin/pfctl/pfctl_radix.c
+++ b/sbin/pfctl/pfctl_radix.c
@@ -186,22 +186,13 @@ int
 pfr_add_addrs(struct pfr_table *tbl, struct pfr_addr *addr, int size,
     int *nadd, int flags)
 {
-	struct pfioc_table io;
+	int ret;
 
-	if (tbl == NULL || size < 0 || (size && addr == NULL)) {
-		errno = EINVAL;
+	ret = pfctl_table_add_addrs(dev, tbl, addr, size, nadd, flags);
+	if (ret) {
+		errno = ret;
 		return (-1);
 	}
-	bzero(&io, sizeof io);
-	io.pfrio_flags = flags;
-	io.pfrio_table = *tbl;
-	io.pfrio_buffer = addr;
-	io.pfrio_esize = sizeof(*addr);
-	io.pfrio_size = size;
-	if (ioctl(dev, DIOCRADDADDRS, &io))
-		return (-1);
-	if (nadd != NULL)
-		*nadd = io.pfrio_nadd;
 	return (0);
 }
 
@@ -209,22 +200,13 @@ int
 pfr_del_addrs(struct pfr_table *tbl, struct pfr_addr *addr, int size,
     int *ndel, int flags)
 {
-	struct pfioc_table io;
+	int ret;
 
-	if (tbl == NULL || size < 0 || (size && addr == NULL)) {
-		errno = EINVAL;
+	ret = pfctl_table_del_addrs(dev, tbl, addr, size, ndel, flags);
+	if (ret) {
+		errno = ret;
 		return (-1);
 	}
-	bzero(&io, sizeof io);
-	io.pfrio_flags = flags;
-	io.pfrio_table = *tbl;
-	io.pfrio_buffer = addr;
-	io.pfrio_esize = sizeof(*addr);
-	io.pfrio_size = size;
-	if (ioctl(dev, DIOCRDELADDRS, &io))
-		return (-1);
-	if (ndel != NULL)
-		*ndel = io.pfrio_ndel;
 	return (0);
 }
 
@@ -232,29 +214,14 @@ int
 pfr_set_addrs(struct pfr_table *tbl, struct pfr_addr *addr, int size,
     int *size2, int *nadd, int *ndel, int *nchange, int flags)
 {
-	struct pfioc_table io;
+	int ret;
 
-	if (tbl == NULL || size < 0 || (size && addr == NULL)) {
-		errno = EINVAL;
+	ret = pfctl_table_set_addrs(dev, tbl, addr, size, size2, nadd, ndel,
+	    nchange, flags);
+	if (ret) {
+		errno = ret;
 		return (-1);
 	}
-	bzero(&io, sizeof io);
-	io.pfrio_flags = flags;
-	io.pfrio_table = *tbl;
-	io.pfrio_buffer = addr;
-	io.pfrio_esize = sizeof(*addr);
-	io.pfrio_size = size;
-	io.pfrio_size2 = (size2 != NULL) ? *size2 : 0;
-	if (ioctl(dev, DIOCRSETADDRS, &io))
-		return (-1);
-	if (nadd != NULL)
-		*nadd = io.pfrio_nadd;
-	if (ndel != NULL)
-		*ndel = io.pfrio_ndel;
-	if (nchange != NULL)
-		*nchange = io.pfrio_nchange;
-	if (size2 != NULL)
-		*size2 = io.pfrio_size2;
 	return (0);
 }
 
@@ -262,22 +229,13 @@ int
 pfr_get_addrs(struct pfr_table *tbl, struct pfr_addr *addr, int *size,
     int flags)
 {
-	struct pfioc_table io;
+	int ret;
 
-	if (tbl == NULL || size == NULL || *size < 0 ||
-	    (*size && addr == NULL)) {
-		errno = EINVAL;
+	ret = pfctl_table_get_addrs(dev, tbl, addr, size, flags);
+	if (ret) {
+		errno = ret;
 		return (-1);
 	}
-	bzero(&io, sizeof io);
-	io.pfrio_flags = flags;
-	io.pfrio_table = *tbl;
-	io.pfrio_buffer = addr;
-	io.pfrio_esize = sizeof(*addr);
-	io.pfrio_size = *size;
-	if (ioctl(dev, DIOCRGETADDRS, &io))
-		return (-1);
-	*size = io.pfrio_size;
 	return (0);
 }