From patchwork Mon Nov 13 16:01:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "plaisthos (Code Review)" X-Patchwork-Id: 3429 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:3c06:b0:f2:62eb:61c1 with SMTP id e6csp1555362dys; Mon, 13 Nov 2023 08:02:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IF16VDFUFLGy5IBfeLp7MRnJABs2pdvTzI8M1BZPQYN101WuCKvo+kbfjg1YtmI19AjYgJx X-Received: by 2002:a05:6820:199a:b0:584:1080:f0a5 with SMTP id bp26-20020a056820199a00b005841080f0a5mr8296991oob.1.1699891361184; Mon, 13 Nov 2023 08:02:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699891361; cv=none; d=google.com; s=arc-20160816; b=xrMtx1T14D7Dmx5wUxEcF295JiqqM6Edn6hhRfGLpzRwpvcchzuk32QM2A6NZ3Q/D+ lAm00bXl9aw7Fx9Y/9Bvvi5NRSOYH+MKuWQ6d6s5KUcxMu7oD9o1B53pthaR3G5WTFqG hviC0vrc+Vk7G66kQuGaVpWRoaEiYHt3B2c87dQZfVOsWciNix5ga24idvS4k5HIeuxv UfErdLPujT1qPjy6nDf8RWJ4b4Py29sKlPCTBOj8h6DZ4j6ruV0ny0UfLU35qAJYHlDo x2ML+/DRXrJtema9ReIK2ZGkHpcyNztIM3D5hUqFFAVhd3vnAdZ6PpCiuvBGJKJ2bwlg 6C5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:auto-submitted:to:date:from :dkim-signature:dkim-signature:dkim-signature; bh=5hR3HvUX44wy/EoWmRf/QofA6k09onLfEdnyDzeY8ak=; fh=U7wEyxtwz2o5+UdevFSA47vNeG9knhWH0KV//QhD5a0=; b=KVKTh2SCVExWkaqXYGk3sMe3lDVVDnjQwebI0P9JVDrEZB3AK1Y0MvuB322mxMutOi NQhBuoatB/c2aHQOHXk6hTgfmQprfOCl6kODUyGUJFc0D27tKyKLIUSh/mXzvMTMeM02 MkuoJLS3x1MQuoI5mFg2WCxCTwoq3QdA0uSp+6sJCH2FAfZCvlVyGUjDTwiBK6EOcLDM DMybhhDSONZGrLXrwoQrVIqe2ACrq0eNjdBDHDa2INfz2egWzO/I2jv/FWubNHWOq7kK +/zO4XpeIRaYfmjsisDcq5PkFZlPEncxeG07cifZe5/z5hSBMZjbHoznOLmc+Q0Ra+f6 l/rQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=VglM8952; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=LETEK+3d; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=NAOzSy6V; 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=openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id d29-20020a4a9cdd000000b00581e0e0a1dfsi1905549ook.32.2023.11.13.08.02.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Nov 2023 08:02:41 -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=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=VglM8952; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=LETEK+3d; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=NAOzSy6V; 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=openvpn.net 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 1r2ZNk-00079n-2Y; Mon, 13 Nov 2023 16:01:46 +0000 Received: from [172.30.20.202] (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 1r2ZNh-00079h-Js for openvpn-devel@lists.sourceforge.net; Mon, 13 Nov 2023 16:01:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:Subject:List-Unsubscribe:List-Id:Cc:To:Date: From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=AScCu+lM9I2STGTHL/+14YX3geYJjeH1ajvXT33vuSI=; b=VglM8952iQMgCcwVuIKjtCYivr CbtRd2soFrIiiAHnzgncTaYW79gXY+g0yg3368N4dOnYeB7PLegzKrnMBxQcwjqauACC2yzzbKzq6 XhMW0wXX1fVrzICcBTZ/mzQg8b8KgooyN1+8tic2GWUZ8YCFVzgsmUtxsa2pghS9mY6c=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From:Sender:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=AScCu+lM9I2STGTHL/+14YX3geYJjeH1ajvXT33vuSI=; b=L ETEK+3d0C/05ZS8ESftQ0zfFwb8fRyzIut7Ul5FyKZw3HOxlT3j6F6rGoOk4TqVryGlnS/RE4OWMi ciW4dwy1I9dW0P5/CBeJi+MqWXKKlpc0/ONCTbOueARDQ+h9GDK0aNcjTu0QZBnWU1/M8zJXDVx4w liq1f3tVtVXViupI=; Received: from mail-wm1-f42.google.com ([209.85.128.42]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1r2ZNc-0003ec-3z for openvpn-devel@lists.sourceforge.net; Mon, 13 Nov 2023 16:01:44 +0000 Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-408382da7f0so38286415e9.0 for ; Mon, 13 Nov 2023 08:01:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1699891293; x=1700496093; darn=lists.sourceforge.net; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=AScCu+lM9I2STGTHL/+14YX3geYJjeH1ajvXT33vuSI=; b=NAOzSy6V6P3MqkWEuTQEYpLnSA74O48Jxi+XmC8qMN20YrNaTOAoQ6eV1/aezv1Y1E xPuYomPeAfz47SXbqBrIAEGWpiQG7kwzl71+/rWeMI2abOkSGxBU7b91+bxfNS3SX+gA Csbj2bNRtrlKA6Ii8+XUxe1eyGOS1csjVVkLKvJRrzW37sRSTq0gug7aVYiLsMUM8h3V ASQxJNENKIdhTUfXBk41MuetaeDzlGDM6V9NsaYN/EVIpa7ZC34wi2WSty3xjeGe5KTI jtJM5SDhs0bfYezVbjSM3jCG7gSaZlqP1+UrF6N4mSPqc+YShXQ4/OxKGv7VezWJP17D tKMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699891293; x=1700496093; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=AScCu+lM9I2STGTHL/+14YX3geYJjeH1ajvXT33vuSI=; b=xBkSliGQYcM+DqdatSU/ApFCas1V4f09gIN4eLTXqHab6++oupB9u5xn6XPboYuGOd 8fR11P4JkTkHOehTeeQGmvnIWSD1hG23bugGin1SuHzAwBycrHkTFYH4q0O17/i39AEw LsYwLykuQ//1x819bp5+iqmS4AGVyZeTHwT6d3aT1OSIJlW1ytgxp0aQDvJjvz1WE3KX f44uj4VSXqW2tWblI4M5INGH3B3NSY2/WqqnL7G9L92Fy+I1QEkFCwHH0qxuscsO54az Isqgj3PFYIVjPoGlCXsOnLIVWz2ABRbwaQk27xCydWWzVUvtarHAw6hQeEnbNfDoR900 SNHg== X-Gm-Message-State: AOJu0Yzi3YYygJqSZ/wDOkDxPHjYvhcEHlzFlkeZP7SgtqiTb3rxbZlx eHo4DtxovcL7bfUD6dRwqRD1yg== X-Received: by 2002:a05:600c:600a:b0:405:e492:8aef with SMTP id az10-20020a05600c600a00b00405e4928aefmr6069378wmb.40.1699891293673; Mon, 13 Nov 2023 08:01:33 -0800 (PST) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id w21-20020a05600c475500b003feae747ff2sm14490472wmo.35.2023.11.13.08.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 08:01:33 -0800 (PST) From: "stipa (Code Review)" X-Google-Original-From: "stipa (Code Review)" X-Gerrit-PatchSet: 1 Date: Mon, 13 Nov 2023 16:01:32 +0000 To: plaisthos , flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I24f43ad319bd1ca530fe17442d02a97412eb75c7 X-Gerrit-Change-Number: 427 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: c24037309c43f4a611f6e095fd1eda8ee70f668e References: Message-ID: MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.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: Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.42 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.42 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 T_SCC_BODY_TEXT_LINE No description available. 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1r2ZNc-0003ec-3z Subject: [Openvpn-devel] [XS] Change in openvpn[master]: Make --dns options apply for tap-windows6 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: , Reply-To: lstipakov@gmail.com, arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net, frank@lichtenheld.com Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1782465283976757046?= X-GMAIL-MSGID: =?utf-8?q?1782465283976757046?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/427?usp=email to review the following change. Change subject: Make --dns options apply for tap-windows6 driver ...................................................................... Make --dns options apply for tap-windows6 driver When tap-windows6 driver is used, both --dhcp-option and --dns options are applied with DHCP. When processing --dns options, we don't set "tuntap_options.dhcp_options" member, which is required for DHCP string to be sent to the driver. As a result, --dns options are not applied at all. Fix by adding missing assignment of tuntap_options.dhcp_options. Fixes https://github.com/OpenVPN/openvpn/issues/447 Change-Id: I24f43ad319bd1ca530fe17442d02a97412eb75c7 Signed-off-by: Lev Stipakov --- M src/openvpn/options.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/27/427/1 diff --git a/src/openvpn/options.c b/src/openvpn/options.c index b88fea9..abd2e0c 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -1364,6 +1364,8 @@ { msg(M_WARN, "WARNING: couldn't copy all --dns search-domains to --dhcp-option"); } + + tt->dhcp_options |= DHCP_OPTIONS_DHCP_REQUIRED; } if (dns->servers) @@ -1401,6 +1403,7 @@ { msg(M_WARN, "WARNING: couldn't copy all --dns server addresses to --dhcp-option"); } + tt->dhcp_options |= DHCP_OPTIONS_DHCP_OPTIONAL; } } #else /* if defined(_WIN32) || defined(TARGET_ANDROID) */