dco: print proper message in case of transport disconnection

Signed-off-by: Antonio Quartulli <a@unstable.cc>
Acked-by: Lev Stipakov <lstipakov@gmail.com>
Message-Id: <20230111235052.24855-1-a@unstable.cc>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg25977.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 67c4eebdaee5b51aa041ee7ed9f697397c04a01f)

diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 77dcaa6033377ed06d4c90def692240b30345890..99123c3963ac3a37569596895a22cee4db96cf37 100644 (file)
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -3244,6 +3244,10 @@ process_incoming_del_peer(struct multi_context *m, struct multi_instance *mi,
             reason = "ovpn-dco: transport error";
             break;
 
+        case OVPN_DEL_PEER_REASON_TRANSPORT_DISCONNECT:
+            reason = "ovpn-dco: transport disconnected";
+            break;
+
         case OVPN_DEL_PEER_REASON_USERSPACE:
             /* We assume that is ourselves. Unfortunately, sometimes these
              * events happen with enough delay that they can have an order of

diff --git a/src/openvpn/ovpn_dco_linux.h b/src/openvpn/ovpn_dco_linux.h
index beca1beb354a6acdce88006b32b00539797d5d6e..f9a3b8277f55e0267b6d84ccf510f2b0442ced53 100644 (file)
--- a/src/openvpn/ovpn_dco_linux.h
+++ b/src/openvpn/ovpn_dco_linux.h
@@ -1,8 +1,8 @@
-/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  OpenVPN data channel accelerator
  *
- *  Copyright (C) 2019-2021 OpenVPN, Inc.
+ *  Copyright (C) 2019-2022 OpenVPN, Inc.
  *
  *  Author:    James Yonan <james@openvpn.net>
  *             Antonio Quartulli <antonio@openvpn.net>
@@ -85,6 +85,7 @@ enum ovpn_del_peer_reason {
        OVPN_DEL_PEER_REASON_USERSPACE,
        OVPN_DEL_PEER_REASON_EXPIRED,
        OVPN_DEL_PEER_REASON_TRANSPORT_ERROR,
+       OVPN_DEL_PEER_REASON_TRANSPORT_DISCONNECT,
        __OVPN_DEL_PEER_REASON_AFTER_LAST
 };