From patchwork Thu Dec 14 13:38:06 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: 3529 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:8d12:b0:fc:24ac:f0cb with SMTP id i18csp7197780dys; Thu, 14 Dec 2023 05:39:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IEmQPX1ESlueD27n/p0Y/MauTxOvIfUtmbHUFgvXBI4kaOo6Ucdp9sLoZ75lNJBkI+PUzkl X-Received: by 2002:a05:6e02:219b:b0:35f:7401:d066 with SMTP id j27-20020a056e02219b00b0035f7401d066mr5576468ila.2.1702561141741; Thu, 14 Dec 2023 05:39:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702561141; cv=none; d=google.com; s=arc-20160816; b=e3+QJ5mkpr3zMqGnaOU2dyWYS3fRyX+DX1OsUSYdYDDfOJTYxj/LRz03sg1mDEnLpx MTr3nbLWgIuXNcMSldUiip5VOWAIHmGUh6GvWuwupe7ufI08oG2sa4S8xbcdV0odmY5j aWOpD4ZDg8o8IDZZ9bHy5owCqfN/SMDZIcTDPl+KWFxB2lMj4aQQjndP3C7do/nkhbW4 LO38JheOAxmtja2M4jhxyT6Gd+T5Snsh2DG2jxDUOMgVAeWTRuPMZ2m8pWCnVVuaCu7X W/WyX/TvNn9fdT7Ni5tjJ4elqQ90lB4y5o8U0x7WolsFs0MpkwIuh77ame0AHz/2eQR6 JZPA== 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=OQKz8jiOn/L6vHq3NF9kytCxSODB4TbtpITlxCYys4E=; fh=U7wEyxtwz2o5+UdevFSA47vNeG9knhWH0KV//QhD5a0=; b=wR/zZcrCWZth+ulMXSN2BvUT74wEVCaX4HLDnJ4B85WjCWmeHGjT8eINFQTxDCg2Pb Ipx85KLoGl3ra//EEIMv8I+HmTK7WT4IttHoZdnwNM8YkbAthgfflhL+VtviXpFWA8D5 wsdwttN/kcutMlfx6ADOJ08C7NwMZkiJTgGgA59gE0gZ2UbLXeSjsmhwHTAu5K7DD8z3 7d0Fdep+veZlXyeu9H7rB80bt+4tU/qosUUEoC/zQwY0jYEHP86PNf2V8eXC1kw5bZTb 1Zb+VEdTG8l21hRBhj4GBCIyovHpEA0GSUqKZmcK6ITSpmI64WGUEubz6T+0cWLlES9H 4ONQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=aEG5yZoG; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=RWYwLPPT; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=DdIuSK1u; 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 z9-20020a63e549000000b005ca4098bf58si3870100pgj.647.2023.12.14.05.39.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Dec 2023 05:39:01 -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=aEG5yZoG; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=RWYwLPPT; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=DdIuSK1u; 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 1rDlv2-0000z8-AH; Thu, 14 Dec 2023 13:38:28 +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 1rDlv0-0000z1-4i for openvpn-devel@lists.sourceforge.net; Thu, 14 Dec 2023 13:38:26 +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=vrJPXPBYQIrmJqDqULwCJGTiTfn5gu1kxwbymX1f3aY=; b=aEG5yZoG1USoGMqU5tDxu4LxFO 6fsQeMHC0AtAZ+i6q5VOPMhAzv0cLFpMOU4l2jdyi7NrKsRn99RDE5hb7xyHNO0si6LjgzjiUOXzF 0ojf1IDZzP3LVORPHgFLe5dpHa1SfIW6mqItgQzmF5XXMGmd5vuCIHBa9QC8I4/3MfBY=; 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=vrJPXPBYQIrmJqDqULwCJGTiTfn5gu1kxwbymX1f3aY=; b=R WYwLPPTmJV8kbIKHzSx2+GMt+l6mSwr+9LkyFisDqTdkNqH78isABhxZ9HA6STV0TdRQ0WVs6Gr4t kK1TAVDjOWaz6kAFANihzrylmzwA8jK/uYIV3AoiNaKDBMl3mtGzoGtLd5z1xZbpkvIHqkRdlVRVA 23Qy5LlJcNHyp0JU=; Received: from mail-wm1-f45.google.com ([209.85.128.45]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1rDlut-0005N0-12 for openvpn-devel@lists.sourceforge.net; Thu, 14 Dec 2023 13:38:26 +0000 Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-40c3ca9472dso60681585e9.2 for ; Thu, 14 Dec 2023 05:38:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1702561087; x=1703165887; 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=vrJPXPBYQIrmJqDqULwCJGTiTfn5gu1kxwbymX1f3aY=; b=DdIuSK1u/iIoPRhuQjc4GMvfRe2l4T7WiGNBGoljJbD/MEYCpwt07PlcahSPD/BTW4 l1UZT6sOQNGlPpXZoOmNQLpx/bXJzpyJiOyqfuizVgLEFGT2RPc9GLF8Y4JHPD8TQ/hZ lXbZS2m9YKqr//BUbAf6aHX+Hbi3r0sC/ExF/f71qen9wS1Gzj9oaXvUANX0CEZ34b3n NVP+LRgcmN4K0sOnxfbdeWhOODzady5MmU3rza6vU4vnbOFbOxs9MX5UDZftpkX/oTg1 lo34jTw+OGdVN6SUF82XXFEjeQlanjcwDSP99CXVFfx57a72n5LN2RC69d/xWejsbPV8 qYAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702561087; x=1703165887; 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=vrJPXPBYQIrmJqDqULwCJGTiTfn5gu1kxwbymX1f3aY=; b=jD3ZOf9/+SRYJ5Kw3GM9spXmoVUpY4pscCzLJrRiSgAZlL8Q3y0muaoEUN3wnBeUy4 C3zB0MALQFFAFEAOsA7OvMlpFlzR1L3LiCqpyW6fOrGCOEQhR73s4E5ARK/zrgAW9PZR OKkbwib7/vTfGZ3ojg9dGWQMDH0R1zykDPm+Q+tWnkPHTK8UzVNC7ueBqo+NMMuiy1/4 F/mI/e/Of9rWKnyXYA5IU9+7PXgYvYCopvxlCdnHazjww4dBFKi/YVHTr08wASKSAb3p BEtp0IkQ/sw55HG5B/JdWpagbqJmAqU7EGx19kZVJsTuHTsKUCU2nDpXx69mZZOLUFbJ 1NHg== X-Gm-Message-State: AOJu0YyoSsSDb9RClYaNkNEjI4nAlIV02WyFV4mKhsBv1NX1z8JV2CYA FbWwfD0LiULYGKZyZb06ajjWwg== X-Received: by 2002:a05:600c:4f05:b0:40c:2734:13f3 with SMTP id l5-20020a05600c4f0500b0040c273413f3mr3410283wmq.24.1702561087108; Thu, 14 Dec 2023 05:38:07 -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 df5-20020a5d5b85000000b003364a0e6983sm1232671wrb.62.2023.12.14.05.38.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Dec 2023 05:38:06 -0800 (PST) From: "stipa (Code Review)" X-Google-Original-From: "stipa (Code Review)" X-Gerrit-PatchSet: 1 Date: Thu, 14 Dec 2023 13:38:06 +0000 To: plaisthos , flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I21a36d24f8e213c780f55acbe3e4df555c93542a X-Gerrit-Change-Number: 482 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: a42cdf3cdd5447f4b517a8ff02cad9611a32dc86 References: Message-ID: <5017388de23112cb9484ab9f385484112c261dcf-HTML@gerrit.openvpn.net> 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_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.45 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.45 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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_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_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1rDlut-0005N0-12 Subject: [Openvpn-devel] [S] Change in openvpn[master]: tun.c: don't attempt to delete DNS and WINS servers if they're not set 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?1785264751571404751?= X-GMAIL-MSGID: =?utf-8?q?1785264751571404751?= 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/+/482?usp=email to review the following change. Change subject: tun.c: don't attempt to delete DNS and WINS servers if they're not set ...................................................................... tun.c: don't attempt to delete DNS and WINS servers if they're not set Commits 1c4a47f7 ("wintun: set adapter properties via interactive service") 18826de5 ("Set WINS servers via interactice service") added functionality of add/remove DNS/WINS via interactive service, which is used mostly by dco-win and wintun (tap-windows6 normally uses DHCP). There is a check in code - if DNS/WINS addresses are not pushed, nothing is added. However, due to bug we always attempted to remove DNS/WINS, even if nothing was added. This change fixes this by improving check "has DNS/WINS been pushed?". While on it, convert do_XXX_service() functions to "void" from "bool", since we never check their return values. Change-Id: I21a36d24f8e213c780f55acbe3e4df555c93542a Signed-off-by: Lev Stipakov --- M src/openvpn/tun.c 1 file changed, 13 insertions(+), 23 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/82/482/1 diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index f1b8699..9104d46 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -147,17 +147,16 @@ return ret; } -static bool +static void do_dns_domain_service(bool add, const struct tuntap *tt) { - bool ret = false; ack_message_t ack; struct gc_arena gc = gc_new(); HANDLE pipe = tt->options.msg_channel; if (!tt->options.domain) /* no domain to add or delete */ { - return true; + goto out; } /* Use dns_cfg_msg with addr_len = 0 for setting only the DOMAIN */ @@ -195,17 +194,14 @@ } msg(M_INFO, "DNS domain %s using service", (add ? "set" : "deleted")); - ret = true; out: gc_free(&gc); - return ret; } -static bool +static void do_dns_service(bool add, const short family, const struct tuntap *tt) { - bool ret = false; ack_message_t ack; struct gc_arena gc = gc_new(); HANDLE pipe = tt->options.msg_channel; @@ -213,9 +209,11 @@ int addr_len = add ? len : 0; const char *ip_proto_name = family == AF_INET6 ? "IPv6" : "IPv4"; - if (addr_len == 0 && add) /* no addresses to add */ + if (((family == AF_INET6) && (tt->options.dns6_len == 0)) + || ((family == AF_INET) && (tt->options.dns_len == 0))) { - return true; + /* nothing to do */ + goto out; } /* Use dns_cfg_msg with domain = "" for setting only the DNS servers */ @@ -272,26 +270,23 @@ } msg(M_INFO, "%s dns servers %s using service", ip_proto_name, (add ? "set" : "deleted")); - ret = true; out: gc_free(&gc); - return ret; } -static bool +static void do_wins_service(bool add, const struct tuntap *tt) { - bool ret = false; ack_message_t ack; struct gc_arena gc = gc_new(); HANDLE pipe = tt->options.msg_channel; - int len = tt->options.wins_len; - int addr_len = add ? len : 0; + int addr_len = add ? tt->options.wins_len : 0; - if (addr_len == 0 && add) /* no addresses to add */ + if (tt->options.wins_len == 0) { - return true; + /* nothing to do */ + goto out; } wins_cfg_message_t wins = { @@ -338,11 +333,9 @@ } msg(M_INFO, "WINS servers %s using service", (add ? "set" : "deleted")); - ret = true; out: gc_free(&gc); - return ret; } static bool @@ -7019,10 +7012,7 @@ { do_dns_domain_service(false, tt); } - if (tt->options.dns6_len > 0) - { - do_dns_service(false, AF_INET6, tt); - } + do_dns_service(false, AF_INET6, tt); delete_route_connected_v6_net(tt); do_address_service(false, AF_INET6, tt); }