From nobody Fri Jul 01 08:07:50 2022 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 590F78B7C94; Fri, 1 Jul 2022 08:07:51 +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 4LZ79M20vkz51Bb; Fri, 1 Jul 2022 08:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656662871; 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=O2Y3nYuhZFdBRN99Z7bFO/2WaTJ6zFja262kGJzowlk=; b=MpeZs6j0G52JPaFdagadmsXNIgFUO8FblrdCW8xIKTQpg/5T+NVb/OEbN7G81saoSewSdJ GTN5NNvjmuFvR/K7a3PVKRxDx3eA5wC92T+89v3hFrowbSxRS/HMWkI0LkMjKm8KFSFT9e qeDUJsHFB3IHpauXdyRaSc3r57YaHuzXwMl3OZal5eazUpwxYYZqaudXakro/hOsvw462Z nhzSN+q4ET6/+WwiwZfOV7qllbNVWQjzpZCJk5ZTgG4u/aJl+F7d6bmd245V95rxlSNP5p MJCnTeOQEHQaucMs7GyDNl46sGivkCJr0WopKZnoAgryVMXX3nXBP9CHQ+eITg== 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 20EC9178AF; Fri, 1 Jul 2022 08:07:51 +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 26187piA001303; Fri, 1 Jul 2022 08:07:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26187odC001302; Fri, 1 Jul 2022 08:07:50 GMT (envelope-from git) Date: Fri, 1 Jul 2022 08:07:50 GMT Message-Id: <202207010807.26187odC001302@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: 9f7c81eb337a - main - if_ovpn: deal with v4 mapped IPv6 addresses 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 9f7c81eb337a04f0416dee600ce7c550c33782bd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656662871; 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=O2Y3nYuhZFdBRN99Z7bFO/2WaTJ6zFja262kGJzowlk=; b=woVWL4Sh5FgFkaz98O/k2FJk1ZrDUOM5CnSHeTCaxlPIEmjLj2WJ9H0PYYNH4u6W7pVPnu d7XwzWUxC4ezKHrVm2hkFlbJsojujTHU22EgiPs1BQTPz3N/HX/I0Me7l2WE5unY4xYUuQ N2B2uGZ0kszNQduyASnU5alTb/OGg1eoHEOKeYK+FL/LhG/NU/yP2FklZgy7sPBGN28W9D pQPTKtXpFJwS6PM1ReHlNE2X3XlpPdnTXplq4Rg7HKSbHpmoqSXdanqFk70PjGjfXxvz07 FiR77TAyNd73Vms7hJD9eSbcHUg6qlXu725y68frNZla8e4UiUcWtvB1YVecRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656662871; a=rsa-sha256; cv=none; b=XSJ2yE5Wn60LozyF9yNX0PfLqVMD84cTU6HuXUAWSeZuks3bf0HwVgbk+rY/tzfdNZOq/j qft6yAVqqZtoOwXIW9/UDHraqk97lEI2E2cgI1WamVzFOtawWxg8AZSxJRjN7Y7zngNh2k cF7Zqzc8orDbsoCjHP5vOblc8ovVFVRsgG0tTAcg5RqRjSECY946sKrfEAVn9HnfjWaiRA XWKwJmMJDX7+NPVH2DYilEaQYktXv1spmcR7i3Dd1O55cPAB/qrHUTLC8mUS3NgjlOHDhY wIzH4Oe+9rERCEfCzaQGqRYdk3Ep+IhEKJfbHOe6aNi4z1VBaf8NxeWMDVNAcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9f7c81eb337a04f0416dee600ce7c550c33782bd commit 9f7c81eb337a04f0416dee600ce7c550c33782bd Author: Kristof Provost AuthorDate: 2022-06-30 15:28:15 +0000 Commit: Kristof Provost CommitDate: 2022-07-01 08:02:32 +0000 if_ovpn: deal with v4 mapped IPv6 addresses Openvpn defaults to binding to IPv6 sockets (with setsockopt(IPV6_V6ONLY=0)), which we didn't deal with. That resulted in us trying to in6_selectsrc_addr() on a v4 mapped v6 address, which does not work. Instead we translate the mapped address to v4 and treat it as an IPv4 address. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/if_ovpn.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index 33ccea02e099..87798c974442 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -531,6 +531,13 @@ ovpn_new_peer(struct ifnet *ifp, const nvlist_t *nvl) free(name, M_SONAME); name = NULL; + if (peer->local.ss_family == AF_INET6 && + IN6_IS_ADDR_V4MAPPED(&TO_IN6(&peer->remote)->sin6_addr)) { + /* V4 mapped address, so treat this as v4, not v6. */ + in6_sin6_2_sin_in_sock((struct sockaddr *)&peer->local); + in6_sin6_2_sin_in_sock((struct sockaddr *)&peer->remote); + } + #ifdef INET6 if (peer->local.ss_family == AF_INET6 && IN6_IS_ADDR_UNSPECIFIED(&TO_IN6(&peer->local)->sin6_addr)) {