From nobody Thu Jun 26 02:59:10 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 4bSNgf5jQyz5yvmZ; Thu, 26 Jun 2025 02:59:10 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bSNgf3QWBz3LqG; Thu, 26 Jun 2025 02:59:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750906750; 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=7gIQoeatCcsnrrp9/fr4D8uzNx5UKrgrhfsgeDBvz4o=; b=jxjVJ3Npgw0ntk3v/2s7rKvrJ6jdRGURZv1o7gRBZY4TOlf5CwS7HXlt1JsGSiFOJMu2sV XrLj3hGcs2VY8KXphX9df5hf2AXGySpiJ/M5p3BkLpFeo6gTFnhSAbNHi9n6E8zSwRURju X3trCusyNE0Xr1pNlbTvGZd8psIpqgk/ydnZYB7H840UFgLe2wFLRBNIdLWoRl8RAFzGHj lrIOlGAvUhJzGvE0ALYHjg9FuPxAGmmjmImkp+6Y5HNa58vBIX+9qJL1VGrqrqdoJvMrYY RejT1A0TyhiWDSjFUD2hK95llF2lL3baPgnLoKNdL2hcgQd6NngTmPGU5/lc0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750906750; 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=7gIQoeatCcsnrrp9/fr4D8uzNx5UKrgrhfsgeDBvz4o=; b=QMXxT3Bty2gIQTePZQ6L6z0syONEIu96E5ToTvBULU8vuuGiyTAWiK1TCjSEUaWQc+WF2l +hT01rfOE1gBlskUIoP7BeaBBDOPNd8I3Or9b915VkcWv2m6ixf0d6PEw16v8GrKYNq79h AwzmxHsTXEexjm292u666ORzCSvHUuu7fvUJgJYqOrJO7B5xhvhGQvqRInYH5yMkMAn29p YGCSAwVnnXiMWNJwvee8EtVGhooM/9XRE/OFuOzR6XI5lbpqw1YhaGX0NnRvrk3Hk7J7Kb rH3/HQigpPHoWPwYpYctnOWr1g9TavODmBkTd/hAOeHbgStyWhMmKajKw6XEpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750906750; a=rsa-sha256; cv=none; b=YcM3uKoJpLlKMeIfs5957zDefXTpzzpI7DxVG9iLErJd/y6L0K1Wv7Q8kU7xzUwpx6aRXa Sbk1RI3cJl55ABa7ytfKqCDM7CKASgDWlUBe9b53IKtWYM4l4Jifm0YnDbZLdumv2sgxTg YVBqJiH5XoGiVjrtjMByLqCFReFZcdN+e3cxPPA1KEnee1kALsCWPRIniCCFNnBxoF/Kif GLibYQT8BlwQUPurMAUi6E/aZgAqU1zRE9oL9oU2hJiiKk7JbntUNeXYC87cEQHVY/O8Je +U/c3n+sUo1RxeYo3Oyd/rARu9dTlbwZNMHApF4pmLZE2h30Cw9XkUOmPBj8aQ== 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 4bSNgf2tkvzlm5; Thu, 26 Jun 2025 02:59:10 +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 55Q2xAwv053025; Thu, 26 Jun 2025 02:59:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55Q2xAsd053022; Thu, 26 Jun 2025 02:59:10 GMT (envelope-from git) Date: Thu, 26 Jun 2025 02:59:10 GMT Message-Id: <202506260259.55Q2xAsd053022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: f6d9e22982a1 - main - wg: ipc: add allowed-ip flags support for FreeBSD 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6d9e22982a1d0354c0199e94ebdb4474eaa74b9 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f6d9e22982a1d0354c0199e94ebdb4474eaa74b9 commit f6d9e22982a1d0354c0199e94ebdb4474eaa74b9 Author: Kyle Evans AuthorDate: 2025-06-26 02:57:03 +0000 Commit: Kyle Evans CommitDate: 2025-06-26 02:58:25 +0000 wg: ipc: add allowed-ip flags support for FreeBSD For $reasons, we can't rely on flags in wireguard-tools for the kernel side of WireGuard. Provide a mapping function that uses flags from the kernel that we're building against and fail the operation if we made it to the end without turning some wg(8) flag off. Signed-off-by: Kyle Evans Reviewed by: ivy (previous version), Jason A. Donenfeld, jhb Differential Revision: https://reviews.freebsd.org/D50450 --- contrib/wireguard-tools/ipc-freebsd.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/contrib/wireguard-tools/ipc-freebsd.h b/contrib/wireguard-tools/ipc-freebsd.h index 58e5e71ce5cb..69077038a15a 100644 --- a/contrib/wireguard-tools/ipc-freebsd.h +++ b/contrib/wireguard-tools/ipc-freebsd.h @@ -307,11 +307,8 @@ static int kernel_set_device(struct wgdevice *dev) nvl_aips[j] = nvlist_create(0); if (!nvl_aips[j]) goto err_peer; - if (aip->flags) { - //TODO: implement me - ret = -EOPNOTSUPP; - goto err_peer; - } + if (aip->flags) + nvlist_add_number(nvl_aips[j], "flags", aip->flags); nvlist_add_number(nvl_aips[j], "cidr", aip->cidr); if (aip->family == AF_INET) nvlist_add_binary(nvl_aips[j], "ipv4", &aip->ip4, sizeof(aip->ip4));