From 520a58d51fc53909d7e05ddf2a2da62eab439be3 Mon Sep 17 00:00:00 2001 From: Antonio Quartulli Date: Thu, 11 Sep 2025 22:12:16 +0200 Subject: [PATCH] dco: add standard mi prefix handling to multi_process_incoming_dco() 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 Signed-off-by: Gert Doering Acked-by: Gert Doering Message-Id: <20250911201222.25382-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32859.html URL: https://gerrit.openvpn.net/c/openvpn/+/1116 Signed-off-by: Gert Doering (cherry picked from commit 531fef40b73f73632548c88697af34cf15a70531) --- src/openvpn/multi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index e1c0b02ba..94e623ba2 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3309,6 +3309,7 @@ multi_process_incoming_dco(struct multi_context *m) 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); @@ -3328,6 +3329,7 @@ multi_process_incoming_dco(struct multi_context *m) { tls_session_soft_reset(mi->context.c2.tls_multi); } + clear_prefix(); } else { -- 2.47.3