From nobody Mon Feb 10 11:10:13 2025 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 4Ys21168b3z5nktj; Mon, 10 Feb 2025 11:10:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys2114TGvz3d2m; Mon, 10 Feb 2025 11:10:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739185813; 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=S7FZ88n+a64Xa8M9RiXx2yi6TEpS3UKZ94gySWG91R4=; b=MoMOHcAOf4oneomUMZcjn94amqIjecFhw7NdDDug6DTZq4NqZy0lb4p4qZnIlX6nCzPko4 W04QU4vTKfR4jo5vXRaw4q1EKUQXOdxJIcnJ1IgHG1uh7bRJLO2Q9CoMi62kqNcQYQpJT7 Q+n067mlYQ/x0vp67Pg2fnBNd1Xa06S9H51mWJXHeq5tPZHBj4d2BMN8JVjFxmXdyY+BzL uzjsZacEdBouAtZhX09UCFlurhijejzWDn3I48qDWz1QOm9Vkm0sabwF/cbkVgGizLmAzG lhvwr0ON1HcwQ1kgqtJFbF7qF0k2eWgEc0GLQkE5LCW3NND1DtUlHQBIzEs7GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739185813; 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=S7FZ88n+a64Xa8M9RiXx2yi6TEpS3UKZ94gySWG91R4=; b=Tegz0K2C2FkDA+p4RibnjhljIlQ0FC7XK0fnaVwIRNcsle6lNwuTqMWhepi3u1Xzp2jFz4 voqRPF+AcJIZTaxeQVaWfJq/G/xKTeW7m5hOLLWkD8zmbx/MvM37TotpF6BkkADMmyTzPC EviwSWg452Gmp+dmOM1eYaJ1ZZBLm2zkHSdh3dzxvjXrGI/ulfKW/vUu0Bscoh8T1W/Ryi CMD8MyMkeCwT/CPW5MDTxJJ34RMJei/HzLNIIvQ4NBgTTB1hbWrOJQh2N2eHbp3FzrDYjg xbbJm06t/L0Svsq1+KnJgwr9KPlvaNnVmI5gHOp+eIfPNBy8eBgiYkG7Jjie3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739185813; a=rsa-sha256; cv=none; b=hIOmc1SL2Sxl0BBHPVuwLdqWHUpHAHsG9MGCqfatb5VDd1sk5P3GahBpU5KeKbk8UbEA5Q vLAFMx76bV1Jk9XONOG4XD4OVrGqOwwSiKFgjJvuHHLvQjvcakiccVNJnMr9Ha6iS05oKT 3+zfoM3qaxzIKPEt6JnDmLO2bcXnVmxAdJy5bQn4Z7FZLhtsNxNbwgVh4Dmi2LCTDU+twy mnlP0v0H5wXlJAOQKH1p7TtfSn9J+iHOX9zegZq52aDQQUfoudEf0awj76dN7wc8W9CkSJ HVwTHZ3Y6YLT5PjyIEzWVm7OE49zbahXwYjgSjXO+SbPA7aiQK+MlaoIuFQnrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ys21142cBz8K9; Mon, 10 Feb 2025 11:10:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51ABADqt005568; Mon, 10 Feb 2025 11:10:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51ABADD1005560; Mon, 10 Feb 2025 11:10:13 GMT (envelope-from git) Date: Mon, 10 Feb 2025 11:10:13 GMT Message-Id: <202502101110.51ABADD1005560@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: 2c96c9b053c7 - main - pfctl: simplify pfr_del_tables() to pfr_del_table() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 2c96c9b053c7db6c7c09fb1ba908c0026f58c864 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2c96c9b053c7db6c7c09fb1ba908c0026f58c864 commit 2c96c9b053c7db6c7c09fb1ba908c0026f58c864 Author: Kristof Provost AuthorDate: 2025-02-07 17:22:44 +0000 Commit: Kristof Provost CommitDate: 2025-02-10 11:09:47 +0000 pfctl: simplify pfr_del_tables() to pfr_del_table() We only ever delete a single table at a time, so remove the size argument. This will make subsequent conversion to netlink easier. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.h | 2 +- sbin/pfctl/pfctl_radix.c | 8 ++------ sbin/pfctl/pfctl_table.c | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/sbin/pfctl/pfctl.h b/sbin/pfctl/pfctl.h index 36dcd73ce57d..ffd37cf023a6 100644 --- a/sbin/pfctl/pfctl.h +++ b/sbin/pfctl/pfctl.h @@ -57,7 +57,7 @@ struct pfr_buffer { int pfr_get_fd(void); int pfr_add_table(struct pfr_table *, int *, int); -int pfr_del_tables(struct pfr_table *, int, int *, int); +int pfr_del_table(struct pfr_table *, int *, int); int pfr_get_tables(struct pfr_table *, struct pfr_table *, int *, int); int pfr_get_tstats(struct pfr_table *, struct pfr_tstats *, int *, int); int pfr_clr_tstats(struct pfr_table *, int, int *, int); diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 7cb9b6faa0d9..451b83371d05 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -80,19 +80,15 @@ pfr_add_table(struct pfr_table *tbl, int *nadd, int flags) } int -pfr_del_tables(struct pfr_table *tbl, int size, int *ndel, int flags) +pfr_del_table(struct pfr_table *tbl, int *ndel, int flags) { struct pfioc_table io; - if (size < 0 || (size && tbl == NULL)) { - errno = EINVAL; - return (-1); - } bzero(&io, sizeof io); io.pfrio_flags = flags; io.pfrio_buffer = tbl; io.pfrio_esize = sizeof(*tbl); - io.pfrio_size = size; + io.pfrio_size = 1; if (ioctl(dev, DIOCRDELTABLES, &io)) { pfr_report_error(tbl, &io, "delete table"); return (-1); diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c index 4ef4dd69309a..7137f42b13e8 100644 --- a/sbin/pfctl/pfctl_table.c +++ b/sbin/pfctl/pfctl_table.c @@ -189,7 +189,7 @@ pfctl_table(int argc, char *argv[], char *tname, const char *command, } else if (!strcmp(command, "kill")) { if (argc || file != NULL) usage(); - RVTEST(pfr_del_tables(&table, 1, &ndel, flags)); + RVTEST(pfr_del_table(&table, &ndel, flags)); xprintf(opts, "%d table deleted", ndel); } else if (!strcmp(command, "flush")) { if (argc || file != NULL)