From: Arne Schwabe <[email protected]> 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. 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 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1837 This mail reflects revision 4 of this Change. Acked-by according to Gerrit (reflected above): MaxF <[email protected]> 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; } _______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
