From patchwork Fri Sep 12 13:10:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Lichtenheld X-Patchwork-Id: 4407 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:b149:b0:671:5a2c:6455 with SMTP id s9csp3795414maw; Fri, 12 Sep 2025 06:11:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXJflbdFkvS+ui1IpNfEBBA3UmF+IUNTI9dDFUV9Nri7PhVUEDcrVYYAcQEmmd0go6HSZaeOSCupQo=@openvpn.net X-Google-Smtp-Source: AGHT+IHKaK13N+pM3rc+iMUAuMNBmW3mg200WPqfx9fvuqAJJCZ5FMgebVCGemdQoA/aw1CCar02 X-Received: by 2002:a05:6871:a6a6:b0:31d:8c33:59c0 with SMTP id 586e51a60fabf-32e572f2679mr1364544fac.29.1757682676689; Fri, 12 Sep 2025 06:11:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1757682676; cv=none; d=google.com; s=arc-20240605; b=i40QuwFM/YjKeGytVUttZl7N+jtSO/r9BrsCrQNW4AlMJND8CtVRr1v9qjdfgxefj2 Ejz7NL/i/aV90HvhCgOSqt6cnaVdoWxwqFPC9w6/Un+AsJT5n7iU2UxNZ1WyBEvxNlZZ VOzwlbPj9Hrr1pGhnM3jSeoJGKt4xFCNoA7DawQIBtg5wXmuRNMWoAH3khx5XdhCGC7/ dBknVOLs/KtscR9whAFhJxqaatiGz88wdO5w4mUnhS6CEM9BGOc0NNZfQb8mhO3xnmE0 bf3IAMPSnLCSHG50agKuXvuR7mNcgzo0hGP8oKGs/79LrkMrpqf4k5f3c/KS8MIuxNaa m+FQ== 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:dkim-signature; bh=pfn7+rWxS9Hmz2L4f2BjhU0BepxtsKbXPBsAXfpMKGo=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=EeA85z/E5txgATZJJf2YlHOkvGQWK2rBHjpfai5FNTq4T8Nijt3QB6BZeH9kBVSkrp JAltj2bF7By9Ys2CyFujHSicIv3BsPY5rQA8kuNcfEqec1BYclndvqy1iBdhtpD29cbS vBM7wtPjjUObhIujnLFmmmHOfTtDSEKWYodOv+PYNoRt06Qpzp8sWzuftJhqACikyDbQ F1xeKdGc6jBQFMLZK6A4PTxEmK1i+a3LcwuvjzVL7jEnGcgZ5OsUXp1zd6Z/gqsNWgjL 70aFAl/IPYEnfbgaPar5lZoMBNGD5MMM1qpQbUVkjUMo/BKiXBsR4zjodPisq4G4bAp4 dLdA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=dwocEHoA; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Bj39cofZ; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="g1zSUC1/"; dkim=neutral (body hash did not verify) header.i=@lichtenheld.com header.s=MBO0001 header.b=F3eXBV1T; 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 Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 586e51a60fabf-32d359dd95dsi1064728fac.233.2025.09.12.06.11.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Sep 2025 06:11:16 -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=dwocEHoA; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Bj39cofZ; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="g1zSUC1/"; dkim=neutral (body hash did not verify) header.i=@lichtenheld.com header.s=MBO0001 header.b=F3eXBV1T; 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 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=pfn7+rWxS9Hmz2L4f2BjhU0BepxtsKbXPBsAXfpMKGo=; b=dwocEHoAuJ7K7QyzJIJWvmeOZw zpiRc3oWAuojGlhn320sARb+qR5JnKl1NkonuUat0Asg37BVq0A8SIxC7JWD+4fWx/HOMkuHA21ij YvHKnW7QRxTDOK1/u3iQgQiERdkV9Cy7u4+N8gUQJL3oDiMrmLmZi4BSZqJfzyPDwE4o=; 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 1ux3YY-0006pX-2I; Fri, 12 Sep 2025 13:11:14 +0000 Received: from [172.30.29.66] (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 1ux3YW-0006pN-Mb for openvpn-devel@lists.sourceforge.net; Fri, 12 Sep 2025 13:11:12 +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: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=qEAInDLuOUj9CN0dEQQfbV+tLmvHceoWIsmMudfJUtU=; b=Bj39cofZZiO/Ee1CB/7nyqaCFV mi3T8TwTH6Z9Hacuz4ulztCbw3ve/D8UodkwooyF4VR+jra4AVY60J6L45TjvOXBCO8t4wL3w3JC+ qN3DA2aq+CfsgmlFRsQsTDWj8Nl55j3FPn7jnXyFmho16H/Myu2onay9CDX3AJU6YWHU=; 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: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=qEAInDLuOUj9CN0dEQQfbV+tLmvHceoWIsmMudfJUtU=; b=g1zSUC1/CeaKJNNckqbG8Qg3hi onq45jXBr/W/q1mzgl/AgqQ26p/AqIwi7AoFbMXhJY9HcR/+DXOeYtLXtA1NLcgL08ldBO8v2k4jv YuuhGW+IdvISa3ao65sCtN40jfZb7X2/ZfzJM5a1rzwUD3cNhs/mzjJbYba9ZZdt30Js=; Received: from mout-p-201.mailbox.org ([80.241.56.171]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1ux3YW-0000q0-0s for openvpn-devel@lists.sourceforge.net; Fri, 12 Sep 2025 13:11:12 +0000 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4cNZYY6tBvz9tWk; Fri, 12 Sep 2025 15:10:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lichtenheld.com; s=MBO0001; t=1757682658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qEAInDLuOUj9CN0dEQQfbV+tLmvHceoWIsmMudfJUtU=; b=F3eXBV1TODad+468Kq+Fu3ilwSsHos4KFWDWEKwREHrLf0Nw3BEjYKrFX4FMMwxxAHbWXv VBQUpbX49lmyaqeUvaMrTZJ6rTGDsTP+Mh44rh+AgfLrVEettk7t146QuROJuTgjuvfuvG PTleJlTk6X/6b3FXroMI3nqJQH62S5feXowYJvX0rsUWTfMw8NokUx6gSjXWlrVA71M9ii 9HMrBIcCqVDXB0C8ZsQkAWkD8N9s/Xth8GEU+6hRxUY6bT5QT+6zch+1GR6W5yXjEPNbwv OWKXgZe+w2/TDh3hVE3kaebgF+hgnjwNnYop9ND20V3rGG5PYZd3MFgm3C3X7g== Authentication-Results: outgoing_mbo_mout; dkim=none; spf=pass (outgoing_mbo_mout: domain of frank@lichtenheld.com designates 2001:67c:2050:b231:465::2 as permitted sender) smtp.mailfrom=frank@lichtenheld.com From: Frank Lichtenheld To: openvpn-devel@lists.sourceforge.net Date: Fri, 12 Sep 2025 15:10:56 +0200 Message-Id: <20250912131056.42342-1-frank@lichtenheld.com> In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 4cNZYY6tBvz9tWk X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-1.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: Gianmarco De Gregori The dco_check_option_ce(), for dco_win, checked only the global protocol of the current connection entry, but now it should be extended to the local_list and since dco_win does not support more than 1 [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -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_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [80.241.56.171 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Headers-End: 1ux3YW-0000q0-0s Subject: [Openvpn-devel] [PATCH v1] Fix multi-socket and dco-win interaction 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?1843063870231613074?= X-GMAIL-MSGID: =?utf-8?q?1843063870231613074?= From: Gianmarco De Gregori The dco_check_option_ce(), for dco_win, checked only the global protocol of the current connection entry, but now it should be extended to the local_list and since dco_win does not support more than 1 socket, checking the first entry of the local_list will be enough. Change-Id: I74e2b6aed3c7454e897db57f777e6a191be3d87f Signed-off-by: Gianmarco De Gregori Acked-by: Lev Stipakov --- 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/+/1173 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Lev Stipakov diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c index 1abebbb..70a8c0a 100644 --- a/src/openvpn/dco.c +++ b/src/openvpn/dco.c @@ -268,7 +268,7 @@ #endif #if defined(_WIN32) - if (!proto_is_udp(ce->proto) && mode == MODE_SERVER) + if (!proto_is_udp(ce->local_list->array[0]->proto) && mode == MODE_SERVER) { msg(msglevel, "NOTE: TCP transport disables data channel offload on Windows in server mode.");