Set status.proxy_passed early for Proxy = exec.

diff --git a/src/net_socket.c b/src/net_socket.c
index 284bab74c576bfead8dd956e846f1374adfcf983..60dd81da433a93956e3bfc80826922187a6024fe 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -442,6 +442,7 @@ connect:
        if(!proxytype) {
                c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
        } else if(proxytype == PROXY_EXEC) {
+               c->status.proxy_passed = true;
                do_outgoing_pipe(c, proxyhost);
        } else {
                proxyai = str2addrinfo(proxyhost, proxyport, SOCK_STREAM);

diff --git a/src/proxy.c b/src/proxy.c
index f7c2560d6d519426cc49d28f8d1e3928bcf24ed1..ba48218cbf488b25195962f5da4901d0fe9677e6 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1,6 +1,6 @@
 /*
     proxy.c -- Proxy handling functions.
-    Copyright (C) 2015-2016 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2015-2017 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -174,9 +174,7 @@ bool send_proxyrequest(connection_t *c) {
        }
 
        case PROXY_EXEC:
-               c->status.proxy_passed = true;
-               send_id(c);
-               return true;
+               abort();
 
        default:
                logger(LOG_ERR, "Unknown proxy type");