From patchwork Tue Feb 22 02:28:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristof Provost via Openvpn-devel X-Patchwork-Id: 2312 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director14.mail.ord1d.rsapps.net ([172.31.255.6]) by backend41.mail.ord1d.rsapps.net with LMTP id QBCBHxnnFGLUEAAAqwncew (envelope-from ) for ; Tue, 22 Feb 2022 08:37:29 -0500 Received: from proxy6.mail.iad3b.rsapps.net ([172.31.255.6]) by director14.mail.ord1d.rsapps.net with LMTP id 4OE8MxnnFGK9MwAAeJ7fFg (envelope-from ) for ; Tue, 22 Feb 2022 08:37:29 -0500 Received: from smtp16.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy6.mail.iad3b.rsapps.net with LMTPS id iP45KxnnFGJ+KgAARawThA (envelope-from ) for ; Tue, 22 Feb 2022 08:37:29 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp16.gate.iad3b.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=netgate.com; dmarc=pass (p=none; dis=none) header.from=lists.sourceforge.net X-Suspicious-Flag: YES X-Classification-ID: 94056ed2-93e4-11ec-a465-5254004ed364-1-1 Received: from [216.105.38.7] ([216.105.38.7:55250] helo=lists.sourceforge.net) by smtp16.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id E0/2F-32148-917E4126; Tue, 22 Feb 2022 08:37:29 -0500 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nMVLR-0008Gk-49; Tue, 22 Feb 2022 13:36:43 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nMVLP-0008Ga-Ud for openvpn-devel@lists.sourceforge.net; Tue, 22 Feb 2022 13:36:42 +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=74M2B/wGHTq8ACsqjXMwt0oClAO+2MgNhSjW1zajAj4=; b=SdalTdfLLVuG+mVCiKqh2aeVmn s+M+FXAUQ0ChbA6Lc/mNLrKnuNHFeN42KJ8xJ5I8Wvu/J7CgcjXfJCQkRglQnY1ztprdew8EBUE2f 9gPlbplGPmLip+iTywt3bWLIlOGxMqlRcpX48boj1oEfe4+DiHVn78vliVjx6/mllWOg=; 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=74M2B/wGHTq8ACsqjXMwt0oClAO+2MgNhSjW1zajAj4=; b=C7DuYJJVWDEqaoLU/Fo0waDJP9 Z3XsOkolgRDOwoODPpPFYrryilg/QKDwfYMX2UEyMC3sCBL/cE3kE0XO4VLy2UpchixrluW7PdmCg LTA5yBKYwKGN67Vt1yi4/wjSBmIvrjMK16TdDpWWTCGSqgfTQe6ktPoyxJKfa4+ml6fc=; Received: from mail-ej1-f47.google.com ([209.85.218.47]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.94.2) id 1nMVLK-0007oI-CQ for openvpn-devel@lists.sourceforge.net; Tue, 22 Feb 2022 13:36:42 +0000 Received: by mail-ej1-f47.google.com with SMTP id gb39so43115362ejc.1 for ; Tue, 22 Feb 2022 05:36:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netgate.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=74M2B/wGHTq8ACsqjXMwt0oClAO+2MgNhSjW1zajAj4=; b=NAGnRmNAYIYGerh42shmX1kkiQAbFy+vH7a7TIvlfwSOrNqPnhKvOqmmjOyJI2a3sF sIKlufIjupS2OK2ZpI5qoldpgy2KjcBFf5EBkxPb/WQ+UB3WRfkD8mXUxrCHJWb0/tFJ nfGX3Ik95zm0v7FVeRUoyKp/zG9oHscBIpjnc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=74M2B/wGHTq8ACsqjXMwt0oClAO+2MgNhSjW1zajAj4=; b=Dpkd/gKDKGzuQOZv2OvE7WuXCnlc43hlbcVLfZRaCg5MsOcRMnwJGNaTVZ8VTOnytu Hsu3dE4jQ/0bU6TKgLOtqKcQd4l73NFCVF3nhYA36haDo57AGcf9/6ZsaTi0mSZAunfF SIqx2917GzVN+ie5C9/nvw83rSVTR9cEKWFUvDm0DoKjhetUWQSJ8+6X3Aer+WboBb0l SFUtLkXB8ECwKafahTL3UcKimARZ60aTcbSSvndq5QLowRwdAlTZp8Ym5/6tUCnx3SnH UVg96nd+3AoWZsHdt176MYysVAuMWxvTxLpmqV07QirFMlrDYWPqT9NIOqxv3WJ6UrPu bPwg== X-Gm-Message-State: AOAM530vN4+6vI6deFZH03DIZNToaJMmSnWF0n/vJYMI+pqeCFP7iLKT cXX22s2XMFcDmUuqMKrJSppL+45AKPIrHzI6 X-Google-Smtp-Source: ABdhPJydnJSX3fk4lsMXAAvc3qCozEPsAYchZQ2a0384X8nDg62OleuF+u9Ap6ZK5iQ3ShnN7NJ0cg== X-Received: by 2002:aa7:c60d:0:b0:404:abd9:d645 with SMTP id h13-20020aa7c60d000000b00404abd9d645mr25551951edq.227.1645536507641; Tue, 22 Feb 2022 05:28:27 -0800 (PST) Received: from nut.jupiter.sigsegv.be (ptr-8rgvk5277arubwggeqg.18120a2.ip6.access.telenet.be. [2a02:1811:240d:2900:f602:70ff:feae:6e98]) by smtp.googlemail.com with ESMTPSA id r3sm6366846ejd.129.2022.02.22.05.28.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 05:28:27 -0800 (PST) To: openvpn-devel Date: Tue, 22 Feb 2022 14:28:22 +0100 Message-Id: <20220222132824.18935-2-kprovost@netgate.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222132824.18935-1-kprovost@netgate.com> References: <20220222132824.18935-1-kprovost@netgate.com> MIME-Version: 1.0 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: Kristof Provost Fix typo in variable name. Signed-off-by: Kristof Provost --- src/openvpn/dco_linux.c | 6 +++--- src/openvpn/dco_linux.h | 2 +- src/openvpn/multi.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.47 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.218.47 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_AU Message has a valid DKIM or DK signature from author's 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 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1nMVLK-0007oI-CQ Subject: [Openvpn-devel] [PATCH 1/3] dco: dco_meesage_peer_id -> dco_message_peer_id 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: , X-Patchwork-Original-From: Kristof Provost via Openvpn-devel From: Kristof Provost via Openvpn-devel Reply-To: Kristof Provost Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Kristof Provost Fix typo in variable name. Signed-off-by: Kristof Provost --- src/openvpn/dco_linux.c | 6 +++--- src/openvpn/dco_linux.h | 2 +- src/openvpn/multi.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index 9fddb788..341e9ae7 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -436,7 +436,7 @@ open_tun_dco(struct tuntap *tt, openvpn_net_ctx_t *ctx, const char *dev) tt->actual_name = string_alloc(dev, NULL); uint8_t *dcobuf = malloc(65536); buf_set_write(&tt->dco.dco_packet_in, dcobuf, 65536); - tt->dco.dco_meesage_peer_id = -1; + tt->dco.dco_message_peer_id = -1; ovpn_dco_register(&tt->dco); @@ -742,7 +742,7 @@ static int ovpn_handle_msg(struct nl_msg *msg, void *arg) msg(D_DCO_DEBUG, "ovpn-dco: received CMD_DEL_PEER, ifindex: %d, peer-id %d, reason: %d", ifindex, peerid, reason); - dco->dco_meesage_peer_id = peerid; + dco->dco_message_peer_id = peerid; dco->dco_del_peer_reason = reason; dco->dco_message_type = OVPN_CMD_DEL_PEER; @@ -788,7 +788,7 @@ static int ovpn_handle_msg(struct nl_msg *msg, void *arg) } buf_init(&dco->dco_packet_in, 0); buf_write(&dco->dco_packet_in, data, len); - dco->dco_meesage_peer_id = peerid; + dco->dco_message_peer_id = peerid; dco->dco_message_type = OVPN_CMD_PACKET; break; } diff --git a/src/openvpn/dco_linux.h b/src/openvpn/dco_linux.h index 94e1a522..61d07a55 100644 --- a/src/openvpn/dco_linux.h +++ b/src/openvpn/dco_linux.h @@ -51,7 +51,7 @@ typedef struct struct buffer dco_packet_in; int dco_message_type; - int dco_meesage_peer_id; + int dco_message_peer_id; int dco_del_peer_reason; } dco_context_t; diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index cf44dd58..30489038 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3124,7 +3124,7 @@ static void process_incoming_dco_packet(struct multi_context *m, struct multi_instance *mi, dco_context_t *dco) { struct buffer orig_buf = mi->context.c2.buf; - int peer_id = dco->dco_meesage_peer_id; + int peer_id = dco->dco_message_peer_id; mi->context.c2.buf = dco->dco_packet_in; @@ -3184,7 +3184,7 @@ multi_process_incoming_dco(struct multi_context *m) int ret = dco_do_read(&m->top.c1.tuntap->dco); - int peer_id = dco->dco_meesage_peer_id; + int peer_id = dco->dco_message_peer_id; if ((peer_id >= 0) && (peer_id < m->max_clients) && (m->instances[peer_id])) { @@ -3204,7 +3204,7 @@ multi_process_incoming_dco(struct multi_context *m) } dco->dco_message_type = 0; - dco->dco_meesage_peer_id = -1; + dco->dco_message_peer_id = -1; return ret > 0; } #endif