Clear Ethernet header when reading packets from a tun device.

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index 457392e..2d1ecc5 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -346,13 +346,13 @@ 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
 }
 
 void do_outgoing_connection(connection_t *c) {
        char *address, *port, *space;
-       struct addrinfo *proxyai;
+       struct addrinfo *proxyai = NULL;
        int result;
 
        if(!c->outgoing) {
@@ -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;