Attention is currently required from: its_Giaan, plaisthos.
Hello flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
to look at the new patch set (#3).
Change subject: Fix dco_win and multisocket interaction
......................................................................
Fix dco_win and multisocket interaction
Change-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c
Signed-off-by: Gianmarco De Gregori <gianma...@mandelbit.com>
---
M src/openvpn/forward.c
M src/openvpn/mtcp.c
M src/openvpn/multi_io.c
3 files changed, 15 insertions(+), 8 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/35/935/3
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
index af1d008..4eaa4f2 100644
--- a/src/openvpn/forward.c
+++ b/src/openvpn/forward.c
@@ -2072,9 +2072,12 @@
/*
* Calculate the flags based on the provided 'flags' argument.
*/
- if (flags & IOW_WAIT_SIGNAL)
+ if (c->options.mode != MODE_SERVER)
{
- wait_signal(es, (void *)err_shift);
+ if (flags & IOW_WAIT_SIGNAL)
+ {
+ wait_signal(es, (void *)err_shift);
+ }
}
if (flags & IOW_TO_LINK)
diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c
index 1d62ea6..86c5160 100644
--- a/src/openvpn/mtcp.c
+++ b/src/openvpn/mtcp.c
@@ -181,7 +181,8 @@
if (mi)
{
- if (defer || mbuf_defined(mi->tcp_link_out_deferred))
+ if ((defer &&
!proto_is_dgram(mi->context.c2.link_sockets[0]->info.proto))
+ || mbuf_defined(mi->tcp_link_out_deferred))
{
/* save to queue */
struct buffer *buf = &mi->context.c2.to_link;
diff --git a/src/openvpn/multi_io.c b/src/openvpn/multi_io.c
index f1751ff..f2f40b0 100644
--- a/src/openvpn/multi_io.c
+++ b/src/openvpn/multi_io.c
@@ -176,10 +176,13 @@
int status, i;
unsigned int *persistent = &m->multi_io->tun_rwflags;
- for (i = 0; i < m->top.c1.link_sockets_num; i++)
+ if (!tuntap_is_dco_win(m->top.c1.tuntap))
{
- socket_set_listen_persistent(m->top.c2.link_sockets[i],
m->multi_io->es,
- &m->top.c2.link_sockets[i]->ev_arg);
+ for (i = 0; i < m->top.c1.link_sockets_num; i++)
+ {
+ socket_set_listen_persistent(m->top.c2.link_sockets[i],
m->multi_io->es,
+ &m->top.c2.link_sockets[i]->ev_arg);
+ }
}
if (has_udp_in_local_list(&m->top.options))
@@ -202,7 +205,7 @@
}
#endif
tun_set(m->top.c1.tuntap, m->multi_io->es, EVENT_READ, MULTI_IO_TUN,
persistent);
-#if defined(TARGET_LINUX) || defined(TARGET_FREEBSD)
+#if defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32)
dco_event_set(&m->top.c1.tuntap->dco, m->multi_io->es, MULTI_IO_DCO);
#endif
@@ -535,7 +538,7 @@
multi_io_action(m, mi, TA_INITIAL, false);
}
}
-#if defined(ENABLE_DCO) && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD))
+#if defined(ENABLE_DCO) && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD)
|| defined(TARGET_WIN32))
/* incoming data on DCO? */
else if (e->arg == MULTI_IO_DCO)
{
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c
Gerrit-Change-Number: 935
Gerrit-PatchSet: 3
Gerrit-Owner: its_Giaan <gianma...@mandelbit.com>
Gerrit-Reviewer: flichtenheld <fr...@lichtenheld.com>
Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org>
Gerrit-Reviewer: stipa <lstipa...@gmail.com>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: plaisthos <arne-open...@rfc2549.org>
Gerrit-Attention: its_Giaan <gianma...@mandelbit.com>
Gerrit-MessageType: newpatchset
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
