From nobody Thu Jun 26 02:59:08 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 4bSNgc3s8Tz5yvtC; Thu, 26 Jun 2025 02:59:08 +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 4bSNgc2F09z3LZc; Thu, 26 Jun 2025 02:59:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750906748; 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=WY+37CmO59rJbVl/mgVsOEIHQpMiAkMtYYeNFtQQbak=; b=K6U1qqE+yAGwA7y3X+Gd23NDoXVvf28TrlKt1q8BdTmCgRaSOFcC0svc1W9Nx0p7L32MHD 7s8nlJ9kfBx4H67L+Hres0A0FA/3Ci+V2o5qfp68Jozh+A81EEOfXWNfum/daysSUITpX2 RzNmReWRKLmoTdcWAwdJU7ZLy2+yCQjG6ubHE8nH2J5XaHGJOyRGkOebv0rx4KGWx6U0vQ VjvcwJFx+vE7PTCfGENm0QfcVm4VryJMHYUoVH1+mTh5jhZZy5YF8nwphZr7H+5TlaZQud BjPolroMKPHfLsT0BNXBACz9abnV+i4C6T+eoitiw7ZqBZ/6mApEIas+Zl6Veg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750906748; 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=WY+37CmO59rJbVl/mgVsOEIHQpMiAkMtYYeNFtQQbak=; b=vJ3X9W7dUILxHa159F2IyOaTCeYejt5Mdln8H2IlzbQfzNNFe/yI4dSPtA7KaPwNJ/nbf+ 5Sqjo5AfM8e63N22Ujob5YAfZ4wqAkjab6i4niIk7Y6BfipTiZFRkOCWicizIiHaFNqva6 HM/GiJTP7Tq/M0Do1hMw9Vz5d1ci9n7iiUG74oGdINo6efckaY355MtOqtTa5aGTSLCiJD ZUvGGu8+ZBoMMtWiuBtZwOquSRLmKQsiAqSdMlOa/oPpXKYUtubAiadXgLBqfyWpJ1BO7Z kjBB5ABVjLWyqgD7m+Us4eURru7UlGGlTwBZ0eXa1IKsdMg/Nz/zqmudRZo/qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750906748; a=rsa-sha256; cv=none; b=ncCr5KZf2kQyJ5COQGr15Mlxhrgj0CHAqQ1G3YiwtN+I//sAOAkNvjzI39NWmXx92/zN39 J7e9DXp7L3vS7w61vF4IJMhh8+EcDdRJD6GCAcYz9+KCGqRF+hUYMs9P1MPTgeKL4+sYdl rewEC7IrRy6eYWEeALrT5spY0+7g4qAt39T46wIcgUdF4AJ9BdreevACdK4cDvsV3hHWfl 4Jily40S5L5y0eypAhjHsDgmg4HvlFJ8YyxFVm5C1uZs78OSx4lJKQyP+aI9OLg+zMojCl Nl7s6Yo6vEoT76Gl0v0DdieNbclrKuKu4H/dM0xeZ1ov8MJ1otwEbKCkPZRHlQ== 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 4bSNgc1rMRzktN; Thu, 26 Jun 2025 02:59:08 +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 55Q2x8he052953; Thu, 26 Jun 2025 02:59:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55Q2x8cv052950; Thu, 26 Jun 2025 02:59:08 GMT (envelope-from git) Date: Thu, 26 Jun 2025 02:59:08 GMT Message-Id: <202506260259.55Q2x8cv052950@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: 2475a3dab0d5 - main - kern: wg: split address/mask construction out of wg_aip_add() 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: 2475a3dab0d5c5614e303c0022a834f725e2a078 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2475a3dab0d5c5614e303c0022a834f725e2a078 commit 2475a3dab0d5c5614e303c0022a834f725e2a078 Author: Kyle Evans AuthorDate: 2025-06-26 02:57:02 +0000 Commit: Kyle Evans CommitDate: 2025-06-26 02:57:02 +0000 kern: wg: split address/mask construction out of wg_aip_add() We'll re-use these in a future wg_aip_del() to perfectly reconstruct what we expect to find in a_addr/a_mask. Reviewed by: ivy, markj (both earlier version), Aaron LI, jhb Differential Revision: https://reviews.freebsd.org/D50447 --- sys/dev/wg/if_wg.c | 63 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 23 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index ce12d623be6f..78e02da92333 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -312,7 +312,8 @@ static void wg_timers_run_send_keepalive(void *); static void wg_timers_run_new_handshake(void *); static void wg_timers_run_zero_key_material(void *); static void wg_timers_run_persistent_keepalive(void *); -static int wg_aip_add(struct wg_softc *, struct wg_peer *, sa_family_t, const void *, uint8_t); +static int wg_aip_add(struct wg_softc *, struct wg_peer *, sa_family_t, + const void *, uint8_t); static struct wg_peer *wg_aip_lookup(struct wg_softc *, sa_family_t, void *); static void wg_aip_remove_all(struct wg_softc *, struct wg_peer *); static struct wg_peer *wg_peer_create(struct wg_softc *, @@ -526,46 +527,62 @@ wg_peer_get_endpoint(struct wg_peer *peer, struct wg_endpoint *e) rw_runlock(&peer->p_endpoint_lock); } -/* Allowed IP */ static int -wg_aip_add(struct wg_softc *sc, struct wg_peer *peer, sa_family_t af, const void *addr, uint8_t cidr) +wg_aip_addrinfo(struct wg_aip *aip, const void *baddr, uint8_t cidr) { - struct radix_node_head *root; - struct radix_node *node; - struct wg_aip *aip; - int ret = 0; - - aip = malloc(sizeof(*aip), M_WG, M_WAITOK | M_ZERO); - aip->a_peer = peer; - aip->a_af = af; + struct aip_addr *addr, *mask; - switch (af) { + addr = &aip->a_addr; + mask = &aip->a_mask; + switch (aip->a_af) { #ifdef INET case AF_INET: if (cidr > 32) cidr = 32; - root = sc->sc_aip4; - aip->a_addr.in = *(const struct in_addr *)addr; - aip->a_mask.ip = htonl(~((1LL << (32 - cidr)) - 1) & 0xffffffff); - aip->a_addr.ip &= aip->a_mask.ip; - aip->a_addr.length = aip->a_mask.length = offsetof(struct aip_addr, in) + sizeof(struct in_addr); + addr->in = *(const struct in_addr *)baddr; + mask->ip = htonl(~((1LL << (32 - cidr)) - 1) & 0xffffffff); + addr->ip &= mask->ip; + addr->length = mask->length = offsetof(struct aip_addr, in) + sizeof(struct in_addr); break; #endif #ifdef INET6 case AF_INET6: if (cidr > 128) cidr = 128; - root = sc->sc_aip6; - aip->a_addr.in6 = *(const struct in6_addr *)addr; - in6_prefixlen2mask(&aip->a_mask.in6, cidr); + addr->in6 = *(const struct in6_addr *)baddr; + in6_prefixlen2mask(&mask->in6, cidr); for (int i = 0; i < 4; i++) - aip->a_addr.ip6[i] &= aip->a_mask.ip6[i]; - aip->a_addr.length = aip->a_mask.length = offsetof(struct aip_addr, in6) + sizeof(struct in6_addr); + addr->ip6[i] &= mask->ip6[i]; + addr->length = mask->length = offsetof(struct aip_addr, in6) + sizeof(struct in6_addr); break; #endif default: - free(aip, M_WG); return (EAFNOSUPPORT); } + return (0); +} + +/* Allowed IP */ +static int +wg_aip_add(struct wg_softc *sc, struct wg_peer *peer, sa_family_t af, + const void *baddr, uint8_t cidr) +{ + struct radix_node_head *root = NULL; + struct radix_node *node; + struct wg_aip *aip; + int ret = 0; + + aip = malloc(sizeof(*aip), M_WG, M_WAITOK | M_ZERO); + aip->a_peer = peer; + aip->a_af = af; + + ret = wg_aip_addrinfo(aip, baddr, cidr); + if (ret != 0) { + free(aip, M_WG); + return (ret); + } + + root = af == AF_INET ? sc->sc_aip4 : sc->sc_aip6; + MPASS(root != NULL); RADIX_NODE_HEAD_LOCK(root); node = root->rnh_addaddr(&aip->a_addr, &aip->a_mask, &root->rh, aip->a_nodes); if (node == aip->a_nodes) {