Signed-off-by: Arne Schwabe <[email protected]>
---
src/openvpn/multi.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 6c6385c6e..858d602ca 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -473,6 +473,10 @@ multi_instance_string(const struct multi_instance *mi,
bool null, struct gc_aren
buf_printf(&out, "%s/", cn);
}
buf_printf(&out, "%s", mroute_addr_print(&mi->real, gc));
+ if (mi->context.c2.tls_multi)
+ {
+ buf_printf(&out, " peer-id=%d", mi->context.c2.tls_multi->peer_id);
+ }
return BSTR(&out);
}
else if (null)
@@ -3243,10 +3247,19 @@ process_incoming_del_peer(struct multi_context *m,
struct multi_instance *mi,
break;
case OVPN_DEL_PEER_REASON_USERSPACE:
- /* This very likely ourselves but might be another process, so
- * still process it */
- reason = "ovpn-dco: userspace request";
- break;
+ /* We assume that is ourselves. UUnfortunately, sometimes these
+ * events happen with enough delay that they can have an order of
+ *
+ * dco_del_peer x
+ * [new client connecting]
+ * dco_new_peer x
+ * event from dco_del_peer arrives.
+ *
+ * if we do not ignore this we get desynced with the kernel
+ * since we assume the peer-id is free again. The other way would
+ * be to send a dco_del_peer again
+ */
+ return;
}
/* When kernel already deleted the peer, the socket is no longer
--
2.37.1 (Apple Git-137.1)
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
