From patchwork Thu May 18 11:00:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 3226 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:7b9a:b0:c3:1364:a2a2 with SMTP id j26csp277044dyk; Thu, 18 May 2023 04:01:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6XAQSwxYlElDajD3fxYj8nhMd6BPiG6hkmoOSAT3Kshc3SksXCoXQFGKkIkZThLdRkqMxY X-Received: by 2002:a5e:8f4c:0:b0:76c:7953:eb7e with SMTP id x12-20020a5e8f4c000000b0076c7953eb7emr6864156iop.1.1684407715717; Thu, 18 May 2023 04:01:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684407715; cv=none; d=google.com; s=arc-20160816; b=RdoK4ew46AsZzQG2WwHEU36md2/qy8X4tyHunHbXMy3uPqvvwr7BkbXy3SY2HftoGS vPppBIXQ92UUhzkBBDY569flM6LJcJTqn1kKr3+SGdlG5o0wwqK9MRJq4+d6vFC5+W6O IM6zNNTXE6NtPi4grMBj81e3qEPSzGeeeoBF5xTmn3ttAjc/09O6qyJc1LxKZo+v44Li sOKKNTO8lzM7EmjFG2M/LNpRv1G+QFzvAzNG1QCer0+kNeF+wSI1D2ibKOF4AOBn13nw 0flz+hMiuP4RRamG4UKmQJKY1cxg1YPPHXKfBguV0z3azedziVe6KJrHDhwzMmcWfhY1 bz1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:cc:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:dkim-signature :dkim-signature; bh=qjElO7UxmG+xg1+UbAGsK8Uzk6mJn89zs7bSCAQjU5M=; b=n9x4uxFNrsoE45fLLkXeJ3Iwikq7K0s1+wlGs8BmXXssuPP48DpLS4UzKkE7d8vcl4 OMGmSh3ARLXG4MVSPPSceU/U5GFXK+q7061ykgJm7P/3Mx0+UN4l1IyylFMVtsr6yRBB JRLfhGjKO/DqM6+Lawj+10MIVWn6bUoe4EixBumlr8aqwtClbaOzu2QYysKtWqZI0Q4J Pq6nOp+AONVoJ8uYZnMDbFHItxTbBAh3wQ5yZcmBELmKXl/WfupfgEsfTGXkhStA5UwJ 5kM1rPIOf74q3/30g25U6BlrpAdsDgM0a3/FvIOoqV1kopGoatU4owUvZgu+GcoE1o7g GAwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=mKRKbnTK; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=kF9wNjvP; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=aNSWQ+z4; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id b5-20020a029145000000b004167d8582eesi682558jag.16.2023.05.18.04.01.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 May 2023 04:01:55 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=mKRKbnTK; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=kF9wNjvP; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=aNSWQ+z4; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pzbNm-0001nr-KG; Thu, 18 May 2023 11:01:19 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pzbNl-0001nb-B1 for openvpn-devel@lists.sourceforge.net; Thu, 18 May 2023 11:01:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=fPJDADgGzy78lctciocVO0OptWHeqgkLW+LY5Ol6G64=; b=mKRKbnTKulkbAn3RH2HP9p0SJS IPq4adRzlcNkvE1YYBiigQ0fBD3xk7gDUxnR+3bTb9UQjvlzrYCfP1a4ksSIK+q+B2QQ22YHC/u+o v+xqd5dSV3iF9dcKH82Qto18cDQMH7Dm56XWKKp6OHX3NV/TQzhgJEcQbaqYCXzqzE7M=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=fPJDADgGzy78lctciocVO0OptWHeqgkLW+LY5Ol6G64=; b=k F9wNjvPhTMIrisAsPpQ7IHL79J5zNxHieHFw1p6ikkbEdA0cWEggSdPq6Zt6DAwvfBPjDLLOc00XM ejFn4ONhqLMJ+wymR1u/ClUJb6YZopyS4uXm0VTu7gwVxW9MPy+BzMoQ3hkqTYSKCKIpVnSwaeYzj e1GWDyMy/UXYYs0E=; Received: from mail-lf1-f51.google.com ([209.85.167.51]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1pzbNl-00CH6F-6a for openvpn-devel@lists.sourceforge.net; Thu, 18 May 2023 11:01:17 +0000 Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-4f3a873476bso276634e87.1 for ; Thu, 18 May 2023 04:01:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684407670; x=1686999670; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=fPJDADgGzy78lctciocVO0OptWHeqgkLW+LY5Ol6G64=; b=aNSWQ+z4q5bFQa8tn6BwuIRzp/4Cp/bWKYllsfab1H2QA5yG0bDlZSxifmx/RorMph 48I49md+S6Duc4/z7G4/AOB/uuEUhTQD/VSZtDqzOxyoRR2Z6xYZ48i6tVBwNkGpudf9 7us0B642cSIUOGxMxgjTbbBRbBjNjDRoRu9REXHp1KRqFyADgP92Lyrimfk0xMAqRCQG NOms7syZWJnnejseGg9tnGaDJADWcU84WRQ49CZYor5+4+KpPAOL44/CPtw4MNdvBw24 zbmt68Z+bO5QId1ogV+l9owMz9SqTPVa5EBsuHCqy0c2oV0s1TlKpfRZgFY1OcAqgVBp ebBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684407670; x=1686999670; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fPJDADgGzy78lctciocVO0OptWHeqgkLW+LY5Ol6G64=; b=hqycRBmtyySdHY8B6R2ZNZuS/5TbSohZqfLsH4aH+9WK9/KtgRqVhz9GAqmmkZD/mt bqK3deEV7ycjZreYp2HnagI4cGLp7thsj/TauBPRZoOwy0QywwqmLIrNbgg7oTu+5dkG I8Zo7DyIuj9ZFp6vUq05txZcPAxLndczaikRS9ecSwLGafUvBVl5912qGcjvi3sTWVmc aNQ6C3a8ypF8GDkuDzY8l5samZfqZ/5IOr0ROdYDjy7+iBjAwENi0VLZfLfParZ7rofn MWR6C5CbAiOg9lzbwexmPc22i5e80oIiDhyL61/Aj0UUHFhV9R5Z3vS3ehB30G1oYXQB LGkg== X-Gm-Message-State: AC+VfDxFbX1Ue+rEzvNZzA0CTwspBulRuRd/woA+fIlriLywLpBkZRqD rEH/YjY95AIB+liqRWwX+jYs+qSDN5Y= X-Received: by 2002:ac2:4ac7:0:b0:4f0:1149:c875 with SMTP id m7-20020ac24ac7000000b004f01149c875mr1238714lfp.31.1684407669826; Thu, 18 May 2023 04:01:09 -0700 (PDT) Received: from localhost.localdomain (nat2.panoulu.net. [185.38.2.2]) by smtp.gmail.com with ESMTPSA id k11-20020ac2456b000000b004f19bfdfef9sm218571lfm.21.2023.05.18.04.01.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 May 2023 04:01:09 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 18 May 2023 14:00:58 +0300 Message-Id: <20230518110058.1382-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.23.0.windows.1 MIME-Version: 1.0 X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Lev Stipakov With --dev-node on Windows, one can specify GUID of the adapter openvpn should use. Those can be listed with: C:\Program Files\OpenVPN\bin>openvpn.exe --show-adapters Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.51 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lstipakov[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.51 listed in wl.mailspike.net] X-Headers-End: 1pzbNl-00CH6F-6a Subject: [Openvpn-devel] [PATCH] dco-win: support for --dev-node X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lev Stipakov Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1766229504857577568?= X-GMAIL-MSGID: =?utf-8?q?1766229504857577568?= From: Lev Stipakov With --dev-node on Windows, one can specify GUID of the adapter openvpn should use. Those can be listed with: C:\Program Files\OpenVPN\bin>openvpn.exe --show-adapters While on it, remove "TAP-WIN32 / Wintun" from --show-adapters output. Fixes https://github.com/OpenVPN/openvpn/issues/336 Change-Id: I57de4d3c069465fb730bb635bfdbdf360fc8c475 Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- src/openvpn/options.c | 4 ++-- src/openvpn/tun.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index fa435c1d..e4c596b8 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3771,14 +3771,14 @@ options_postprocess_mutate(struct options *o, struct env_set *es) o->windows_driver = WINDOWS_DRIVER_TAP_WINDOWS6; } } -#endif - +#else /* _WIN32 */ if (dco_enabled(o) && o->dev_node) { msg(M_WARN, "Note: ignoring --dev-node as it has no effect when using " "data channel offload"); o->dev_node = NULL; } +#endif /* _WIN32 */ /* this depends on o->windows_driver, which is set above */ options_postprocess_mutate_invariant(o); diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index df10dbd2..4ef390ad 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -4200,7 +4200,7 @@ show_tap_win_adapters(int msglev, int warnlev) const struct tap_reg *tap_reg = get_tap_reg(&gc); const struct panel_reg *panel_reg = get_panel_reg(&gc); - msg(msglev, "Available TAP-WIN32 / Wintun adapters [name, GUID, driver]:"); + msg(msglev, "Available adapters [name, GUID, driver]:"); /* loop through each TAP-Windows adapter registry entry */ for (tr = tap_reg; tr != NULL; tr = tr->next)