Skip to content

Commit

Permalink
Make received OCC exit messages more visible in log.
Browse files Browse the repository at this point in the history
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 5f910a4)
  • Loading branch information
cron2 committed Aug 14, 2023
1 parent 101499a commit 6e68d8c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/openvpn/occ.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/openvpn/push.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6e68d8c

Please sign in to comment.