From patchwork Tue Dec 27 14:02:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2949 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:c95:b0:82:e4b3:40a0 with SMTP id p21csp2650237dyk; Tue, 27 Dec 2022 06:03:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXuN9W5phQIqAvUtENWtOskNHlI2S+RZOtiZNBeDH8IZsewc09WqS+01E2IS4sXDYHmSWtbt X-Received: by 2002:a05:6870:2b0d:b0:143:95b0:26f9 with SMTP id ld13-20020a0568702b0d00b0014395b026f9mr11281212oab.34.1672149813457; Tue, 27 Dec 2022 06:03:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672149813; cv=none; d=google.com; s=arc-20160816; b=Ucy3DwHPl/Q0QQZPVScCJGe6qolPx3OMFHwGc+Zb3XdxgAPENjkmUPK/T+ggSSO/1o vYUXkdObwxcxqUkY3xjVqPGFvDNbt5aRM1FA5rdQHQVGHtPOJXYoSHqirdECYV/U4N3m e51daBaILrpnSUU2pnbCUxXJKTMzUxM7m56BSAnQJBCNesSu3HBzdpB6BO3YGJ2vGbWd fG4bLrnR9ZwlJ5YgyQVZNeMfkoB1+fnzGSfw19xgy8Itb5T0I7DyVYLfhdAHptRyyZma 4pfiID5TJl9ZxmY9TTYlk9Cf2DRlibeQAaySqX/HESPPbR8alR9T0CZjvYjF+fM9nMqC u6JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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; bh=xdgg0K2ljkRnGu70qTnduUVKqWf7rICVOoLDHJBMHQw=; b=JEcAPwNuSQLnr7K31VHo/LPWpjTuzZ3GCRuUlr2Z9qoWpB6gxN8AqZ9yaJNMdLJfpp C7mT5wm3Lc0HwIOlML5+2N1F3eCyqHAAcLPH9LLQLzIezvUZKE91p0PeLfemsjWaenHw Me+olj9RQA20pNqVEPIVi68iDJKh8HLtf2sQNyDSdElcr5tns0rwxbdJEOVMfJItq1Ob bOXvtfeqxJ3rYWiLrz+1ZaC8teirxZ76LgI0kQgS3QSO3KSe1AQK2B6cUeFdAEW/X7fr 3+lNRJpYSI7blQckWV2qYzHE6dKYJt2PxuQSscgBihM0qS3Kl+HGghZBPjfWdAH4VpdL STLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="XjoAR/L8"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Wut1ZREr; 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 f20-20020a056870d15400b001369624e246si10481090oac.87.2022.12.27.06.03.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Dec 2022 06:03:33 -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="XjoAR/L8"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Wut1ZREr; 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-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pAAXi-0002hQ-KZ; Tue, 27 Dec 2022 14:02:58 +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.95) (envelope-from ) id 1pAAXh-0002hJ-Hx for openvpn-devel@lists.sourceforge.net; Tue, 27 Dec 2022 14:02:57 +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=hyxCxazwdCYX2DHq09F0tFh/rOvhE6tIv1pWUbyKNKE=; b=XjoAR/L8nEG6Tamuv2uvZ/mqoX UuZ9Etpf/4LqsDfLIs2jICDHbV2rHxc7AGYekab+1EIBguw8Ou0/JzjC/N+sznzwpCYUVeVYyS94o VhMqNM7ak6XldtQ+bKRlkjIsraBqWn2CrAVuVJsyySydy/QBStUDW3S8mJVjSkpaHdzY=; 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=hyxCxazwdCYX2DHq09F0tFh/rOvhE6tIv1pWUbyKNKE=; b=Wut1ZRErZSTw7HJ1HNU5yNogij R3AZuYpHWboF8mB/0D4uWFLzcmh9zHfmCTAKBM5LGO4hLXKYuL0aqT4votTvXoDPsbNQ0AwlDKNrv H6/h/yfR3No/RrHdpUa9VFfp45GgVksbLZHKR6XfCw0Y1WgWny8xK5P1EhssIfGhZ9Lo=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pAAXg-0007sX-KV for openvpn-devel@lists.sourceforge.net; Tue, 27 Dec 2022 14:02:57 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1pAAXZ-0004uR-9f for openvpn-devel@lists.sourceforge.net; Tue, 27 Dec 2022 15:02:49 +0100 Received: (nullmailer pid 3525003 invoked by uid 10006); Tue, 27 Dec 2022 14:02:49 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Tue, 27 Dec 2022 15:02:49 +0100 Message-Id: <20221227140249.3524943-6-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221227140249.3524943-1-arne@rfc2549.org> References: <20221227140249.3524943-1-arne@rfc2549.org> MIME-Version: 1.0 X-Spam-Score: 0.3 (/) 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: This enables logging the peer id in p2mp mode if dco is enabled and the log level is high enough Signed-off-by: Arne Schwabe --- src/openvpn/multi.c | 6 ++++++ 1 file changed, 6 insertions(+) Content analysis details: (0.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1pAAXg-0007sX-KV Subject: [Openvpn-devel] [PATCH v2 4/4] Log peer-id if loglevel is D_DCO_DEBUG and dco is enabled 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?1753376162930150102?= X-GMAIL-MSGID: =?utf-8?q?1753376162930150102?= This enables logging the peer id in p2mp mode if dco is enabled and the log level is high enough Signed-off-by: Arne Schwabe --- src/openvpn/multi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 50d88f19a..f8366be28 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -473,6 +473,12 @@ multi_instance_string(const struct multi_instance *mi, bool null, struct gc_aren buf_printf(&out, "%s/", cn); } buf_printf(&out, "%s", mroute_addr_print(&mi->real, gc)); + if (mi->context.c2.tls_multi + && mi->context.options.verbosity >= D_DCO_DEBUG + && dco_enabled(&mi->context.options)) + { + buf_printf(&out, " peer-id=%d", mi->context.c2.tls_multi->peer_id); + } return BSTR(&out); } else if (null)