From patchwork Wed Dec 10 07:48:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4672 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:29c3:b0:7b1:439f:bdf with SMTP id g3csp1886213max; Tue, 9 Dec 2025 23:49:25 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVOcmodGe0qYge8dtorMIoAT0OBGshLlB7kXl4ArInhB7vOnfRIsTGeOBocGlrM+sRIKnPOZDhFRU0=@openvpn.net X-Google-Smtp-Source: AGHT+IG7x6SpaWDA71t6HEaUk1RPqvPg7sYQRCa7FoFTdFNu/b49X7/bIVjNJinnXbFPsgDpr7Mk X-Received: by 2002:a05:6820:1743:b0:659:9a49:8fa6 with SMTP id 006d021491bc7-65b2ac0d104mr1056781eaf.31.1765352965766; Tue, 09 Dec 2025 23:49:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1765352965; cv=none; d=google.com; s=arc-20240605; b=JLN0JWOjQmXnKFlKF6XRDPHHVIeiytlQegWYT7sojIny8OvYzabFpJ8NeOUmZj34xz Fxt1T60+7ZclRzaRsEkgZA/DqlkcUlRN4NnHisDt+nyDhGyBwj61ur1wTzFFusMGN32/ oEkmvUfrcfXFuisLrEKY6HzTrMtyNzepjHvq8svRnHD4RYGMbml7QylCXmT8D04ehUxB rtXPRuJ5lM3cfHTLHu6ZIZdwMSQPbqlC1ZgLrg6P0Qs/rFC36vKIAJz2Rb3SdyH7lKaq syHNjstz6+0PlxfIj/NtbbFIGBvH8fqBkwYqPFkXuCYCmF4Q6c+paFgQZDax8b/SEtk4 ZkjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature; bh=lBw1wkNHWHphkvLMtzOfe1vu6mPLCIjGxtdkM3a+6n0=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=VkFjgF3T3BBDM97UXfqntG12Z0F4VGeXbBhhYNBXozkc3lYk/R7ub6clVr/JZryeui slfJEIdTiDv4qvdcMwcptjXC36Nd4VnS0Bn0kCJhrHsJhl3imS8tH1m2ZnaIPvvfbCD3 us2PnmE3H2yrXTNqoVjOPWAIMMm8UdKp4ovnOLXK+m3MZQy7rRnya2zIqjQM6NgezoC7 GqrKWMV+J+ybXh1uVeAcuT4y8WnwnxStx1pOZfaEwfOcHQTHps5AQoZe2SbNZbenPo24 ldMOPyPSEHGGVg7bzwk+CsWgmdxVitBOZ86+p5ZyNXAYzRq3+eOtwC9pLL/8r+un4Ukl UCAA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=h7HbSBce; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=lhdXoi50; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ah8vOmI1; 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=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 006d021491bc7-65b271e9ba0si1659120eaf.91.2025.12.09.23.49.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Dec 2025 23:49:25 -0800 (PST) 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=pass header.i=@lists.sourceforge.net header.s=beta header.b=h7HbSBce; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=lhdXoi50; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ah8vOmI1; 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=NONE dis=NONE) header.from=muc.de DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=lBw1wkNHWHphkvLMtzOfe1vu6mPLCIjGxtdkM3a+6n0=; b=h7HbSBcehCKPsxOlK1xKMgsABX XyfBdgktlPrahICqvVi57bCrcB3c5gHY6Yc5tAluwKO96fV59xFfyVPUhSrttLXJjxrcIVLdlGfMQ ec9HGMuvCq3vgFifRensBXjWAkurI8fqHS6UtipRM37haFjPIW7QeLXhP6wX36zZHl/w=; 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 1vTEwr-00036B-3N; Wed, 10 Dec 2025 07:49:21 +0000 Received: from [172.30.29.66] (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 1vTEwp-000361-6S for openvpn-devel@lists.sourceforge.net; Wed, 10 Dec 2025 07:49:19 +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:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=E2KHa1rhUHdVwHwEMWyl3TbBFhO1Elijf0q1YzgeA3g=; b=lhdXoi50YCHdSBcYLnO7gSPtdK fYrW6Vr6R3RCNx1SJtxHgIjR3LY4tW4VQcHwXMgINS0Iyl7DRVY9B3cJnx7ut+5A/hdweeDw4YKY9 4xO7URqGrN/2x3OvIYorAL8gSZpbqD8AeqJDWvhm9pp8p3tG4HSbwX/Jplq2zCdxi3z0=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=E2KHa1rhUHdVwHwEMWyl3TbBFhO1Elijf0q1YzgeA3g=; b=ah8vOmI1VC/2U9i1AbR88+edCC IL2Wv3RJGgABPJ/WS7PWhSlnDELikyVfiABGrl5JV8tQbYgjUJToKOEs4EqdNPsRcP0j+F0yq0SQq A3D+zT/Ve4QC/GM8b/62jC5n4U28/1/EQzA1dtRVb7A9TPfobBsArDZTBMhHwtSbbR48=; Received: from [193.149.48.134] (helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1vTEwn-00050e-CR for openvpn-devel@lists.sourceforge.net; Wed, 10 Dec 2025 07:49:18 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.18.1/8.18.1) with ESMTP id 5BA7n5De027079 for ; Wed, 10 Dec 2025 08:49:05 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 5BA7n5G2027078 for openvpn-devel@lists.sourceforge.net; Wed, 10 Dec 2025 08:49:05 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Wed, 10 Dec 2025 08:48:58 +0100 Message-ID: <20251210074904.27067-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.51.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-1.hosts.colo.sdot.me", 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: Frank Lichtenheld The option doesn't exist anymore so don't point people to it. But add it to the list of unsupported options. Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1vTEwn-00050e-CR Subject: [Openvpn-devel] [PATCH v1] Remove some obsolete references to --windows-driver 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1851106751671233461?= X-GMAIL-MSGID: =?utf-8?q?1851106751671233461?= From: Frank Lichtenheld The option doesn't exist anymore so don't point people to it. But add it to the list of unsupported options. Change-Id: I78c6f335c635e97bb41d26ed8908a978d7b49387 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1426 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1426 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/doc/man-sections/unsupported-options.rst b/doc/man-sections/unsupported-options.rst index e8e76eb..821ac07 100644 --- a/doc/man-sections/unsupported-options.rst +++ b/doc/man-sections/unsupported-options.rst @@ -49,3 +49,8 @@ --opt-verify Removed in OpenVPN 2.7. This option does not make sense anymore as option strings may not match due to the introduction of parameters negotiation. + +--windows-driver + Removed in OpenVPN 2.7. OpenVPN will always use ovpn-dco as the default + driver on Windows. It will fall back to tap-windows6 if options are used + that are incompatible with ovpn-dco. diff --git a/doc/man-sections/vpn-network-options.rst b/doc/man-sections/vpn-network-options.rst index 2a06ef6..33ebedb 100644 --- a/doc/man-sections/vpn-network-options.rst +++ b/doc/man-sections/vpn-network-options.rst @@ -89,7 +89,7 @@ On Windows, only the names :code:`tun` and :code:`tap` are supported. Selection among multiple installed drivers or driver instances is done - with ``--dev-node`` and ``--windows-driver``. + with ``--dev-node``. --dev-node node This is a highly system dependent option to influence tun/tap driver diff --git a/src/openvpn/options.c b/src/openvpn/options.c index a3fc19d..1be105b 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3905,16 +3905,7 @@ } else { - if (o->windows_driver == DRIVER_DCO) - { - msg(M_WARN, - "Option --windows-driver ovpn-dco is ignored because Data Channel Offload is disabled"); - o->windows_driver = WINDOWS_DRIVER_TAP_WINDOWS6; - } - else if (o->windows_driver == WINDOWS_DRIVER_UNSPECIFIED) - { - o->windows_driver = WINDOWS_DRIVER_TAP_WINDOWS6; - } + o->windows_driver = WINDOWS_DRIVER_TAP_WINDOWS6; } #else /* _WIN32 */ if (dco_enabled(o) && o->dev_node) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 7c61dcf..a7c5ebb 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -6061,7 +6061,7 @@ if (tt->backend_driver != windows_driver) { msg(M_FATAL, - "Adapter '%s' is using %s driver, %s expected. If you want to use this device, adjust --windows-driver.", + "Adapter '%s' is using %s driver, %s expected.", dev_node, print_tun_backend_driver(windows_driver), print_tun_backend_driver(tt->backend_driver)); }