From patchwork Thu Nov 21 18:07:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "stipa (Code Review)" X-Patchwork-Id: 3953 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:1b0d:b0:5db:37e7:e801 with SMTP id cv13csp501289mab; Thu, 21 Nov 2024 10:08:14 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUA+jOonu3t+AJ+LJ9nOUCRBI8ECWHV8kkbPFkUwzbb3tikzTHooM3DbSk5qhRV4E+Gq8rWvXesgF0=@openvpn.net X-Google-Smtp-Source: AGHT+IGhOQEedSRnfRDSEtiV+NJUV8MFOZz4Cjz5doOki5/VB4G7aJOtQ0rpHvLrzm+yGJCFZBzX X-Received: by 2002:a05:6602:2d87:b0:83a:b7e8:a684 with SMTP id ca18e2360f4ac-83eb6029015mr896261839f.11.1732212493745; Thu, 21 Nov 2024 10:08:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1732212493; cv=none; d=google.com; s=arc-20240605; b=PQNJcDHwM00RBEBmu+ubSNgdgKYyEKbplEFYvgbQyBh9YlzK07J3Jhb4UFwJW+LvoL abGevAucpEkxKgp2052kkQOH5b6bAg4eH+PU6t0ogXaG7HMxX9otid47QDgZRaGV/nMV VGyQ7C5sqNye55Wg9D9IgY/Etn5haKSmTlo7feevR8n7ETFyOmk44+woTJTl2bUL+Msd TSMcRudx0UdOo64V3M3Xkj8tlG+NxzQ2BYHD+T4giUzcZahHI6BDCTf9mvtYyo/7+rPE DoIEU5+bF1in41Ga5VBhi+QZoOgx5iloEOsOiNpJz17jMebaG0LEsP+oWXJAc3ga6H08 IBYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=h0LCDloXkeAkbi+GJ2O2K5npee8fvOAIvsJ2/KE8HAY=; fh=U7wEyxtwz2o5+UdevFSA47vNeG9knhWH0KV//QhD5a0=; b=cHH8pAcufnZhkuhsAHyaVFu0brGdd3yGK7v9sq1dCPLK2cPOCTEUR/iBp9ci/m+3Qr Ci3by3UGNdRep2HX4fZZ7RUIrwGOUpd5YCG9zCPSxf+TxlVukTOyg8UHyBmR2xoSvYxD z2PT27W1a7WrW4xvJV6t+pd1T1ujU/H62iE2yjV/UmTXoKR3zPj5GrtusFlxvpvWep6X VvJlwIwKYNXHu5t6sHdjcUfXk3du2G4zDDnzHUURncavG92ST2+Bytxfyx70Ctq5W92O djfZF8uH0VbqeTKjzuM3EqKIalSWDa5vM9oEXZlAPvdFstkFC1IXyuz3RzgYgXaoHfs6 LJVA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=PxHw1ePp; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=nLoP5Q83; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=RGfriogN; 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; dara=fail header.i=@openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id ca18e2360f4ac-83ecd39e00dsi3911439f.48.2024.11.21.10.08.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Nov 2024 10:08:13 -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=PxHw1ePp; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=nLoP5Q83; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=RGfriogN; 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; dara=fail header.i=@openvpn.net Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1tEBb2-0007UZ-8B; Thu, 21 Nov 2024 18:08:04 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1tEBb0-0007UT-V9 for openvpn-devel@lists.sourceforge.net; Thu, 21 Nov 2024 18:08:02 +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=rDp5XKvYAhDWn2CWIV40xoTPvwWWIHOg7hxQ3tUnDj0=; b=PxHw1ePpJGKeq6gYm5NOhfCdXY vpVb1/fr22DCVuWmFRrMJWXbWVpyC3ywIjqZjeIrz58n7RTnDWLTC6lJbpZY4Wy4jb2j8glWXGF1X WWbMPV9/7auoI1u4GCbcG9M+WBR4vDgN4Q5xj62m2RJ1YUPgP0AxhT1PqMGqZhRA9NoI=; 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=rDp5XKvYAhDWn2CWIV40xoTPvwWWIHOg7hxQ3tUnDj0=; b=n LoP5Q830cPrsAYBtRxczj0YIhBKQb9vNmeq2P+amwQWfkb/9os6j6ZrrWEAIWax3wbKnDqKFjrL5m NpxaX/J1mLnEzJMqnwBedpoar9FY4MFyzWcjWmAalU0nCi6QQFS4lRGMC8kNBNvwU/NTDpW3/fldO 4NeCxYFffPdFfbzE=; Received: from mail-wr1-f43.google.com ([209.85.221.43]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1tEBb0-0004Se-1a for openvpn-devel@lists.sourceforge.net; Thu, 21 Nov 2024 18:08:02 +0000 Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-3824aef833bso915250f8f.0 for ; Thu, 21 Nov 2024 10:08:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1732212475; x=1732817275; 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=rDp5XKvYAhDWn2CWIV40xoTPvwWWIHOg7hxQ3tUnDj0=; b=RGfriogNTUhpmbSoOWovoHrEpHwSq+JmZYcHYBXSi7ZeCud2ROMzH6se86qtxT322U 9Rufz4yPnL9Z+uM5bCErbQs7kEdZ8LczCFvOu8dp0sJ65rthJLfTTsmsD8FoHiRk2OIG n7hiM1biu53lrqrPEZ0wPTUXmfuKHqUOGKdufXcO5cs76xzd9RUUWXV28RLt/7Ent+gU JUhjoU1Mci09mk201U0kmLwdh4yXfv8yhA6I4YXr/s3Ud6MYdJAZlvp1MfqW3bhpA/E1 RAHjPvpqkGzUoiSpC7IK4TeZs7boVennMcq9StcrWj3tXunRoTe/j8A8OAiKoz2H35CQ NQpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732212475; x=1732817275; 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=rDp5XKvYAhDWn2CWIV40xoTPvwWWIHOg7hxQ3tUnDj0=; b=rO8xTBwyM9hNozqCnHNap2dx23RjeYR5U2iXxHHkkDU9rvotgM4gfmqxufioNFMRNv vqyPsU+khVJA1pEcJhoOGYVRHy3tpZzYFE+GaX+inJB02AvY923qB1owhKNSMVia91Ng zb9q7oXcluSe82ZetHDt4rFzelOfvKkd60kZgmjs+q4ucjANKqqlk/gxozMoqwVJLfbh M7+nnsDld8UhQfqHU7jVqAIZVDwlwuFP7GUJBkuOiRffuhAdIkOhjXPnwXTF/wf8W4wV O5SIjQVL5DdhMp015uc2qYWM4rEkX601rdIuIJ0Ul28AGb+jwRlAe9jj4SArhqLaK9vK 5pSg== X-Gm-Message-State: AOJu0Ywy9E2D7EBEjruGYK6Gn1mGG5lBXu9WERso2CDTIC5y0W8JdDPf RQH1ux4/zBqiiw5g6asK0DZeVFY+GD1zZShE6eXHjhXT1AH/Yi3gYIUyy+wWLIA= X-Gm-Gg: ASbGncu/diZsFDZPRUeOSkNrvQR5RUj/qOBO8XxWTzgCpFqYiGcI7mpzr2aUZd0AgId 6BMaLlCS+qL/msXcCcINvAK6jpCLtqGnMeRsjGZISD7iSPN7llyLfEPg5C204kMdoiMhdew+dyG /KZMJB0XSDsMJ3TWlxvw//roMQTVOQQdy8oS3+1YySHFms6zMqZt5c2c4FMZlsMPlPJWYj7GY49 4+cdV+V+CO7VPYXnliou6pN92n1H3WwZ656eaQbgRijLxY2ZnmV/2rlkwD2uJ2Kcm6rePaMM0oF tMQzyfjX3mCwAZt7blHsIoFPuW7NrdtaWKZhSYTkKg== X-Received: by 2002:a5d:5985:0:b0:382:5010:c8cd with SMTP id ffacd0b85a97d-38260bcc640mr22187f8f.44.1732212475090; Thu, 21 Nov 2024 10:07:55 -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 ffacd0b85a97d-3825fb27386sm198169f8f.51.2024.11.21.10.07.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 10:07:54 -0800 (PST) From: "stipa (Code Review)" X-Google-Original-From: "stipa (Code Review)" X-Gerrit-PatchSet: 1 Date: Thu, 21 Nov 2024 18:07:54 +0000 To: plaisthos , flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I3232dd8d855ca3f198b4ca3b2ef4f67cec49f3d4 X-Gerrit-Change-Number: 813 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: 41ed37901ffa75b62ae29f1fbe1ab4d22f4e160b 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-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: 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_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.221.43 listed in sa-trusted.bondedsender.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.221.43 listed in bl.score.senderscore.com] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.43 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.43 listed in list.dnswl.org] 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_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.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1tEBb0-0004Se-1a Subject: [Openvpn-devel] [S] Change in openvpn[master]: dco-win: simplity do_close_link_socket() 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?1816356447527425087?= X-GMAIL-MSGID: =?utf-8?q?1816356447527425087?= 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/+/813?usp=email to review the following change. Change subject: dco-win: simplity do_close_link_socket() ...................................................................... dco-win: simplity do_close_link_socket() c->c2.link_socket_owned is true in client mode and for the global context in the server mode - those are exactly the cases when we want to set sd to undefined when using dco-win. Change-Id: I3232dd8d855ca3f198b4ca3b2ef4f67cec49f3d4 Signed-off-by: Lev Stipakov --- M src/openvpn/init.c 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/13/813/1 diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 9371024..656fedf 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -3940,16 +3940,16 @@ static void do_close_link_socket(struct context *c) { - /* in dco-win case, link socket is a tun handle which is - * closed in do_close_tun(). Set it to UNDEFINED so - * we won't use WinSock API to close it. */ - if (tuntap_is_dco_win(c->c1.tuntap) && c->c2.link_socket) - { - c->c2.link_socket->sd = SOCKET_UNDEFINED; - } - if (c->c2.link_socket && c->c2.link_socket_owned) { + /* in dco-win case, link socket is a tun handle which is + * closed in do_close_tun(). Set it to UNDEFINED so + * we won't use WinSock API to close it. */ + if (tuntap_is_dco_win(c->c1.tuntap)) + { + c->c2.link_socket->sd = SOCKET_UNDEFINED; + } + link_socket_close(c->c2.link_socket); c->c2.link_socket = NULL; }