From nobody Mon Apr 11 14:53:18 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 97F6F1AAB71E; Mon, 11 Apr 2022 14:53:19 +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 4KcX0b2NB8z3Qk6; 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=1649688799; 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=H+7Yxeuz6K8iiaQGPGBN0UdmFeb3mbxohqYZD7aL1fM=; b=OHz2XZ2Edlg+wHOcynfzfLzXt0nUDd3ExAIqt4ny98R40rTe4ErX9y+YGdq+A44oikhH9S fr2QS293R6gjKVYaubRp+4Ku8ikvpgw7geveVHUjnlCA5EwCM5/uZE7t/EB08SVNcLKLXy HbgYVtCJlnBI9JQNQlxiHo0H84rnZSnQDAwKUb2jKeCxxJv3a+0IJGOEKZShdw5sraMk6I O0GzdUnA1+9yFkenas36xqAnW1snDQmxXqefNlNnsxcWmUIOVegdxPH/IdGb4Q5X4Uvr87 qNXbU8MUUn0MuvjNlSHdNWr7TELXxQVEXUlK3oGAMtDeL+a8dVwIUwLWIO50gg== 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 1797A24D57; 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 23BErIMT023117; Mon, 11 Apr 2022 14:53:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23BErIA1023116; Mon, 11 Apr 2022 14:53:18 GMT (envelope-from git) Date: Mon, 11 Apr 2022 14:53:18 GMT Message-Id: <202204111453.23BErIA1023116@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 14c4c1d01ec2 - stable/13 - libpfctl: relocate implementations of pfr_add/get/set_addrs 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 14c4c1d01ec2ce4f5f82f7c6a6f874f3ad2493bd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649688799; 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=H+7Yxeuz6K8iiaQGPGBN0UdmFeb3mbxohqYZD7aL1fM=; b=GlKoG/GbkcHhLQVuwgVgBflbCrLOMZsRuuVn1v0NZkbvSu18MWHHhscAY2NOiaGna1ogPo EbWHDEcLq7elVs7iuuz92l0fHXaY1uk2rPJ5uGXP6kNEHKgkoLDxE0LQDqAjB9jy+QGHPW 2IwXnKQ0/YIaGTUNyj8GUSdBRn4AZBDdgAiKnVC+W2f8wK3ethmlpOAJrbMCFroVEM/A5n qQdvFUOMTkdVz1PmN/3WCthkIae3e5WH9KbvIB5cZrOA8oSJZ2VB4f4bE7pcxWffzfmGLs du0seeTKNacdbRLcThTi4a3lGVY7emMZHJ7pWDGF9BXk3uxha+4HYieARXLSfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649688799; a=rsa-sha256; cv=none; b=cOsmcYSHxUUfxk8qPTYu145a9vg9+pAFn/ToGXOI1bqo9Wh6ZCkW+3FXG1WunVjlpQY4gZ D+W1MEVkB9efUzhNVOzO0kVGZnBzW3H4b0reuJ36Meod+9aHEwuSTB1dtI59cvxSlZWWSq dwRjLiGN1vhtpJTHllSoqpvALn1oa0EFfrGdNKWHh0EJN4O9f6RV7eOE/c2V6HzhquekCJ 1otTm++9DTr+QVdxBTl7f0gY+Ss4GiHxqFLIE93YH0+ND5GeB1RNEAY8Tmqw0WP+KBBipO rgtJ0P3TPU62OwbTecqlQ5FnOrH8ljOTWRF0EsE+q6xG15pcIYpuErnGUAGSnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=14c4c1d01ec2ce4f5f82f7c6a6f874f3ad2493bd commit 14c4c1d01ec2ce4f5f82f7c6a6f874f3ad2493bd Author: Reid Linnemann AuthorDate: 2022-04-04 14:43:38 +0000 Commit: Kristof Provost CommitDate: 2022-04-11 14:52:34 +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 | 84 +++++++++--------------------------------- 3 files changed, 122 insertions(+), 68 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 218d0045a418..5d71a4e6ac89 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -211,24 +211,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; - 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)) { - pfr_report_error(tbl, &io, "add addresses in"); + ret = pfctl_table_add_addrs(dev, tbl, addr, size, nadd, flags); + if (ret) { + errno = ret; return (-1); } - if (nadd != NULL) - *nadd = io.pfrio_nadd; return (0); } @@ -236,24 +225,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)) { - pfr_report_error(tbl, &io, "delete addresses in"); - return (-1); - } - if (ndel != NULL) - *ndel = io.pfrio_ndel; return (0); } @@ -261,31 +239,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; - 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)) { - pfr_report_error(tbl, &io, "set addresses in"); + ret = pfctl_table_set_addrs(dev, tbl, addr, size, size2, nadd, ndel, + nchange, flags); + if (ret) { + errno = ret; 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); } @@ -293,24 +254,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)) { - pfr_report_error(tbl, &io, "get addresses from"); - return (-1); - } - *size = io.pfrio_size; return (0); }