From patchwork Mon Aug 14 06:04:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3324 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:ed0c:b0:d7:3b0f:3938 with SMTP id oy12csp2883764dyb; Sun, 13 Aug 2023 23:04:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHMT6TlfsnfS9GdMqKYVMdluGzm4T71Sm5fHG/ORo8Brp0Hw/LWKmKCW9LquvG06GrU4MO9 X-Received: by 2002:a05:6a00:855:b0:682:a6bd:e952 with SMTP id q21-20020a056a00085500b00682a6bde952mr9557349pfk.6.1691993083467; Sun, 13 Aug 2023 23:04:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691993083; cv=none; d=google.com; s=arc-20160816; b=Dzx/XUwh7zapNEZBzJiYx7SU44BW6iWu2DcpTraitgEZLwetnPbkYBPCyPaDQul9Jw 0+jPGw1g0VcyQ+udAzn7XhHt4bUsNkTiC5hLwro5axdT75lko1ckgVJOyfSfxzxmqqWx u1QpyQoFAI7e6QOwFEbs/FgoJWPo4HR8k9F0vjKHjc9XZOKs53dNQ4AH1IZHAKW6YM9B EB+aNPTEFf5g+k4FIl9Y3cC4AjJloU7nLFRh7qY/jVpN3kU1vA1w/mJx5uM3//KHFqKt QwekuFh6gGCMVgC1dUqRnFPO340/7aj93VsoDf6P3M95rUcl+ijGDwolePWg1JvJcB3X TK8A== 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=zjSG0S0z/VRtgvQ6eBNWDFYEByN1K7R+HyXhtqtOGHg=; fh=GdiW+Blhncv1Wtoo9UgGywruDjfxcybmczWRg+a2oqU=; b=s7lBGTXp1BPB1w5SYC+1ldvRU/43ojFzgkYF50LGgROU6clpxTeuI3vFiAfPuK4uvn PS3P3klR/VsNHnENxm9mtVgh0+mA2nskgm8wSuBhKt6Sndcma1Nd6zqdDfCgLt1sombX 5FKky7i2sCM72QtFU4zc+4EYEIb+yh7tYpAJzayzSA1RqDLjsd1bQLLX6O1Tb7Hs9KzN NFsp6r66z3k8HfhaCeaJfRulVOKKhLwjM8W8TpQZc7GrOhhZIVfX47VpV/BitNYbszFC vkECpVotp8PYqcxVMH1lpAQZhlURF5tWWl37JmonvI2WSKC4nvoaTKNYvYJ+gngTYXeg hDUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="PSuc6Fm/"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=kJIvWwhX; 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 l2-20020a056a00140200b006870b0a14cfsi7742756pfu.134.2023.08.13.23.04.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Aug 2023 23:04:43 -0700 (PDT) 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="PSuc6Fm/"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=kJIvWwhX; 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-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1qVQgb-00087R-HA; Mon, 14 Aug 2023 06:04:17 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qVQga-00087L-Pp for openvpn-devel@lists.sourceforge.net; Mon, 14 Aug 2023 06:04:17 +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=4cUAUasPvUzJT08OS6O5N5znNjB/xpqRTQR4jc2EWn0=; b=PSuc6Fm/X3dzYtUjbsln0rtYFJ n7c90P/N4k38Vyx0be8GzWGfqoOysv0wBvTwb16/Ovc61ot2wqwworSrIYcuhA3sVTF04qHEp5cRO yuzGz+dX/CfNkgGYxREQRD63aJw+drfiI8i6EY6zqSsg/wN9kZl0NPdzbPxtSr6PGqEk=; 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=4cUAUasPvUzJT08OS6O5N5znNjB/xpqRTQR4jc2EWn0=; b=k JIvWwhXRsrDM/7foyBBX8cEub7aMImMZrPsf/gD45bCvfeUKzuE9kVCa+FVFDRNGqfZ2HMZbXY/zN ePeHyKi8upBTFPe/ZmA/OMCl3a6lnbCdCNuseuaroxfLkFASzYZCO9ZymmrJ+NYsOItpegvXIRuu4 QKbrQQzB4EvggWts=; Received: from chekov.greenie.muc.de ([193.149.48.178]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1qVQga-0002lQ-8T for openvpn-devel@lists.sourceforge.net; Mon, 14 Aug 2023 06:04:17 +0000 Received: from chekov.greenie.muc.de (localhost [127.0.0.1]) by chekov.greenie.muc.de (8.17.1/8.17.1) with ESMTPS id 37E649mf050751 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Mon, 14 Aug 2023 08:04:09 +0200 (CEST) (envelope-from gert@chekov.greenie.muc.de) Received: (from gert@localhost) by chekov.greenie.muc.de (8.17.1/8.17.1/Submit) id 37E649DX050750 for openvpn-devel@lists.sourceforge.net; Mon, 14 Aug 2023 08:04:09 +0200 (CEST) (envelope-from gert) From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Mon, 14 Aug 2023 08:04:09 +0200 Message-ID: <20230814060409.50742-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Score: 0.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: Currently, OCC exit messages are only logged at some high debug level (and if OpenVPN compiled with DEBUG), while control-channel EEN messages are logged on verb 1. Make this consistent, both in wordi [...] Content analysis details: (0.0 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 X-Headers-End: 1qVQga-0002lQ-8T Subject: [Openvpn-devel] [PATCH] Make received OCC exit messages more visible in log. 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?1774183339616322053?= X-GMAIL-MSGID: =?utf-8?q?1774183339616322053?= Currently, OCC exit messages are only logged at some high debug level (and if OpenVPN compiled with DEBUG), while control-channel EEN messages are logged on verb 1. Make this consistent, both in wording and in log level. Both messages are prefixed with the "channel" where the exit message came in. Signed-off-by: Gert Doering Acked-by: Frank Lichtenheld --- src/openvpn/occ.c | 2 +- src/openvpn/push.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvpn/occ.c b/src/openvpn/occ.c index 8541f6ec..2871449e 100644 --- a/src/openvpn/occ.c +++ b/src/openvpn/occ.c @@ -427,7 +427,7 @@ process_received_occ_msg(struct context *c) break; case OCC_EXIT: - dmsg(D_PACKET_CONTENT, "RECEIVED OCC_EXIT"); + dmsg(D_STREAM_ERRORS, "OCC exit message received by peer"); register_signal(c->sig, SIGUSR1, "remote-exit"); break; } diff --git a/src/openvpn/push.c b/src/openvpn/push.c index 01e7cd6e..5f5755ab 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -190,7 +190,7 @@ server_pushed_signal(struct context *c, const struct buffer *buffer, const bool void receive_exit_message(struct context *c) { - dmsg(D_STREAM_ERRORS, "Exit message received by peer"); + dmsg(D_STREAM_ERRORS, "CC-EEN exit message received by peer"); /* With control channel exit notification, we want to give the session * enough time to handle retransmits and acknowledgment, so that eventual * retries from the client to resend the exit or ACKs will not trigger