From nobody Thu May 8 13:10:45 2025 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 4ZtXYy3pfQz5wJct; Thu, 08 May 2025 13:10:46 +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 4ZtXYy23vxz3LxH; Thu, 08 May 2025 13:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746709846; 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=VwBcqIVU98hIpjJDVIuMAzOstU8CagtSJMnIR9di/Aw=; b=ZrhEs9KqpFA6c8Dhrayw6G7F8zie3RwIldvKVPgA0ZfV2oY01cMv6HpHHJdVgXdUBrdPJk TyJSqkJfLK4jet079+hl/KgRljyTt5hKrj25Ut3M73V9CJOUYNi9KIt8ne9n8Qre4UUV6Q YHxakkMxHt2nXo9LHdwP7C4Y6r90tdMKZUdjVyC43nyo0zBRhyDCX6VVmZYy3kMX13OFxw K7H9NOxfNaMeAcAzEc2gLS/8jWcxJ+8cgxaWsYlH6lsGD+XB2ACbMpHHlVPPSAAlcM7mEj uhg7p0tsHmnzxmrKTjNIGcSQSoBAwnwi6Y+P/nfsmuWa7dzpvO3tltqrjbDN0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746709846; 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=VwBcqIVU98hIpjJDVIuMAzOstU8CagtSJMnIR9di/Aw=; b=xAvOT37XEUoAhhkq/d3ec/+7CVZ9SPmzxYvIXhjuaL1fdDQyK00O+7haimQ99lM8suNhJt HcIPyGr9Iuns7uYGc+705oySrHa6HNBJ0gGD9VKClZmOgTtj3xoKiWFEDEt2iHI3P9PXg5 vn4NHgEMnKG5dAMYX3FiIuoM+39LKm13kc+5dumTWXGplMLJx4fA9di+E7DBEp5J0hkK50 uDDDaR6mhHnpGZHD1fA92noxifpoQ7KXUO7tJAPfcetrVfyICFpde3A4txpos1wsb5MMlm NtpdtB9dcZL0EtWRcXubXcj2+UOGR+EbC5MqbF1tq/8ZCioj8us2gwJ1AOOwFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746709846; a=rsa-sha256; cv=none; b=bH6Gu3RT2l9S6hixpXtS9ImuSY+WPiOyh5dlFdkfE0xgvxNtQbvs0ATQSg1O9hxdd3Wysf lAqqg6z2ffOQQCwr2XggVkpXa/c9tHIP3N7K2m70RXaC6H7ApHMBQrkfFv9CEZtYmh9uT2 aRqXxOfVEKatilJzCPlBAG1NU/qWpBbI+TIpwwuhpWuHgoFrY++8ce62yzZx4XWODEU8Zb I8KgMpqvyA31tdQIPTgG/lbHunEIT6LQsGShAfqQINwFvn+J8OiBdTF6pPgwQSYLkqIku0 SigCnYZks1sUZAHF5Df2SoyPJWgeO1MQYteNZFqUeuCZhPqpABPXIIGlrUUtzQ== 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 4ZtXYy0jZfz1H7; Thu, 08 May 2025 13:10:46 +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 548DAj08047242; Thu, 8 May 2025 13:10:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548DAjam047239; Thu, 8 May 2025 13:10:45 GMT (envelope-from git) Date: Thu, 8 May 2025 13:10:45 GMT Message-Id: <202505081310.548DAjam047239@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: 1f8b1a3fac5f - main - authpf: use libpfctl to add or remove addresses to/from a table 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 1f8b1a3fac5f7fd28bd2eb09a13272774d2b6899 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1f8b1a3fac5f7fd28bd2eb09a13272774d2b6899 commit 1f8b1a3fac5f7fd28bd2eb09a13272774d2b6899 Author: Kristof Provost AuthorDate: 2025-05-07 09:08:41 +0000 Commit: Kristof Provost CommitDate: 2025-05-08 13:10:25 +0000 authpf: use libpfctl to add or remove addresses to/from a table Sponsored by: Rubicon Communications, LLC ("Netgate") --- contrib/pf/authpf/authpf.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/contrib/pf/authpf/authpf.c b/contrib/pf/authpf/authpf.c index fcf9812cdcca..73cc9a7dc657 100644 --- a/contrib/pf/authpf/authpf.c +++ b/contrib/pf/authpf/authpf.c @@ -842,15 +842,11 @@ error: static int change_table(int add, const char *ip_src) { - struct pfioc_table io; + struct pfr_table tbl = { 0 }; struct pfr_addr addr; + int ret; - bzero(&io, sizeof(io)); - strlcpy(io.pfrio_table.pfrt_name, tablename, - sizeof(io.pfrio_table.pfrt_name)); - io.pfrio_buffer = &addr; - io.pfrio_esize = sizeof(addr); - io.pfrio_size = 1; + strlcpy(tbl.pfrt_name, tablename, sizeof(tbl.pfrt_name)); bzero(&addr, sizeof(addr)); if (ip_src == NULL || !ip_src[0]) @@ -866,11 +862,16 @@ change_table(int add, const char *ip_src) return (-1); } - if (ioctl(pfctl_fd(pfh), add ? DIOCRADDADDRS : DIOCRDELADDRS, &io) && - errno != ESRCH) { + if (add) + ret = pfctl_table_add_addrs(pfctl_fd(pfh), &tbl, &addr, 1, NULL, 0); + else + ret = pfctl_table_del_addrs(pfctl_fd(pfh), &tbl, &addr, 1, NULL, 0); + + + if (ret != 0 && ret != ESRCH) { syslog(LOG_ERR, "cannot %s %s from table %s: %s", add ? "add" : "remove", ip_src, tablename, - strerror(errno)); + strerror(ret)); return (-1); } return (0);