From: Arne Schwabe Date: Tue, 10 Jan 2023 15:19:01 +0000 (+0100) Subject: Log peer-id if loglevel is D_DCO_DEBUG and dco is enabled X-Git-Tag: v2.7_alpha1~593 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=533c170fb60882547152e3b3222c8f7788d6b80f;p=thirdparty%2Fopenvpn.git Log peer-id if loglevel is D_DCO_DEBUG and dco is enabled This enables logging the peer id in p2mp mode if dco is enabled and the log level is high enough Patch v2: use check_debug_level to check current log level Signed-off-by: Arne Schwabe Acked-by: Gert Doering Message-Id: <20230110151901.998479-1-arne@rfc2549.org> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg25946.html Signed-off-by: Gert Doering --- diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 26904859f..b639d3c67 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -476,6 +476,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 + && check_debug_level(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)