From patchwork Fri Oct 17 20:58:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4519 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:7d42:b0:72f:f16c:e055 with SMTP id fr2csp4750675mab; Fri, 17 Oct 2025 13:58:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWpctuYBPPZhZMX7CYrOX5gDhN3MmF6RKYRLq7OBbv1DoycCKBnnnrBcSYbWn+GGWK0ZXXezoAElHU=@openvpn.net X-Google-Smtp-Source: AGHT+IF7Lm9x121hVZjS36WOA8HaWcPRX7wD8xRwSZ1AG8HrC5H8LUkcyQh5wfbT0nkD59hSvwLy X-Received: by 2002:a05:6830:34aa:b0:745:9a33:bad1 with SMTP id 46e09a7af769-7c27c9ee568mr2495055a34.7.1760734732573; Fri, 17 Oct 2025 13:58:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1760734732; cv=none; d=google.com; s=arc-20240605; b=k0rM676Sxss3mQJlIugsw67M2yW/LWQo3+lZmyhNq5fuRQI2MxFS3KLn4WlsyD1nEr uZ3/DNWQM2betOmFb2UskS5jZYsLNQckBeNblnLjOQo/4mdaA8W0CkGci7RuicJgc0t5 S9eeL1OOTlRPCXdAXPcY5FxJXussvr0LxD0vZASocJhXkLL3OmpgshPvf9UL+0ZZjTZS nxHC++frmlHX/s+CQtSr+YhD3YU6O8/Li81TpL7u+Bz8xLrHf8ah6Plxe0tjvtOP71UF mbUZxcme0dEXFNsotcS1/NsN0+4O6cEh/wacHcrIk6RcdupkH1U65V2nHRLj1ErBuKXb w1pg== 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; bh=a4PXnW2Z7zWydQ2GJ6CvHVaoDem3gZSeDK7qHQ+ZMYs=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=i5rRLgKwhdaWbiItM28B5i20T8/yv60FEMaVqHjNG7dfHKd8i7Skoj6MDY/isHsXbf QydjM+LzMLf7c6263J1/0fTReoMVDoxgllHuRjfdxBsPd+RVHR4SWdR3Qp8AlJxO/wQC edZ61s2igWvap4wskhB2//ZaYqBdfiUseuTHV1VkWfMfgkLfYTrEYJICIIoqKn2TodfS nR3aroC3hWb5oG1oOlX83DJKtAQFQuWXDqFbIZWJHQojYGS8vjHsABBiHc02HtzjC1dS mICoW0XjPukZlzkyQ2dKOoh5+tWWiQDUBXTFjL77+J66AOmUOrtD3jQYRSOn7n1ZbzWa +VzQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=cdgzJ49X; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=KsUADS05; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=YUifGwGd; 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=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 46e09a7af769-7c288903c91si141893a34.260.2025.10.17.13.58.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Oct 2025 13:58:52 -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=cdgzJ49X; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=KsUADS05; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=YUifGwGd; 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=muc.de 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=a4PXnW2Z7zWydQ2GJ6CvHVaoDem3gZSeDK7qHQ+ZMYs=; b=cdgzJ49XQ5CnCCeHJgtV1vflIC 6kS2UFUaVwGnLZ4L2ie69q1NgWWBmRuladmVwjCeVrvUJ5c2PbLDqqOIIJsowzltWnsGEeJfW7kM6 U8VStYoxPiMUjNp2TEriFvbtGoy0Zo6+bxHPtOunOoOS6FTNdoW14maaV/1kvjIjTg6c=; 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 1v9rXG-0005iM-Qt; Fri, 17 Oct 2025 20:58:50 +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 1v9rXF-0005iG-S8 for openvpn-devel@lists.sourceforge.net; Fri, 17 Oct 2025 20:58:49 +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:To:From:Sender:Reply-To:Cc: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=C32vs7x8Dkukz6yZiouhagCrQDETl80AECEx2NjVuS4=; b=KsUADS05Y6w+piX4LU9pxjXp0v YeYaQ/g4PzHkOrG5uQ74Rgg20dXQTNpjsgzx4drli+HxlP1KtArKH7S11W2nTT8+CJbHbjnQm7izq rEa3IVv4gi9PoAka5KCSAoHJ7nacXVlixMJVYrLxIhDPFU3xESru3NHAfmnEEH5qaPyw=; 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:To:From:Sender:Reply-To:Cc: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=C32vs7x8Dkukz6yZiouhagCrQDETl80AECEx2NjVuS4=; b=YUifGwGd11IRhhc0WRAjMaba4V h3vD71l6eg/i2sWXk80mV0PKmJYNBhPfTtv0SNCUCfHOybDfvDXaUZEArKUQ3xWS+BxIKmaC7uKut mbigbsVA+fTn1iP/THxKc0d7MGMEKvZ+rFh8STST8N9SLwiBZukOdIwv3eRWHj94QtJY=; Received: from [193.149.48.134] (helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1v9rXE-0006Yj-W4 for openvpn-devel@lists.sourceforge.net; Fri, 17 Oct 2025 20:58:49 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.18.1/8.18.1) with ESMTP id 59HKwbSs008569 for ; Fri, 17 Oct 2025 22:58:37 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 59HKwbHc008568 for openvpn-devel@lists.sourceforge.net; Fri, 17 Oct 2025 22:58:37 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Fri, 17 Oct 2025 22:58:31 +0200 Message-ID: <20251017205837.8553-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.49.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 1.3 (+) 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: Ralf Lici Remove dco_read_bytes and dco_write_bytes from all dco_context_t structures, as peer statistics are now stored directly in the corresponding c2 fields across all DCO interfaces. Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1v9rXE-0006Yj-W4 Subject: [Openvpn-devel] [PATCH v2] dco: remove dco_read/write_bytes from dco_context_t 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?1846264183053972034?= X-GMAIL-MSGID: =?utf-8?q?1846264183053972034?= From: Ralf Lici Remove dco_read_bytes and dco_write_bytes from all dco_context_t structures, as peer statistics are now stored directly in the corresponding c2 fields across all DCO interfaces. Change-Id: I61f9d9bb26112eac0c0a47cb9d17982b075887ff Signed-off-by: Ralf Lici Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1276 --- 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/+/1276 This mail reflects revision 2 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/src/openvpn/dco_freebsd.h b/src/openvpn/dco_freebsd.h index 2f486f0..0797b82 100644 --- a/src/openvpn/dco_freebsd.h +++ b/src/openvpn/dco_freebsd.h @@ -59,8 +59,6 @@ int dco_message_peer_id; int dco_del_peer_reason; struct sockaddr_storage dco_float_peer_ss; - uint64_t dco_read_bytes; - uint64_t dco_write_bytes; struct context *c; } dco_context_t; diff --git a/src/openvpn/dco_linux.h b/src/openvpn/dco_linux.h index 310d433..efd5b27 100644 --- a/src/openvpn/dco_linux.h +++ b/src/openvpn/dco_linux.h @@ -81,8 +81,6 @@ int dco_message_key_id; int dco_del_peer_reason; struct sockaddr_storage dco_float_peer_ss; - uint64_t dco_read_bytes; - uint64_t dco_write_bytes; } dco_context_t; #endif /* defined(ENABLE_DCO) && defined(TARGET_LINUX) */ diff --git a/src/openvpn/dco_win.h b/src/openvpn/dco_win.h index 4f3f028..02b8389 100644 --- a/src/openvpn/dco_win.h +++ b/src/openvpn/dco_win.h @@ -55,9 +55,6 @@ int dco_del_peer_reason; struct sockaddr_storage dco_float_peer_ss; - uint64_t dco_read_bytes; - uint64_t dco_write_bytes; - struct context *c; }; diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 2863ff1..053c54d 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3266,8 +3266,6 @@ * installed, and we do not need to clean up the state in the kernel */ mi->context.c2.tls_multi->dco_peer_id = -1; mi->context.sig->signal_text = reason; - mi->context.c2.dco_read_bytes = dco->dco_read_bytes; - mi->context.c2.dco_write_bytes = dco->dco_write_bytes; multi_signal_instance(m, mi, SIGTERM); } @@ -3337,8 +3335,6 @@ dco->dco_message_type = 0; dco->dco_message_peer_id = -1; dco->dco_del_peer_reason = -1; - dco->dco_read_bytes = 0; - dco->dco_write_bytes = 0; return ret > 0; } #endif /* if defined(ENABLE_DCO) */