X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fproxy.c;h=75e41ded306a2beb6d721d81d6232ffa2c4dcedd;hp=f7c2560d6d519426cc49d28f8d1e3928bcf24ed1;hb=985d19caf20058db3c764f0f6fbeafa8bcc59fcc;hpb=87438e342ce96b4321343c69b77ed84b16853785

diff --git a/src/proxy.c b/src/proxy.c
index f7c2560d..75e41ded 100644
--- 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
@@ -35,7 +35,7 @@ char *proxypass;
 
 static void update_address_ipv4(connection_t *c, void *address, void *port) {
 	sockaddrfree(&c->address);
-	memset(&c->address, 0, sizeof c->address);
+	memset(&c->address, 0, sizeof(c->address));
 	c->address.sa.sa_family = AF_INET;
 	if(address)
 		memcpy(&c->address.in.sin_addr, address, sizeof(ipv4_t));
@@ -48,7 +48,7 @@ static void update_address_ipv4(connection_t *c, void *address, void *port) {
 
 static void update_address_ipv6(connection_t *c, void *address, void *port) {
 	sockaddrfree(&c->address);
-	memset(&c->address, 0, sizeof c->address);
+	memset(&c->address, 0, sizeof(c->address));
 	c->address.sa.sa_family = AF_INET6;
 	if(address)
 		memcpy(&c->address.in6.sin6_addr, address, sizeof(ipv6_t));
@@ -92,9 +92,9 @@ bool send_proxyrequest(connection_t *c) {
 			strcpy(s4req + 8, proxyuser);
 		else
 			s4req[8] = 0;
-		s4req[sizeof s4req - 1] = 0;
+		s4req[sizeof(s4req) - 1] = 0;
 		c->allow_request = PROXY;
-		return send_meta(c, s4req, sizeof s4req);
+		return send_meta(c, s4req, sizeof(s4req));
 	}
 
 	case PROXY_SOCKS5: {
@@ -158,7 +158,7 @@ bool send_proxyrequest(connection_t *c) {
 		if(i > len)
 			abort();
 		c->allow_request = PROXY;
-		return send_meta(c, s5req, sizeof s5req);
+		return send_meta(c, s5req, sizeof(s5req));
 	}
 
 	case PROXY_HTTP: {
@@ -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");