From patchwork Thu Jul 31 10:48:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4342 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:b86:b0:671:5a2c:6455 with SMTP id mw6csp1502430mab; Thu, 31 Jul 2025 03:48:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXMhsGx8I3PVTgJoiqJbJ1FtC7zMGDdNHGMitvHMywGnIa1kfPv6RCMwgnhzcEZ/hwcroIVk7DPgIo=@openvpn.net X-Google-Smtp-Source: AGHT+IGwUhtA7skD0qD4c2F8KK12CyWpXYz+A2ODg9LX9xea2WnqCW3TmdD9pwQdikxTKm5bLmKK X-Received: by 2002:a05:6808:2190:b0:41b:fd0f:8cc0 with SMTP id 5614622812f47-43199e8a360mr4573298b6e.10.1753958927888; Thu, 31 Jul 2025 03:48:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1753958927; cv=none; d=google.com; s=arc-20240605; b=eqQaya7MJkEqxnIXd6TwlEpnNS3lYP1soEVk4BS3i8x6ceBeLAa2ISC8HrMro5m3n2 JmLXjLzifRuRmPZ0IzYxznNimEPWIRzAHXGfNY5la0h8z2g6wsM5sCpaVSu69RWxAPO3 FtzE5TA7JcMt7+VXfd9ttZkjbi2sR4sd4JuLrupfweZvFoYcilRYtMG3ROB4EDZtKFFa N7N6HejxlW9AezibC7zVGtIzYw8/hnqpqJLhfRFWljzt5K4mI3WzhTk3VE21KqyVShCI HJ1UMEP0V4/y1KhvL5+KEqzax3GD4aUaOwU/qp6/U5jsBW3EitcXJ86fPqdDRJLrgu/j 5oEw== 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=j+MaboRha0+sHr3VpjsbSAIOAc08cOfuJ5apt7b8e00=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=JZA0Ka0b2/Ak+OAm4Gf1Y5Z1zMYp2ZSJKrk88PUiB8EdifrcZR6m0cWBWMkASU8xzk MoYAxGtnlF+DXCn38x9sG4bF4+7HVEHYwbNqcMOPdxcRSglZk3Hb051etrREV5WUD+pw MwZWd7WkIRBSlWPXDUGuQGnSrr27Jd2Nortc1Shcjn7w44tum8ZyBdIyeoy46oDThETG CwSkf04Gn5L1nvn7yVMGyisiWKHC0cN8b/1HzpR29a5xW+l06boPcZQRSlrWFGrwrbwc y+Cm9CyBuzzpEy9/FydV+EcF1QiQMX45/fvMJMVC8OC3eU3FvEAJXKQyQgfV40OvEn0W XJOg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=Xz0eISzE; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=U39Ldyym; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=GiusJTmd; 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 5614622812f47-43358f87d7asi234922b6e.298.2025.07.31.03.48.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jul 2025 03:48:47 -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=pass header.i=@lists.sourceforge.net header.s=beta header.b=Xz0eISzE; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=U39Ldyym; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=GiusJTmd; 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=j+MaboRha0+sHr3VpjsbSAIOAc08cOfuJ5apt7b8e00=; b=Xz0eISzEFSuxGsmC8Takh58vkk 8wht/SCKe19fgHc0IQKfyrwTXkZnTXyrUnvJwIoc2apHu0LBFAwrbLfhr5zBtT7AP+f5VgwEEHdgd 7v4k7qhz0J0LAaehCg/GHSSFl4DD6VbPCshITD/qS8wwdplA5iIueIb3orybhxMBJGGw=; Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1uhQq3-0007fY-LB; Thu, 31 Jul 2025 10:48:44 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1uhQq1-0007fF-Fl for openvpn-devel@lists.sourceforge.net; Thu, 31 Jul 2025 10:48:42 +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=wqKVMkc7aiJpFaVj+nY8Va6WMOSBKaQEKwotEO5/aMc=; b=U39LdyymMp1o3SBskuFaWMruzS 0/6x/0Yrea7AyAatCVcK0NYBMrwH2AiiDF8nmE4JdpRdCGL2GbB2i2HYg4Xdf0oVoL0awmVpghB3C PfdcyhIOdYq3MqOChrufkTwJpqB/9lhdqSnYXx1HyqAxhmwKkT2xtja7SvV/VrNIaf0M=; 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=wqKVMkc7aiJpFaVj+nY8Va6WMOSBKaQEKwotEO5/aMc=; b=GiusJTmdroSBQlbCOTCZBnbqrC syb3/z7DJ8x+17suWzUOrycXyQD6eJ2ExFXpPGuaV/F7cW4kND7C/pIhKRKpuGWeNX1/2dHQVCGgR NNXGWrW8ePHodJmamavLKC59kOZyYsqqMFXO3FxALOkOLnNQPuEzzC1B4OjzWRpx4fd8=; Received: from [193.149.48.143] (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 1uhQq1-0000OZ-1V for openvpn-devel@lists.sourceforge.net; Thu, 31 Jul 2025 10:48:42 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 56VAmYhB023406 for ; Thu, 31 Jul 2025 12:48:34 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 56VAmYr8023405 for openvpn-devel@lists.sourceforge.net; Thu, 31 Jul 2025 12:48:34 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Thu, 31 Jul 2025 12:48:27 +0200 Message-ID: <20250731104833.23305-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.49.0 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-2.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: Lev Stipakov Commit 2dfc4f ("dns: deal with --dhcp-options when --dns is active") 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: 1uhQq1-0000OZ-1V Subject: [Openvpn-devel] [PATCH v2] Fix --dns options for TAP adapter 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?1839159236648599491?= X-GMAIL-MSGID: =?utf-8?q?1839159236648599491?= From: Lev Stipakov Commit 2dfc4f ("dns: deal with --dhcp-options when --dns is active") has accidentally removed setting of the DHCP_OPTIONS_DHCP_OPTIONAL flag when copying --dns options. This flag is required to apply options via DHCP string, which we do for TAP adapter. As a result, --dns options stopped working for TAP. Fix by setting this flag when copying --dns options to tuntap_options. Change-Id: Id95cd14095a03afb3140a03ae96e9f5679e4fe89 Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- 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/+/1120 This mail reflects revision 2 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 53be6f5..3753810 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3579,6 +3579,7 @@ { msg(M_WARN, "WARNING: couldn't copy all --dns server addresses to TUN/TAP"); } + tt->dhcp_options |= DHCP_OPTIONS_DHCP_OPTIONAL; return; } }