Indicate that a client is in pull mode in IV_PROTO
PATCH 1/1 Indicate that a client is in pull mode in IV_PROTO
This allows us to skip waiting for the first PUSH_REQUEST message from the client to send the response.
Signed-off-by Arne Schwabe <[email protected]...>
--- src/openvpn/multi.c | 12 ++++++++++-- src/openvpn/ssl.c | 15 +++++++++++++-- src/openvpn/ssl.h | 7 +++++++ 3 files changed, 30 insertions(+), 4 deletions(-)
src/openvpn/multi.c +10 -2
@@ -1793,10 +1793,18 @@ multi_client_set_protocol_options(struct context *c) {int proto =0 ;int r =sscanf (optstr,"IV_PROTO=%d" , &proto); -if ((r ==1 ) && (proto >=2 )) +if (r ==1 ) { - tls_multi->use_peer_id = true; +if (proto >=2 ) + { + tls_multi->use_peer_id = true; + } +if (proto &IV_PROTO_REQUEST_PUSH ) + { + c->c2.push_request_received = true; + } } + }/* Select cipher if client supports Negotiable Crypto Parameters */
src/openvpn/ssl.c +13 -2
@@ -2299,8 +2299,19 @@ push_peer_info(struct buffer *buf, struct tls_session *session)buf_printf (&out,"IV_PLAT=win\n" );#endif -/* support for P_DATA_V2 */ -buf_printf (&out,"IV_PROTO=2\n" ); +/* support for P_DATA_V2*/ +int iv_proto =IV_PROTO_DATA_V2 ; + +/* support for receiving push_reply before sending +* push request, also signal that the client wants +* to get push-reply messages without without requiring a round +* trip for a push request message*/ +if (session->opt->pull) + { + iv_proto |=IV_PROTO_REQUEST_PUSH ; + } + +buf_printf (&out,"IV_PROTO=%d\n" , iv_proto);/* support for Negotiable Crypto Parameters */ if (session->opt->ncp_enabled
src/openvpn/ssl.h +7 -0
@@ -99,6 +99,13 @@/* Maximum length of OCC options string passed as part of auth handshake */ #define TLS_OPTIONS_LEN 512 +/* Definitions of the bits in the IV_PROTO bitfield */ +#define IV_PROTO_DATA_V2 (1<<1)/**< Support P_DATA_V2 */ +#define IV_PROTO_REQUEST_PUSH (1<<2)/**< Assume client will send a push +* request and server does not need +* to wait for a push-request to send +* a push-reply */ +/* Default field in X509 to be username */ #define X509_USERNAME_FIELD_DEFAULT "CN"
Signature · 1 line
2.26.2