From 6e68d8c5d5304d56de588f4584e2dc6266d2f129 Mon Sep 17 00:00:00 2001 From: Gert Doering Date: Mon, 14 Aug 2023 08:04:09 +0200 Subject: [PATCH] Make received OCC exit messages more visible in log. 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 Message-Id: <20230814060409.50742-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26949.html Signed-off-by: Gert Doering (cherry picked from commit 5f910a42b86e90f1893a668ee280422b6587ada1) --- 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 94b82e0f5c3..4309099b8ea 100644 --- a/src/openvpn/occ.c +++ b/src/openvpn/occ.c @@ -429,7 +429,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 8f0a534ac77..d4682115c1e 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -192,7 +192,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