From patchwork Fri Mar 24 12:18:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 3167 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7301:10f:b0:b2:6796:f29 with SMTP id gj15csp449562dyb; Fri, 24 Mar 2023 05:19:38 -0700 (PDT) X-Google-Smtp-Source: AK7set+NYS18KVfByjQv/TfFCtunLnoBiQ7UcA4QTWS09g0mPV2/zGIbRep3S0V1FTAh2Qdx7ofD X-Received: by 2002:a05:6a20:548a:b0:d9:dbb6:2e7a with SMTP id i10-20020a056a20548a00b000d9dbb62e7amr8112429pzk.27.1679660378749; Fri, 24 Mar 2023 05:19:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679660378; cv=none; d=google.com; s=arc-20160816; b=GSiECrvQ86Ka4BckX3EHdWUrVVqNJ30e/VDJp//3AOd5HOShcmTQsnPCG3CmAIucMs IB42d9Fnw8oZZ3C/CEH/5rQRNoMFlY5OOq4/WGu5mXCiy89etNVN7SZ/B6csK1bHfKrn kCZWn4AijNl2H+pHZOPXsqE7RCT4d53XQrehZLETiDVm7RNkquMhysnB1MHNGDcQhpTy Caa68AKUm+uUkVJO9RPaUxGi7/mLz6UQmSOXuHIbPcgzK2BUbA4wk9qzdrCd7GUDfU17 HZ/OLWw6mjTJUqJ2zOqG22YR+4orK0lSG8jUAo8rO0ePs5AL6yJkOr0kdp0RWsXp8wN9 XZXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:cc:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:dkim-signature :dkim-signature; bh=gEOyZpkEnYj7BOBxQbeE5uMolxcvbRjXKKPm37hJtdA=; b=DceGv5ioWwgKM7mZrgUOlPsqcVrjTeQkw+EN9OHxuC3ky8i3ajWtpCpuJS1dOoRp1e pM0um8PWu5qfCCb6VS37HLzo3GVAQ+9iiuCKAt+/GGZAIJxp3AezCmF6MzP+hXQAufuU PpEbduVVI7GmqFDRX46LRGZ7CumYktkoc4uTEyqV9w0cvl64eAp+aNB897lI0//fW+d5 xsK8mhs4oKpXcAfS/Iy4dFjtOjYfzIH8yS0qOBKzRofzJPNtGxN8ZrkGG+Lm4qDAFSQk hj1knE0HrScV/Jg7vHx4MVLp5xHB2tieRepRqXx0LE5dHybCfRrZPBHD2XIMruVtJNG3 HL9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=kpR82NTH; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Yx++7vGp; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=c7eU6U4e; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from lists.sourceforge.net ([216.105.38.7]) by mx.google.com with ESMTPS id l71-20020a63884a000000b00502f9ffb8bbsi20657520pgd.297.2023.03.24.05.19.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Mar 2023 05:19:38 -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=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=kpR82NTH; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Yx++7vGp; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=c7eU6U4e; 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=QUARANTINE dis=NONE) header.from=gmail.com 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 1pfgNe-00059n-8u; Fri, 24 Mar 2023 12:18:50 +0000 Received: from [172.30.20.202] (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 1pfgNX-00059J-0d for openvpn-devel@lists.sourceforge.net; Fri, 24 Mar 2023 12:18:43 +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:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ZCH3wl5OaaGz6ySgdvFAmfFylV0qeMUvaQlY8ZSvkAI=; b=kpR82NTH+wse5mwsq4mFgkc+Zw bggU7a6VBYmVHQ/RToxxcDEgX1r0waFykgfxREeXYVTA6t6ddI99j5CI+WEniiRvk0oFJ/6SvYfKs rzdxNoe2CvRzTBM3IZoxIQfoWYsnnyt/rBQ7y9euWDC9WdZhAu9ftzCklLNWd0kWkVWg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=ZCH3wl5OaaGz6ySgdvFAmfFylV0qeMUvaQlY8ZSvkAI=; b=Y x++7vGpHyBO4zafLs7Xyh8uF0CXuLnuCSAp3DqNGMQNL3d1LfjfbZ4oX+kxXY0ZMXef6ehoEMGPPq 4pjLPpGp7CdIOvdbRukMryJJmUFfH8fdoDs/lYELJYu0/uuY1PJqYXehWXu4pBCm4PE3BXXXOmUrq OGlIZBMeYJ68fIDg=; Received: from mail-lj1-f178.google.com ([209.85.208.178]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1pfgNQ-001aHj-Il for openvpn-devel@lists.sourceforge.net; Fri, 24 Mar 2023 12:18:38 +0000 Received: by mail-lj1-f178.google.com with SMTP id e21so1522573ljn.7 for ; Fri, 24 Mar 2023 05:18:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679660309; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZCH3wl5OaaGz6ySgdvFAmfFylV0qeMUvaQlY8ZSvkAI=; b=c7eU6U4eQE6mCslhC21MPZadpnWGnPiCC/KvppG4CduIny7TaFjdhlqhYMtrBTBC7K VzW0c4wlTuE9BigKtmu1D+jLZ0LvbFUCNv67vDFYZdFbuhiYgX/NNYEJMVRz3IRY0Vgu RiTvh3LE6s1FcpFJTsfbFbICnQi5W16TJAGsuKeubn3Jsnl9NLohmiODomna/UNxbfed pPw/uwK36TksNZcvDUoHhr3L6Zp2iJ5/diMtutkGVzbLGorvbHOPETjESUxe6J0x1TEq tWRYdukb55E6P13ErTHnEB5DQNm6+C+bI1sj4gQjabB2jLkPTtD4RgfexBmVMttdnC0+ JGSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679660309; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZCH3wl5OaaGz6ySgdvFAmfFylV0qeMUvaQlY8ZSvkAI=; b=AZxDjxiGk4RPnoIJ5fERfKY5Mh+poCfbmyh3pTbKzyZxsdzPJLq0W6FCy/KHNoBBdH Askpb/OYQ9Q7WjRbNFn64GCJ5SH0TwPOGyt6dN7fuPoiDA0BzQT87i+vvVeBBUHElTv2 YV9rZT44o8yTuh3FNmHjYhHFwrW8xgqGCjU393XPOtf7IDc96lDM+vpc+LPMX0MUyjOn Jfp6vZU8iyxK+PlxMJyPHOW3/q83u4l4xmv8g4mb3c1NQO3oijbAZU9CuFtdGms3smRu rRUTmzxULfMaiXIfHP9FCkIW/We7bQF1BG9U0KjZ8d67IJYgJcdVY/pm/DZvSnFKLsva ZUjg== X-Gm-Message-State: AAQBX9ftibF+IlE/HIzJgI4L1YuLUa1x/EBV899nsiKqlcCy0JBooDi8 8m1xYNFe0fDXEEAlpeXHqrZ8LWn71Mg= X-Received: by 2002:a2e:7403:0:b0:28d:97c:28e5 with SMTP id p3-20020a2e7403000000b0028d097c28e5mr843574ljc.51.1679660309457; Fri, 24 Mar 2023 05:18:29 -0700 (PDT) Received: from localhost.localdomain ([2a00:1d50:3:0:f49d:d223:9e0f:5671]) by smtp.gmail.com with ESMTPSA id e5-20020a2e8ec5000000b0029ab1f2b196sm3199065ljl.24.2023.03.24.05.18.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 05:18:29 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Fri, 24 Mar 2023 14:18:18 +0200 Message-Id: <20230324121818.2358-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.38.1.windows.1 MIME-Version: 1.0 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: From: Lev Stipakov Socket flags can be pushed, in which case they overwrite existing value. We use socket flags to distingust between DCO handle and socket on Windows. If server pushes --socket-flags, we treat DCO handl [...] Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lstipakov[at]gmail.com] -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_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.178 listed in wl.mailspike.net] -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_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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.178 listed in list.dnswl.org] X-Headers-End: 1pfgNQ-001aHj-Il Subject: [Openvpn-devel] [PATCH] Don't overwrite socket flags when using DCO on Windows 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: , Cc: Lev Stipakov Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1761251561324298626?= X-GMAIL-MSGID: =?utf-8?q?1761251561324298626?= From: Lev Stipakov Socket flags can be pushed, in which case they overwrite existing value. We use socket flags to distingust between DCO handle and socket on Windows. If server pushes --socket-flags, we treat DCO handle as socket and everything explodes. Fix by making link_socket_update_flags() update flags (like name suggests) instead of overwriting them. Also do not set TCP_NODELAY on DCO handle on Windows because it doesn't make sense. Change-Id: Ia34d73ca49041cb0ce22b84751cdbff57de96048 Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- src/openvpn/socket.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 216f2ad7..ab8cc754 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -957,7 +957,8 @@ socket_set_mark(socket_descriptor_t sd, int mark) static bool socket_set_flags(socket_descriptor_t sd, unsigned int sockflags) { - if (sockflags & SF_TCP_NODELAY) + /* SF_TCP_NODELAY doesn't make sense for dco-win */ + if ((sockflags & SF_TCP_NODELAY) && (!(sockflags & SF_DCO_WIN))) { return socket_set_tcp_nodelay(sd, 1); } @@ -972,7 +973,8 @@ link_socket_update_flags(struct link_socket *ls, unsigned int sockflags) { if (ls && socket_defined(ls->sd)) { - return socket_set_flags(ls->sd, ls->sockflags = sockflags); + ls->sockflags |= sockflags; + return socket_set_flags(ls->sd, ls->sockflags); } else {