From patchwork Tue Jan 10 15:19:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2989 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:c95:b0:82:e4b3:40a0 with SMTP id p21csp3694845dyk; Tue, 10 Jan 2023 07:19:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXtVx3WS8vgrpRr1QalTY/nbJKnSoHL6pCeizgFcolX8NSYaQq+9nJx25ksbeQjzAwFTuKcy X-Received: by 2002:a17:90a:6f41:b0:227:db2:25fe with SMTP id d59-20020a17090a6f4100b002270db225femr8276837pjk.35.1673363985844; Tue, 10 Jan 2023 07:19:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673363985; cv=none; d=google.com; s=arc-20160816; b=Hu4CCJgK0v2lFBgZVEDHOoFDwNgEqNbdIPvMWURB0IGSNwBsOrdci5Zl5SFkcYD+pt O244IroqKfRs4uUhPlUgAPZIVWe0vmvtllhiqS/WUrhKq5KiEIMLeE8dVhd3RwW3Fqah m3gb4hl+k4crcUieEiVc3XpR7gyjQfQCwSFjtDXcAgmnd7g2WZq6ZbHgJz+VjvfyaZEu SCV2Wr3O3Zhfj1BQrJNjdbWz0Zl/lA3Ra/b+XBO3DFhHXWRVi6rpRu0rlCenL2/xilXn Bf+qvBIlXDfvZyA0a66U0e+rOm7dzxtPy1ud79fxUVrdHAwHl0VxiYDuwHAMrI7Ins7q IYTQ== 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:message-id:date:to:from:dkim-signature:dkim-signature; bh=vKLkkjWugmv3aHNQu66SJXOJdyPR5X5PPDuzrsF2t5g=; b=pAjD1c2MFwCog0ksQF413iCxU2OHYkt27T4qhnF80q4Buv/r6t2Vkxuzlhuy2bg9et JL0P668lu9F1SE2DLBZyNA8jziz8PYitubP1p75bRS/gu9VnYPXA4Ge4qTeJutiGAbzX lExh0b4cynjr0sezZD1Fl2GMo8T4cb4NdVl9FH9sbTqoagRdgyWisAZrZlBSH/xI64TN B7zXmiFl1YtCj+CXZ4xHZ5ZsDy2RyhlDiBQ2kdm5Ee2LnrdohwFfvhwf0I/UprlF/mkN voeV7bHdu9p1VWlBfrdwCpy8wUI2psyplfvlQe/EQeAGY0Qjq8dsvQ//SbP4WV7kHNE8 72OA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=J5yzsob1; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=WA57fSh4; 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 qi8-20020a17090b274800b002190ba4112dsi11026989pjb.94.2023.01.10.07.19.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jan 2023 07:19:45 -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=J5yzsob1; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=WA57fSh4; 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 1pFGPJ-0002Kf-MP; Tue, 10 Jan 2023 15:19:21 +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 1pFGPB-0002Jy-7q for openvpn-devel@lists.sourceforge.net; Tue, 10 Jan 2023 15:19:13 +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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=hOgWKYQQEA84z79CwZFtvapgJwc0AYlZZrEvEXXsiu8=; b=J5yzsob1SOP8p5jgZ/dEvGz0J7 CLlzTWGxSKnYEak2QOA/I0gvtJqwW2zqy+2Q7JDW6hGp0dO9pVdOvWk8k9hQebiDTAf7+h849gn9O 8zJJIDNrw5CHb6jwMirhunUhjdYKcB7MtL4JfYOO1T/0+YAD7g3OL82OBB5FnL8pfE8o=; 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: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:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=hOgWKYQQEA84z79CwZFtvapgJwc0AYlZZrEvEXXsiu8=; b=W A57fSh4uYXMvftUWORmQtMcMt8ZUTK6HmYPFgTkJL1wvTR9dggAWqcIlELp8/vroraGzZJ089bxex pwauHzudhej2W9gIcf8iihGJ4P6RiBBSIDXn50ZtP0yJJNTdGHXazH8xbB1AhY5sv9TsZfNlWGAhU zMGog6oHZT8lN5Sc=; 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 1pFGP6-0000Ut-Mu for openvpn-devel@lists.sourceforge.net; Tue, 10 Jan 2023 15:19:13 +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 1pFGOz-0002Y7-Bm for openvpn-devel@lists.sourceforge.net; Tue, 10 Jan 2023 16:19:01 +0100 Received: (nullmailer pid 998525 invoked by uid 10006); Tue, 10 Jan 2023 15:19:01 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Tue, 10 Jan 2023 16:19:01 +0100 Message-Id: <20230110151901.998479-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Score: 0.3 (/) 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: 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 --- 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_NONE SPF: sender does not publish an SPF Record 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 X-Headers-End: 1pFGP6-0000Ut-Mu Subject: [Openvpn-devel] [PATCH v2] 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?1754649314370121799?= X-GMAIL-MSGID: =?utf-8?q?1754649314370121799?= 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 --- src/openvpn/multi.c | 6 ++++++ 1 file changed, 6 insertions(+) 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)