From 1079962e4c06f88a54e50d997c1b7e84303d30b4 Mon Sep 17 00:00:00 2001 From: Bernhard Schmidt Date: Sat, 15 Aug 2020 21:29:50 +0200 Subject: New upstream version 2.5~beta1 --- src/openvpn/mudp.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/openvpn/mudp.c') diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c index 4f63654..e95a7ac 100644 --- a/src/openvpn/mudp.c +++ b/src/openvpn/mudp.c @@ -29,11 +29,9 @@ #include "syshead.h" -#if P2MP_SERVER - #include "multi.h" #include -#include "forward-inline.h" +#include "forward.h" #include "memdbg.h" @@ -278,7 +276,12 @@ p2mp_iow_flags(const struct multi_context *m) { flags |= IOW_READ; } - +#ifdef _WIN32 + if (tuntap_ring_empty(m->top.c1.tuntap)) + { + flags &= ~IOW_READ_TUN; + } +#endif return flags; } @@ -379,4 +382,3 @@ tunnel_server_udp(struct context *top) tunnel_server_udp_single_threaded(top); } -#endif /* if P2MP_SERVER */ -- cgit v1.2.3 From f2b3dda12a731c2e0971cb7889728edaf23f6cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 29 Nov 2021 20:46:00 +0100 Subject: New upstream version 2.5.4 --- src/openvpn/mudp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/openvpn/mudp.c') diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c index e95a7ac..d5459f8 100644 --- a/src/openvpn/mudp.c +++ b/src/openvpn/mudp.c @@ -5,7 +5,7 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2002-2018 OpenVPN Inc + * Copyright (C) 2002-2021 OpenVPN Inc * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 -- cgit v1.2.3