From: Antonio Quartulli
Date: Wed, 11 Jan 2023 23:50:52 +0000 (+0100)
Subject: dco: print proper message in case of transport disconnection
X-Git-Tag: v2.7_alpha1~585
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67c4eebdae;p=thirdparty%2Fopenvpn.git
dco: print proper message in case of transport disconnection
Signed-off-by: Antonio Quartulli
Acked-by: Lev Stipakov
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
---
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 77dcaa603..99123c396 100644
--- 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 beca1beb3..f9a3b8277 100644
--- 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
* Antonio Quartulli
@@ -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
};