cron2 has uploaded a new patch set (#5) to the change originally created by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/1837?usp=email )
The following approvals got outdated and were removed: Code-Review+2 by MaxF Change subject: Reenable xmit_hold when using p2p tcp-server and tls-server ...................................................................... Reenable xmit_hold when using p2p tcp-server and tls-server Commit 619c3e9 changed the logic to enable xmit_hold only when c->mode is CM_CHILD_TCP. This works for --mode server and was probably done to allow to properly work when the server is listening on multiple sockets and options->ce.proto cannot be used to determine if this socket is tcp or udp. Restore the logic for p2p to avoid both sides starting sending resets at the same time. Github: closes OpenVPN/openvpn#1089 Change-Id: I728067ef08481c87c7b6918c88ebcaeeec466534 Signed-off-by: Arne Schwabe <[email protected]> Acked-by: MaxF <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1837 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg38265.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/init.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/37/1837/5 diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 69d226d..08278fc2 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -3332,7 +3332,7 @@ /* should we not xmit any packets until we get an initial * response from client? */ - if (to.server && c->mode == CM_CHILD_TCP) + if (to.server && (c->mode == CM_CHILD_TCP || (c->mode == CM_P2P && options->ce.proto == PROTO_TCP_SERVER))) { to.xmit_hold = true; } -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1837?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I728067ef08481c87c7b6918c88ebcaeeec466534 Gerrit-Change-Number: 1837 Gerrit-PatchSet: 5 Gerrit-Owner: plaisthos <[email protected]> Gerrit-Reviewer: MaxF <[email protected]> Gerrit-Reviewer: flichtenheld <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
