Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1174?usp=email
to review the following change.
Change subject: Multi-socket win: avoid repeated socket_set()
......................................................................
Multi-socket win: avoid repeated socket_set()
On Windows, multi-socket support failed with
mixed protocols due to repeated socket_set()
calls, which caused accept() to be triggered
before having an event to process.
This fix skips socket_set() calls for
non-UDP sockets in MODE_SERVER inside
multi_io_process_flags().
Change-Id: Ia389fcec50fb2bbc0aa5ad41a2c23c17c04e6e9b
Signed-off-by: Gianmarco De Gregori <[email protected]>
---
M src/openvpn/forward.c
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/74/1174/1
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
index 03b6a0c..ce69324 100644
--- a/src/openvpn/forward.c
+++ b/src/openvpn/forward.c
@@ -2124,7 +2124,10 @@
*/
for (int i = 0; i < c->c1.link_sockets_num; i++)
{
- socket_set(c->c2.link_sockets[i], es, socket,
&c->c2.link_sockets[i]->ev_arg, NULL);
+ if (c->mode != MODE_SERVER ||
proto_is_dgram(c->c2.link_sockets[i]->info.proto))
+ {
+ socket_set(c->c2.link_sockets[i], es, socket,
&c->c2.link_sockets[i]->ev_arg, NULL);
+ }
}
tun_set(c->c1.tuntap, es, tuntap, (void *)tun_shift, NULL);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1174?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: Ia389fcec50fb2bbc0aa5ad41a2c23c17c04e6e9b
Gerrit-Change-Number: 1174
Gerrit-PatchSet: 1
Gerrit-Owner: its_Giaan <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
