From patchwork Wed Dec 14 13:28:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 2907 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:622a:418d:b0:3a5:7962:c21f with SMTP id cd13csp279755qtb; Wed, 14 Dec 2022 05:29:48 -0800 (PST) X-Google-Smtp-Source: AA0mqf4YotYh6vsvOK+176tFehUcuWxKGyFuMFn2pbU3+F454ES0sAeq7tPU1zOZqKG90L5x5h5V X-Received: by 2002:a17:90a:f982:b0:219:9bae:6026 with SMTP id cq2-20020a17090af98200b002199bae6026mr25004227pjb.45.1671024588063; Wed, 14 Dec 2022 05:29:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671024588; cv=none; d=google.com; s=arc-20160816; b=WEzpVbBhD/riLaAdUQISPyB5Z4Vc5KoVYAuQO8b8AprMUQxCYR0Sb5Z5a2y+G+zJHf U5j774Itub12KkqGp9pjk33AK/GgL1rHwKKuoKhQqebmV+jOxLIcYVANIMLesYPxvaO0 1vVNHDjLczXCqHliI2j83ecGPjW4YedeqSOBCo1+KPzXiBM6HYRmf1cXp+sh5VtEOqmq 6+Ack0ylwDwNPeOs3OXEXt2jWhTMvvzGxk173c6AiO07luo7mscE439LfJMOygvqFkOa 3vsIJE5fuiYJOmRkbP8Qy+uzBcOTpLD3dc+RIO8OspM9Nxw7IWG2awnV06DyCska/JUu 9qKQ== 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=LKcysF6LlEYekHP6zuBLMvieZF8B/LT1Dy6+8du+hOY=; b=IFziq5i/gjLf778B22Nu7AY1sLOr7PDJ47s+31w/EzwD137iiWDoNfQbJqlTCyokgJ swXbYGZV2MNkJv6LuAu1S7oMPaWxSr/ijl379cW2z3+3wVoXetzAhl8hTGTP09Y0kQps ixP6UdbWNmpGLzJULDr35/VHCm5AvIo4xY+crQo3JRX/p/LGSnfPCcmxm7bNZLJucT5M YiCAnIzGsgKPg17Al6p7mmdtPxSHgKX/v6nYEkWha7KvhLR6ZTlTwhgyjHJdMxk39Dsz MVbm/iCW1fmj7J4uBO8+NLnx7AuHCktWvGqQjnueYXe332+uoA5JV1W0USibkNGSn9L0 2hlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=am2ZVcb4; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Fv+do4Pk; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KQoR6F1J; 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 (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id nu11-20020a17090b1b0b00b00218d51d0c92si2065299pjb.184.2022.12.14.05.29.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Dec 2022 05:29:48 -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=am2ZVcb4; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Fv+do4Pk; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KQoR6F1J; 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 1p5Rok-0000Fr-7t; Wed, 14 Dec 2022 13:29:02 +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 1p5Roi-0000Fa-OK for openvpn-devel@lists.sourceforge.net; Wed, 14 Dec 2022 13:29:00 +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=qftMYFny5zd4ICYqYsejvOiSdRwW5FOfT6buKzqCI2w=; b=am2ZVcb4bNhejLJtya7BAtK/b5 6hhW3KSB8uIEtkB8uacJL6l6Adl1F212eKSwKyY1I1iM3yR+LZnvBjGBT5MueY++WiqwcOHyev0Ce u0zW1kz05Pl93DI389TFSx6TAKz947tx8EXTP5qY6d1CVNUNvc8nyJDvllpA7o00u3EQ=; 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=qftMYFny5zd4ICYqYsejvOiSdRwW5FOfT6buKzqCI2w=; b=F v+do4PklJpYoFpMrcj5UfmY0Oc46A9AZMJaeUGafBZKMGTzBZRR1/4uLl37PXgrY5i3cY+tgI5eYE mv0Ud1CY8g1E4tDxSHOn8SbZy3eaNO2+pjad4EWcF1MmPAP+U0fnsCru9ls1mkOgPK78Nw6Q3p3TC vhoXiRikqllO4s8Q=; Received: from mail-lf1-f45.google.com ([209.85.167.45]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1p5Roh-00GsNr-WF for openvpn-devel@lists.sourceforge.net; Wed, 14 Dec 2022 13:29:00 +0000 Received: by mail-lf1-f45.google.com with SMTP id p8so10394410lfu.11 for ; Wed, 14 Dec 2022 05:28:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=qftMYFny5zd4ICYqYsejvOiSdRwW5FOfT6buKzqCI2w=; b=KQoR6F1JQJ5AX5KAaSZLBRad9tQFbGIwAoETfrCoKMJwe7U08gQMvK94/+IhBb3sA1 bDG1uJ0EYc6bYO8cOxqFlRafo9y/JtqSdhXbF7hnvQwQzLmHCYNf5M0hsXNtnqI9iSET QN+HJTL3HC80sJm1/W1k7eODHe3b/Kl5alBGDlF8Bm9Xq82zeQbMVIbtqOSxB8la3t9i ZySEG0GKNu3lWUqCml9QE5VCbftqgdQk8aTl1h+ySBecJn+w52Rr/sG2ECDBOy17tMFH oJ5F06Urc/IMgyH/TE2a4/qwOzYogF+77ihsmAQL99DL1CGRUIbBWyNqUotoypMd5NXq gM3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=qftMYFny5zd4ICYqYsejvOiSdRwW5FOfT6buKzqCI2w=; b=ak2JtD5JXY3pE+htDOb79a6m44eKq86dgfqVf6hQv6el/4prsFT5XJI8XOXUkfm2l4 KNRiLQ1dmZ7MpSZitQEYiy4o+L6ikerZcycZLFlyZqREBLhYUFsi0LWLyxvosv2q7J78 acfncIwANPzMbpSDhV86UMhxcBY4ZdoSqDgWnIMjPYVW5pIOgW0HOTwZrKeYUDidGUrr 3fc/Or6d/hZ0F8K0vWSjIqvU8N/Gi/4QGwgAxPo3fDxjaR6hOgxw1bLLAepNM2rRn5S8 mLP/Ez/JoExff94gNw/rOPNuh0rQ5ScUsVfSCSl9lcjac3DX4kZuq4a4LtP+C5ObVNPZ X9Jw== X-Gm-Message-State: ANoB5plUqC5D/LAb8LOQkCeFCxdJ3FPjbJnRTyJ5M+mzLyfFiJnFJvrg eDhRrV2EGJ/VA4pcVJOoxOuj8Y09HwY= X-Received: by 2002:a05:6512:b1c:b0:4a4:68b7:dee8 with SMTP id w28-20020a0565120b1c00b004a468b7dee8mr9206502lfu.68.1671024532919; Wed, 14 Dec 2022 05:28:52 -0800 (PST) Received: from localhost.localdomain ([2a00:1d50:3:0:98e3:e89:36b4:4465]) by smtp.gmail.com with ESMTPSA id u20-20020a196a14000000b004b4ec76016esm802443lfu.113.2022.12.14.05.28.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 05:28:52 -0800 (PST) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Wed, 14 Dec 2022 15:28:35 +0200 Message-Id: <20221214132835.1010-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 Existing API and implementation (FreeBSD only) are designed for server usage. Rename it to *_multi to indicate that and not to mix with upcoming client API/implementation. Signed-off-by: Lev Stipakov --- src/openvpn/dco.h | 4 ++-- src/openvpn/dco_freebsd.c | 2 +- src/openvpn/dco_linux.c | 2 +- src/openvpn/dco_win.c | 2 +- src/openvpn/multi.c | 4 ++-- 5 files changed, [...] Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.45 listed in list.dnswl.org] -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.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.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.45 listed in wl.mailspike.net] X-Headers-End: 1p5Roh-00GsNr-WF Subject: [Openvpn-devel] [PATCH] Rename dco_get_peer_stats to dco_get_peer_stats_multi 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?1752196278676078675?= X-GMAIL-MSGID: =?utf-8?q?1752196278676078675?= From: Lev Stipakov Existing API and implementation (FreeBSD only) are designed for server usage. Rename it to *_multi to indicate that and not to mix with upcoming client API/implementation. Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- src/openvpn/dco.h | 4 ++-- src/openvpn/dco_freebsd.c | 2 +- src/openvpn/dco_linux.c | 2 +- src/openvpn/dco_win.c | 2 +- src/openvpn/multi.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/openvpn/dco.h b/src/openvpn/dco.h index 701bbea1..9a34d5b6 100644 --- a/src/openvpn/dco.h +++ b/src/openvpn/dco.h @@ -233,7 +233,7 @@ void dco_delete_iroutes(struct multi_context *m, struct multi_instance *mi); * @param dco DCO device context * @param m the server context **/ -int dco_get_peer_stats(dco_context_t *dco, struct multi_context *m); +int dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m); /** * Retrieve the list of ciphers supported by the current platform @@ -357,7 +357,7 @@ dco_delete_iroutes(struct multi_context *m, struct multi_instance *mi) } static inline int -dco_get_peer_stats(dco_context_t *dco, struct multi_context *m) +dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m) { return 0; } diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c index 694ec539..8d342159 100644 --- a/src/openvpn/dco_freebsd.c +++ b/src/openvpn/dco_freebsd.c @@ -669,7 +669,7 @@ dco_update_peer_stat(struct multi_context *m, uint32_t peerid, const nvlist_t *n } int -dco_get_peer_stats(dco_context_t *dco, struct multi_context *m) +dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m) { struct ifdrv drv; diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index 03c3dd64..200d0b19 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -918,7 +918,7 @@ nla_put_failure: } int -dco_get_peer_stats(dco_context_t *dco, struct multi_context *m) +dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m) { /* Not implemented. */ return 0; diff --git a/src/openvpn/dco_win.c b/src/openvpn/dco_win.c index 68ec931c..675dece2 100644 --- a/src/openvpn/dco_win.c +++ b/src/openvpn/dco_win.c @@ -400,7 +400,7 @@ dco_do_write(dco_context_t *dco, int peer_id, struct buffer *buf) } int -dco_get_peer_stats(dco_context_t *dco, struct multi_context *m) +dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m) { /* Not implemented. */ return 0; diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 38da87b8..6ded9e0a 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -540,7 +540,7 @@ multi_del_iroutes(struct multi_context *m, static void setenv_stats(struct multi_context *m, struct context *c) { - dco_get_peer_stats(&m->top.c1.tuntap->dco, m); + dco_get_peer_stats_multi(&m->top.c1.tuntap->dco, m); setenv_counter(c->c2.es, "bytes_received", c->c2.link_read_bytes + c->c2.dco_read_bytes); setenv_counter(c->c2.es, "bytes_sent", c->c2.link_write_bytes + c->c2.dco_write_bytes); @@ -839,7 +839,7 @@ multi_print_status(struct multi_context *m, struct status_output *so, const int status_reset(so); - dco_get_peer_stats(&m->top.c1.tuntap->dco, m); + dco_get_peer_stats_multi(&m->top.c1.tuntap->dco, m); if (version == 1) {