X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fproxy.c;h=ba48218cbf488b25195962f5da4901d0fe9677e6;hp=22d494718d959971e153f805b119e86ae1a71e6a;hb=54b16b18dd5ee116df4eb5d830ddb8707c38e425;hpb=57bbc06733b973fb0ed8ba226f9159de870768b2

diff --git a/src/proxy.c b/src/proxy.c
index 22d49471..ba48218c 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1,6 +1,6 @@
 /*
     proxy.c -- Proxy handling functions.
-    Copyright (C) 2015 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,7 +174,7 @@ bool send_proxyrequest(connection_t *c) {
 	}
 
 	case PROXY_EXEC:
-		return true;
+		abort();
 
 	default:
 		logger(LOG_ERR, "Unknown proxy type");
@@ -194,6 +194,8 @@ int receive_proxy_meta(connection_t *c, int start, int lenin) {
 
 			ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Proxy request granted");
 			c->allow_request = ID;
+			c->status.proxy_passed = true;
+			send_id(c);
 			return 8;
 		} else {
 			logger(LOG_ERR, "Proxy request rejected");
@@ -249,6 +251,8 @@ int receive_proxy_meta(connection_t *c, int start, int lenin) {
 		} else {
 			ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Proxy request granted");
 			c->allow_request = ID;
+			c->status.proxy_passed = true;
+			send_id(c);
 			return replen;
 		}
 
@@ -275,8 +279,12 @@ int receive_proxy_meta(connection_t *c, int start, int lenin) {
 				logger(LOG_DEBUG, "Proxy request granted");
 				replen = p  + 1 - c->buffer;
 				c->allow_request = ID;
+				c->status.proxy_passed = true;
+				send_id(c);
 				return replen;
 			} else {
+				p = memchr(c->buffer, '\n', c->buflen);
+				p[-1] = 0;
 				logger(LOG_ERR, "Proxy request rejected: %s", c->buffer + 9);
 				return false;
 			}