From: Antonio Quartulli <anto...@mandelbit.com> Our code generally expects functions that deal with a multi instance to set up a log prefix at the beginning with set_prefix(mi) and clear it at the end with clear_prefix().
Add the calls to multi_process_incoming_dco() in a similar way to what is done for multi_process_incoming_link() - handling "link events" and "dco events" the same, with correct prefix in the function and no leftover prefix afterwards. Github: closes OpenVPN/openvpn#799 Change-Id: I1ad5df0f6785ffe9becd9f83329a9335d1a36f24 Signed-off-by: Antonio Quartulli <anto...@mandelbit.com> Signed-off-by: Gert Doering <g...@greenie.muc.de> Acked-by: Gert Doering <g...@greenie.muc.de> --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1116 This mail reflects revision 3 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering <g...@greenie.muc.de> diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 85975ff..40c7f8f 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3294,6 +3294,7 @@ if ((peer_id < m->max_clients) && (m->instances[peer_id])) { mi = m->instances[peer_id]; + set_prefix(mi); if (dco->dco_message_type == OVPN_CMD_DEL_PEER) { process_incoming_del_peer(m, mi, dco); @@ -3311,6 +3312,7 @@ { tls_session_soft_reset(mi->context.c2.tls_multi); } + clear_prefix(); } else { _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
