Re: [Openvpn-devel] [PATCH] Fix compilcation error with --disable-crypto

2015-10-10 Thread Arne Schwabe
Am 10.10.15 um 12:14 schrieb Lev Stipakov:
> Also disable behavior for static key setup.

ACK from.

Arne




[Openvpn-devel] [PATCH] Fix compilcation error with --disable-crypto

2015-10-10 Thread Lev Stipakov
Also disable behavior for static key setup.
---
 src/openvpn/forward.c | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
index 513fbae..c17be35 100644
--- a/src/openvpn/forward.c
+++ b/src/openvpn/forward.c
@@ -1199,13 +1199,16 @@ process_outgoing_link (struct context *c)
   if (c->c2.buf.len > 0 )
 register_activity (c, size);

+
+#ifdef ENABLE_CRYPTO
   /* for unreachable network and "connecting" state switch to the next 
host */
-  if (size < 0 && ENETUNREACH == error_code && 
!tls_initial_packet_received (c->c2.tls_multi)
- && c->options.mode == MODE_POINT_TO_POINT)
+  if (size < 0 && ENETUNREACH == error_code && c->c2.tls_multi &&
+  !tls_initial_packet_received (c->c2.tls_multi) && c->options.mode == 
MODE_POINT_TO_POINT)
{
  msg (M_INFO, "Network unreachable, restarting");
  register_signal (c, SIGUSR1, "network-unreachable");
}
+#endif
 }
   else
 {
-- 
1.9.1