]> git.meshlink.io Git - meshlink/commitdiff
Small fixes in proxy code.
authorGuus Sliepen <guus@tinc-vpn.org>
Mon, 25 Jun 2012 13:00:24 +0000 (15:00 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Mon, 25 Jun 2012 13:00:24 +0000 (15:00 +0200)
src/net_socket.c

index 457392ef21df53bd479f9e20c0d9f683b4663c10..f49832f806a0ebad09d612ffdcc6323be6457190 100644 (file)
@@ -346,7 +346,7 @@ static void do_outgoing_pipe(connection_t *c, char *command) {
        exit(result);
 #else
        logger(LOG_ERR, "Proxy type exec not supported on this platform!");
-       return false;
+       return;
 #endif
 }
 
@@ -411,9 +411,9 @@ begin:
        if(!proxytype) {
                c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
                configure_tcp(c);
-       } if(proxytype == PROXY_EXEC) {
+       } else if(proxytype == PROXY_EXEC) {
                do_outgoing_pipe(c, proxyhost);
-       }  else {
+       } else {
                proxyai = str2addrinfo(proxyhost, proxyport, SOCK_STREAM);
                if(!proxyai)
                        goto begin;