X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=fe069f5885f2745bd9bc2b3cc3f70523b9fd7c6d;hb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;hp=a3cf3f51b5965b90923b525494593a971f611e08;hpb=e3a4672afb8eb341b380e74b2bf6d098f61c08a3;p=meshlink

diff --git a/src/protocol_key.c b/src/protocol_key.c
index a3cf3f51..fe069f58 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -1,7 +1,6 @@
 /*
     protocol_key.c -- handle the meta-protocol, key exchange
-    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -81,8 +80,7 @@ bool key_changed_h(connection_t *c, const char *request) {
 
 	/* Tell the others */
 
-	if(!tunnelserver)
-		forward_request(c, request);
+	forward_request(c, request);
 
 	return true;
 }
@@ -241,9 +239,6 @@ bool req_key_h(connection_t *c, const char *request) {
 		/* No, just send our key back */
 		send_ans_key(from);
 	} else {
-		if(tunnelserver)
-			return true;
-
 		if(!to->status.reachable) {
 			logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) destination %s which is not reachable",
 				"REQ_KEY", c->name, c->hostname, to_name);
@@ -336,9 +331,6 @@ bool ans_key_h(connection_t *c, const char *request) {
 	/* Forward it if necessary */
 
 	if(to != myself) {
-		if(tunnelserver)
-			return true;
-
 		if(!to->status.reachable) {
 			logger(DEBUG_ALWAYS, LOG_WARNING, "Got %s from %s (%s) destination %s which is not reachable",
 				   "ANS_KEY", c->name, c->hostname, to_name);
@@ -395,14 +387,22 @@ bool ans_key_h(connection_t *c, const char *request) {
 
 	/* Check and lookup cipher and digest algorithms */
 
-	if(!(from->outcipher = cipher_open_by_nid(cipher))) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses unknown cipher!", from->name, from->hostname);
-		return false;
+	if(cipher) {
+		if(!(from->outcipher = cipher_open_by_nid(cipher))) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses unknown cipher!", from->name, from->hostname);
+			return false;
+		}
+	} else {
+		from->outcipher = NULL;
 	}
 
-	if(!(from->outdigest = digest_open_by_nid(digest, maclength))) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses unknown digest!", from->name, from->hostname);
-		return false;
+	if(digest) {
+		if(!(from->outdigest = digest_open_by_nid(digest, maclength))) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses unknown digest!", from->name, from->hostname);
+			return false;
+		}
+	} else {
+		from->outdigest = NULL;
 	}
 
 	if(maclength != digest_length(from->outdigest)) {