diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-02-11 23:29:23 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-02-11 23:29:23 +0100 |
| commit | f40e41d88de14794a9212b407ce31ccf6b7e3e4a (patch) | |
| tree | 112a3795c9967991f40b9ef7481673e86528107b | |
| parent | 062d57b2752ee66537bda74d87cc4c533a08b9ac (diff) | |
OpenVPN fixes
| -rw-r--r-- | openvpn/src/openvpn/options.c | 6 | ||||
| -rw-r--r-- | openvpn/src/openvpn/socket.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/openvpn/src/openvpn/options.c b/openvpn/src/openvpn/options.c index 9393c0aa..176087ef 100644 --- a/openvpn/src/openvpn/options.c +++ b/openvpn/src/openvpn/options.c @@ -2013,6 +2013,9 @@ options_postprocess_verify_ce (const struct options *options, const struct conne if (ce->proto == PROTO_TCP_SERVER && (options->connection_list->len > 1)) msg (M_USAGE, "TCP server mode allows at most one --remote address"); + if (options->routes && ((options->routes->flags & RG_BLOCK_LOCAL) && (options->routes->flags & RG_UNBLOCK_LOCAL))) + msg (M_USAGE, "unblock-local and block-local options of redirect-gateway/redirect-private are mutatlly exclusive"); + #if P2MP_SERVER /* @@ -2076,8 +2079,7 @@ options_postprocess_verify_ce (const struct options *options, const struct conne #endif if (options->routes && (options->routes->flags & RG_ENABLE)) msg (M_USAGE, "--redirect-gateway cannot be used with --mode server (however --push \"redirect-gateway\" is fine)"); - if (options->routes && ((options->routes->flags & RG_BLOCK_LOCAL) && (options->routes->flags & RG_BLOCK_LOCAL))) - msg (M_USAGE, "unblock-local and block-local options of redirect-gateway/redirect-private are mutatlly exclusive"); + if (options->route_delay_defined) msg (M_USAGE, "--route-delay cannot be used with --mode server"); if (options->up_delay) diff --git a/openvpn/src/openvpn/socket.c b/openvpn/src/openvpn/socket.c index 4b86d439..f024c0a4 100644 --- a/openvpn/src/openvpn/socket.c +++ b/openvpn/src/openvpn/socket.c @@ -1835,8 +1835,6 @@ phase2_tcp_client (struct link_socket *sock, struct signal_info *sig_info) #endif if (proxy_retry) { - /* TODO (schwabe): This code assumes AF_INET for the proxy socket - * when retrying a connection */ openvpn_close_socket (sock->sd); sock->sd = create_socket_tcp (sock->info.lsa->current_remote); } |