From patchwork Tue Jan 3 20:23:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 2971 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:c95:b0:82:e4b3:40a0 with SMTP id p21csp7196803dyk; Tue, 3 Jan 2023 12:23:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXshhGS4xBWTtsTlCxjkQPOgeOEEM6kzTAXqDvSLeOFdBRrMFJnJta2sshCWgt6uMaEcXLHO X-Received: by 2002:a05:6a20:9e05:b0:af:9391:449 with SMTP id ms5-20020a056a209e0500b000af93910449mr55027508pzb.45.1672777435911; Tue, 03 Jan 2023 12:23:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672777435; cv=none; d=google.com; s=arc-20160816; b=k7Ei2D2N52V3b8/DQS7u05+LMYxtL8F6t0Q5Zskvv70LZMfVFKceuqb0o8WxyYlDuN PwRgsR2mWl7frJz4ih2i5e8yPHoHcJK8UeSC+DXUFF1tOvPZE6MJ/0IJ3tm1TOM0Zxpd FUxBe5NLFNQw4DRSZ7CWWmje+RCrUFYL+Dg2Sjt0A343xHQVA++gDyQjmM85egEcxlAo 3/VFBiIYxQrkQ18FZLGBh240nD/Xpjd8R/j2P5LJ7C7Vfmq7VzzIep9kccLYCaXSromY 1c7Z8p0EjoVr4ntwfSuGNNBPRQ2XcYd8+FZonJB1tHnYte9X43Yyx0zJxW8wqpla8qUb lueQ== 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:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature; bh=dB+Xb1h0Txk3JsZFq61i7v6Ilo7A+RBbVQi7pWfTus0=; b=spPDkFGA4OaIxPPnpecESDfTvxVI+yf5J+7zP/FqN5aZZCS1WMUDHm4CiET/OYTXgJ qyLcVYnJU4AtoMfTX9+cwPlRsq8ajue4QTrTlXTmINsnAc82p4cZq8p3cUDrIytxrIrh 7aCYZj2c8y/qHfstmE6fvbCg48Xy5os8mjZzXqXAWF3l1EL4IHkn1h1e4nlHulOxtzG0 S8LlL4d6T16mgcCf/RGeDhSuGVvu7EAW/eu641i7Dz/cccmSj9iz17zuKLMLUyEfAebM LKQ0AEq9SE3+0G8Q9ku20OTh04tMjR7WmXu6fICs2vXxF29alvOTkbThH78VGR4htVep Vbig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=XKm4ETeq; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=UXlIv4SK; dkim=fail header.i=@unstable.cc header.s=20220809-q8oc header.b=dHS6grwB; 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 p1-20020a63c141000000b004770fe95989si33470965pgi.496.2023.01.03.12.23.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jan 2023 12:23:55 -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=XKm4ETeq; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=UXlIv4SK; dkim=fail header.i=@unstable.cc header.s=20220809-q8oc header.b=dHS6grwB; 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 [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 1pCnoo-0000NZ-NJ; Tue, 03 Jan 2023 20:23:30 +0000 Received: from [172.30.20.202] (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 1pCnom-0000NS-Cm for openvpn-devel@lists.sourceforge.net; Tue, 03 Jan 2023 20:23:28 +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=2/1bR3Nw4/aAKGM16lgoQ8o1pk5sxVrlbGRioZQrWrY=; b=XKm4ETeqsStUqUmUBJdwVnnm6o AysPB+iv9xQoeTBUMJiH6r8Js8GDStPuA1QSAR52tHJyj6AsMhNejvvc/9cdVzpNozIF8jvaBLJ/W mVbBqfAJ/lqcg7AJtjzjfkABJJfGUkMMxMlifF4hxhOkSVINowOEWgACvlPmP8Dd8w28=; 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=2/1bR3Nw4/aAKGM16lgoQ8o1pk5sxVrlbGRioZQrWrY=; b=UXlIv4SKZAPTq4U5at4lhK+JIC KOwY9dM5pesvfahTGirbpdUrhT7CeHuXZJHzrV9P0c6uGBzhsJo9QkYYQVkXLCt9piXMiHrj0v7cn yaxZTttmSZVM/UXCFLsL8zHk3Cb9VuLZIZY3RXlcHXdWVQhYz31IpmgGo8g5vgutIs90=; Received: from wilbur.contactoffice.com ([212.3.242.68]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pCnof-0000lk-PI for openvpn-devel@lists.sourceforge.net; Tue, 03 Jan 2023 20:23:28 +0000 Received: from smtpauth2.co-bxl (smtpauth2.co-bxl [10.2.0.24]) by wilbur.contactoffice.com (Postfix) with ESMTP id 9E4341614; Tue, 3 Jan 2023 21:23:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1672777395; s=20220809-q8oc; d=unstable.cc; i=a@unstable.cc; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; l=1472; bh=2/1bR3Nw4/aAKGM16lgoQ8o1pk5sxVrlbGRioZQrWrY=; b=dHS6grwBkOUXo8JyhG4cauVthBHWwkIgq8Jp9IfWKkaen7b1Jx+SCBWO0bJWwVK6 pADc3ZBMFYWjfqJEoC27r5+00F1qCJAJnn6B145Zxz+a7CFHytiMPu2F/gp1gzAm+mI TOiXVl5G+xHNOKxVfb9zd8bJxlwMoJauaJB23lrC9+nS/MC6X5QPQqeUb9ypyF6ef7x YaDbQoIcip85P4J0/e5e/xfNxzLCd2rNKvTRF/fIEBr6/5ot5oWAQ8RVlA8wZQwccgU m06ZQNme8X0wyIUiZj71ProMt41vW50fgt+feWwZqN15qswwFLWBdVCG5WmsPsY+xdp SdMsZbPfhg== Received: by smtp.mailfence.com with ESMTPSA ; Tue, 3 Jan 2023 21:23:12 +0100 (CET) From: Antonio Quartulli To: openvpn-devel@lists.sourceforge.net Date: Tue, 3 Jan 2023 21:23:30 +0100 Message-Id: <20230103202330.1835-3-a@unstable.cc> X-Mailer: git-send-email 2.38.2 In-Reply-To: <20230103202330.1835-1-a@unstable.cc> References: <20230103202330.1835-1-a@unstable.cc> MIME-Version: 1.0 X-Spam-Flag: NO X-Spam-Status: No, hits=-2.9 required=4.7 symbols=ALL_TRUSTED, BAYES_00 device=10.2.0.21 X-ContactOffice-Account: com:375058688 X-Spam-Score: -0.9 (/) 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: While at it also improve the debug message itself to be more self-explanatory. Signed-off-by: Antonio Quartulli --- src/openvpn/multi.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) Content analysis details: (-0.9 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [212.3.242.68 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.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_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 X-Headers-End: 1pCnof-0000lk-PI Subject: [Openvpn-devel] [PATCH 3/3] dco: improve comment about hidden debug message 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: Antonio Quartulli Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1754034272896842760?= X-GMAIL-MSGID: =?utf-8?q?1754034272896842760?= While at it also improve the debug message itself to be more self-explanatory. Signed-off-by: Antonio Quartulli Acked-By: Arne Schwabe --- src/openvpn/multi.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index b10a6d8d..8facc66f 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3296,12 +3296,17 @@ multi_process_incoming_dco(struct multi_context *m) if (dco->dco_message_type == OVPN_CMD_DEL_PEER && dco->dco_del_peer_reason == OVPN_DEL_PEER_REASON_USERSPACE) { - /* we get notified after we kill the peer ourselves and probably - * have already forgotten about it. This is expected */ + /* we receive OVPN_CMD_DEL_PEER message with reason USERSPACE + * after we kill the peer ourselves. This peer may have already + * been deleted, so we end up here. + * In this case, print the following debug message with DCO_DEBUG + * level only to avoid polluting the standard DCO level with this + * harmless event. + */ msglevel = D_DCO_DEBUG; } - msg(msglevel, "Received packet for peer-id unknown to OpenVPN: %d, " - "type %d, reason %d", peer_id, dco->dco_message_type, + msg(msglevel, "Received DCO message for unknown peer-id: %d, " + "type %d, del_peer_reason %d", peer_id, dco->dco_message_type, dco->dco_del_peer_reason); /* Also clear the buffer if this was incoming packet for a dropped peer */ buf_init(&dco->dco_packet_in, 0);