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)

diff --git a/src/openvpn/occ.c b/src/openvpn/occ.c
index 94b82e0f5c3b247ca91e5dbbecac163d1315e6b6..4309099b8eaadeb6f81e77508f01b2b6ebca44c5 100644 (file)
--- 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 8f0a534ac772a3f232ba123c29cf2ed9a2d9680d..d4682115c1e15b85ae0a681b6d4c371e8bb2e0ac 100644 (file)
--- 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