From patchwork Wed Mar 22 11:32:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 3149 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:2310:b0:9f:bfa4:120f with SMTP id r16csp3121554dye; Wed, 22 Mar 2023 04:33:49 -0700 (PDT) X-Google-Smtp-Source: AK7set95pi18JsleNBVLNdHkv1SsbjmpSGe1YxSzX+j6XXWSc6Tn5dZ05K9q4ThRoJVZbBh9xvrt X-Received: by 2002:a17:90b:17cb:b0:23f:5fe7:25a1 with SMTP id me11-20020a17090b17cb00b0023f5fe725a1mr3446398pjb.13.1679484829264; Wed, 22 Mar 2023 04:33:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679484829; cv=none; d=google.com; s=arc-20160816; b=o3lqYgDJUvNVLEtX/Lci5ZLnBA3NYckg40odG5ewK6070vEzCh7VPwK9bTH+OOK+Xk T3JOUPD18Yw65vX38ItnlHtvAwf3Lkp1tXrStSqnO5J1Wsh1UcPaRucCKlV7u59NYXhi 8G66veauxBSPhZHi9UN7y7ihL6UFh5KGBpF9DkaDtWiyW65J95RmS6MstDBnV5etpASi RB8SWGNjDr/GNZna3d3WFZSp+vpmMpvcSxbuqFwtCNHjLaxh2AV1NOZZnyATOee82A3D NtxBTaUaZZXT1Mkjgdektp51GGF+W+1G0ziqqzdNhw6j0Yjmo70msJZyfvVICQCqrmfx hDtQ== 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=/RQ0FendLavjNAKqLnyRLnBAprYqh5jEsK7wq1eCxlQ=; b=i7FTwpX5Z/XwOpPx3vq6X/lhzdISggGms0Tcc/bQL2AR0Vp/HKLjExQtA1chyyNYFa y6PT1MAYsdZe1kI+x8YQt2ypr+aPGEDdacsIho6qpnN0mFBCKHMgHuQmWQNBwQBsGrIG Lz0xooyXRzWwFJr6Aczz1KudYiE9FY8zmG2wYrZgGwvqNQofD4m6ldeX/AfMBJM7nXio 2j0nUSE2ZfKjWumd8/QlSXPBQhSmhDku/+Tq4ZwACXf7L9zAmaZmclzk4GOuDgSzvj03 b6Ge4Qsb+qAA2l5u8qK9WAYigh8S1xoF2LpA3eXWPq8La8aFa/GcFz4gmzWeBl+fasBz HLBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=lpqrkGlq; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=NJCs2PYk; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=k957tiOr; 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 y23-20020a63de57000000b0050fad5c9f36si3917966pgi.354.2023.03.22.04.33.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2023 04:33:49 -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=lpqrkGlq; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=NJCs2PYk; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=k957tiOr; 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-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pewiQ-0007iC-GM; Wed, 22 Mar 2023 11:33:16 +0000 Received: from [172.30.20.202] (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 1pewiP-0007i6-H4 for openvpn-devel@lists.sourceforge.net; Wed, 22 Mar 2023 11:33:15 +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=YTFK5IzpfjHb/e2FaOZzW/krIdOcXgHH3UO3OypgWGg=; b=lpqrkGlqyXbtDG/D2byvXFgQd1 BwQT7/ZtCmzQg09yA/jvWd4UaWorvT3niScOWta77OcX8Fbzjq7KBetYInJxc9iaPiPCpgHKI4bQN lLQ6e2Wya42TKz6GKDflpnEEDGp9qju/XAz06bID2FIVrxQE0W2XAx+wM04Ygv7PAldo=; 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=YTFK5IzpfjHb/e2FaOZzW/krIdOcXgHH3UO3OypgWGg=; b=N JCs2PYk5vBYeL8sfxT/vllH+RlcnSidViR8lZZxludAD8xn5X6cjnwTkO2yBtuc0dzP8dBV3Hr1lx XPYWXC6oPDbU10BipgJ+NpBEH7yGvvm7Y3zF5J2Ks+umipxobBhDNVEv9UJZhXNQXQ1zjFCnV3Jtc fV6srr0BeQJB7CAA=; Received: from mail-lj1-f179.google.com ([209.85.208.179]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1pewiP-00GUjn-PL for openvpn-devel@lists.sourceforge.net; Wed, 22 Mar 2023 11:33:15 +0000 Received: by mail-lj1-f179.google.com with SMTP id 20so11421667lju.0 for ; Wed, 22 Mar 2023 04:33:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679484787; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=YTFK5IzpfjHb/e2FaOZzW/krIdOcXgHH3UO3OypgWGg=; b=k957tiOr8tFQpJPgyGy//mteuzLGrt9dEfQXNAs9KxZkLso59BEk7PQgYmRPFT5EAa yFG0X5LUlHY9CTXo/GA5wlmVf/CssDouAQFvcGC+5ZQCY9gKX2XnIzWnGnRYtxvJ9NSG 4/cBweq/sRBCfdZMb6Tao9+d0ItCwYb2IgG4zEF4yRlqmWo8GnHVRWlFSxhBJMIdBeoA gfsAPeN8KOp+ocQtBsnt6QVoAcpOZWyhwejPcoSHyW+dmG3nGYtcqgnIuNZSE1/HjeHZ rwVjx7Lx5RkIdLL83yVIDCBj7+f70lzMIpkRkzloNvgTuJFnsHSbZ5lLid506T2cy4Kw BDOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679484787; 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=YTFK5IzpfjHb/e2FaOZzW/krIdOcXgHH3UO3OypgWGg=; b=TTGleTRhy7ZEZmu7eEa/BU9E8s6s4E0rKHYcgav9yWewIYimA+U6zSSpU4F4FdTH1N Dghgg8puklvGgSsonLpYgb6rLxYzOsJF+Y88uht2GFMWZXolwad3OwpRzhxtC0PutAZJ 9DbVyY7fmbOm42rZ/33S1KH+ynl/4ibjFD+W7ApjnVx9sXyW0PtKw6Iw109txz23POSq Ksty3B7aIBseNg/sdnxKK8LZwvVzZVFgDVnmixdCkOo9s1ML+MVehfvsaSiHuVsq3Q/A ddaERDD8dYt10CrYI6PTTV1mtYjiuetrWHsVnvjgJPCUYezR3/kV2HZ7d7s0NWcI5GPG OnYQ== X-Gm-Message-State: AO0yUKV/shUXT6tSU8cq7Do21Iglll1RtjZPXwsHeFwaCNcyrDM2ONHg tDnVfDrGfQUWJJpcTH0zJLZkrOd+nJo= X-Received: by 2002:a2e:6816:0:b0:299:2b6d:6e90 with SMTP id c22-20020a2e6816000000b002992b6d6e90mr2063418lja.34.1679484786515; Wed, 22 Mar 2023 04:33:06 -0700 (PDT) Received: from localhost.localdomain ([2a00:1d50:3:0:f49d:d223:9e0f:5671]) by smtp.gmail.com with ESMTPSA id c14-20020a05651c014e00b0029913364649sm2583009ljd.11.2023.03.22.04.33.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 04:33:06 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Wed, 22 Mar 2023 13:32:49 +0200 Message-Id: <20230322113249.2039-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-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: From: Lev Stipakov Change-Id: I465febdf7ee5fe573e88255844f718efb60f8e8a Signed-off-by: Lev Stipakov --- src/openvpn/sig.c | 13 +++++++++---- src/openvpn/sig.h | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lstipakov[at]gmail.com] 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.208.179 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.179 listed in wl.mailspike.net] -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.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-Headers-End: 1pewiP-00GUjn-PL Subject: [Openvpn-devel] [PATCH] Print DCO client stats on SIGUSR2 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?1761067484651809519?= X-GMAIL-MSGID: =?utf-8?q?1761067484651809519?= From: Lev Stipakov Change-Id: I465febdf7ee5fe573e88255844f718efb60f8e8a Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- src/openvpn/sig.c | 13 +++++++++---- src/openvpn/sig.h | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/openvpn/sig.c b/src/openvpn/sig.c index 5b89bb42..05c0054b 100644 --- a/src/openvpn/sig.c +++ b/src/openvpn/sig.c @@ -300,18 +300,23 @@ restore_signal_state(void) * Triggered by SIGUSR2 or F2 on Windows. */ void -print_status(const struct context *c, struct status_output *so) +print_status(struct context *c, struct status_output *so) { struct gc_arena gc = gc_new(); status_reset(so); + if (dco_enabled(&c->options)) + { + dco_get_peer_stats(c); + } + status_printf(so, "OpenVPN STATISTICS"); status_printf(so, "Updated,%s", time_string(0, 0, false, &gc)); status_printf(so, "TUN/TAP read bytes," counter_format, c->c2.tun_read_bytes); status_printf(so, "TUN/TAP write bytes," counter_format, c->c2.tun_write_bytes); - status_printf(so, "TCP/UDP read bytes," counter_format, c->c2.link_read_bytes); - status_printf(so, "TCP/UDP write bytes," counter_format, c->c2.link_write_bytes); + status_printf(so, "TCP/UDP read bytes," counter_format, c->c2.link_read_bytes + c->c2.dco_read_bytes); + status_printf(so, "TCP/UDP write bytes," counter_format, c->c2.link_write_bytes + c->c2.dco_write_bytes); status_printf(so, "Auth read bytes," counter_format, c->c2.link_read_bytes_auth); #ifdef USE_COMP if (c->c2.comp_context) @@ -402,7 +407,7 @@ remap_signal(struct context *c) } static void -process_sigusr2(const struct context *c) +process_sigusr2(struct context *c) { struct status_output *so = status_open(NULL, 0, M_INFO, NULL, 0); print_status(c, so); diff --git a/src/openvpn/sig.h b/src/openvpn/sig.h index 4858eb93..b09dfab6 100644 --- a/src/openvpn/sig.h +++ b/src/openvpn/sig.h @@ -69,7 +69,7 @@ void restore_signal_state(void); void print_signal(const struct signal_info *si, const char *title, int msglevel); -void print_status(const struct context *c, struct status_output *so); +void print_status(struct context *c, struct status_output *so); void remap_signal(struct context *c);