X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_key.c;h=832b2af0255b26559020ec16aef0f04542d7c5b2;hp=0ecad9badc565d4109d727b0f52ee6ee724b6506;hb=e449d94caef963809d417f16497f6f978e10d731;hpb=c70f52087bf6f7514684bbc859b83aec2ca17ae4

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 0ecad9ba..832b2af0 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -1,7 +1,7 @@
 /*
     protocol_key.c -- handle the meta-protocol, key exchange
-    Copyright (C) 1999-2002 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2003 Ivo Timmermans <ivo@o2w.nl>,
+                  2000-2003 Guus Sliepen <guus@sliepen.eu.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
@@ -17,31 +17,20 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol_key.c,v 1.1.4.16 2003/05/06 21:13:18 guus Exp $
+    $Id: protocol_key.c,v 1.1.4.19 2003/07/17 15:06:26 guus Exp $
 */
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
+#include "system.h"
 
-#include "conf.h"
+#include "avl_tree.h"
+#include "connection.h"
+#include "logger.h"
 #include "net.h"
 #include "netutl.h"
-#include "protocol.h"
-#include "meta.h"
-#include "connection.h"
 #include "node.h"
-
-#include "system.h"
+#include "protocol.h"
+#include "utils.h"
+#include "xalloc.h"
 
 int mykeyused = 0;
 
@@ -67,7 +56,7 @@ int key_changed_h(connection_t *c)
 	cp();
 
 	if(sscanf(c->buffer, "%*d %*x " MAX_STRING, name) != 1) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "KEY_CHANGED",
+		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "KEY_CHANGED",
 			   c->name, c->hostname);
 		return -1;
 	}
@@ -78,7 +67,7 @@ int key_changed_h(connection_t *c)
 	n = lookup_node(name);
 
 	if(!n) {
-		syslog(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist"),
+		logger(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist"),
 			   "KEY_CHANGED", c->name, c->hostname, name);
 		return -1;
 	}
@@ -109,7 +98,7 @@ int req_key_h(connection_t *c)
 	cp();
 
 	if(sscanf(c->buffer, "%*d " MAX_STRING " " MAX_STRING, from_name, to_name) != 2) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "REQ_KEY", c->name,
+		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "REQ_KEY", c->name,
 			   c->hostname);
 		return -1;
 	}
@@ -117,7 +106,7 @@ int req_key_h(connection_t *c)
 	from = lookup_node(from_name);
 
 	if(!from) {
-		syslog(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist in our connection list"),
+		logger(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist in our connection list"),
 			   "REQ_KEY", c->name, c->hostname, from_name);
 		return -1;
 	}
@@ -125,7 +114,7 @@ int req_key_h(connection_t *c)
 	to = lookup_node(to_name);
 
 	if(!to) {
-		syslog(LOG_ERR, _("Got %s from %s (%s) destination %s which does not exist in our connection list"),
+		logger(LOG_ERR, _("Got %s from %s (%s) destination %s which does not exist in our connection list"),
 			   "REQ_KEY", c->name, c->hostname, to_name);
 		return -1;
 	}
@@ -173,7 +162,7 @@ int ans_key_h(connection_t *c)
 	if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d",
 		from_name, to_name, key, &cipher, &digest, &maclength,
 		&compression) != 7) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ANS_KEY", c->name,
+		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ANS_KEY", c->name,
 			   c->hostname);
 		return -1;
 	}
@@ -181,7 +170,7 @@ int ans_key_h(connection_t *c)
 	from = lookup_node(from_name);
 
 	if(!from) {
-		syslog(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist in our connection list"),
+		logger(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist in our connection list"),
 			   "ANS_KEY", c->name, c->hostname, from_name);
 		return -1;
 	}
@@ -189,7 +178,7 @@ int ans_key_h(connection_t *c)
 	to = lookup_node(to_name);
 
 	if(!to) {
-		syslog(LOG_ERR, _("Got %s from %s (%s) destination %s which does not exist in our connection list"),
+		logger(LOG_ERR, _("Got %s from %s (%s) destination %s which does not exist in our connection list"),
 			   "ANS_KEY", c->name, c->hostname, to_name);
 		return -1;
 	}
@@ -220,13 +209,13 @@ int ans_key_h(connection_t *c)
 		from->cipher = EVP_get_cipherbynid(cipher);
 
 		if(!from->cipher) {
-			syslog(LOG_ERR, _("Node %s (%s) uses unknown cipher!"), from->name,
+			logger(LOG_ERR, _("Node %s (%s) uses unknown cipher!"), from->name,
 				   from->hostname);
 			return -1;
 		}
 
 		if(from->keylength != from->cipher->key_len + from->cipher->iv_len) {
-			syslog(LOG_ERR, _("Node %s (%s) uses wrong keylength!"), from->name,
+			logger(LOG_ERR, _("Node %s (%s) uses wrong keylength!"), from->name,
 				   from->hostname);
 			return -1;
 		}
@@ -240,13 +229,13 @@ int ans_key_h(connection_t *c)
 		from->digest = EVP_get_digestbynid(digest);
 
 		if(!from->digest) {
-			syslog(LOG_ERR, _("Node %s (%s) uses unknown digest!"), from->name,
+			logger(LOG_ERR, _("Node %s (%s) uses unknown digest!"), from->name,
 				   from->hostname);
 			return -1;
 		}
 
 		if(from->maclength > from->digest->md_size || from->maclength < 0) {
-			syslog(LOG_ERR, _("Node %s (%s) uses bogus MAC length!"),
+			logger(LOG_ERR, _("Node %s (%s) uses bogus MAC length!"),
 				   from->name, from->hostname);
 			return -1;
 		}
@@ -255,7 +244,7 @@ int ans_key_h(connection_t *c)
 	}
 
 	if(compression < 0 || compression > 11) {
-		syslog(LOG_ERR, _("Node %s (%s) uses bogus compression level!"), from->name, from->hostname);
+		logger(LOG_ERR, _("Node %s (%s) uses bogus compression level!"), from->name, from->hostname);
 		return -1;
 	}