aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGert Doering2023-08-14 08:04:09 +0200
committerGert Doering2023-08-14 11:30:54 +0200
commit6e68d8c5d5304d56de588f4584e2dc6266d2f129 (patch)
tree1431ba2c0af2208b29f797a4d709f95bb84a6b63
parent101499a43d222dcefbf5c6fc6f8b71a4f5d1f533 (diff)
downloadopenvpn-6e68d8c5d5304d56de588f4584e2dc6266d2f129.zip
openvpn-6e68d8c5d5304d56de588f4584e2dc6266d2f129.tar.gz
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 <gert@greenie.muc.de> Acked-by: Frank Lichtenheld <frank@lichtenheld.com> 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 <gert@greenie.muc.de> (cherry picked from commit 5f910a42b86e90f1893a668ee280422b6587ada1)
-rw-r--r--src/openvpn/occ.c2
-rw-r--r--src/openvpn/push.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/openvpn/occ.c b/src/openvpn/occ.c
index 94b82e0..4309099 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 8f0a534..d468211 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