X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=79fbb4172b19f425610f2e0c50fceaf28b1899ad;hb=471308e1636e7a06e1d9ebc98e82b1c0c5150dde;hp=c0a351f2b9d7f0c5c7a521853085ea352dfec02f;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a;p=tinc

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index c0a351f2..79fbb417 100644
--- a/src/protocol_subnet.c
+++ b/src/protocol_subnet.c
@@ -17,31 +17,21 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol_subnet.c,v 1.1.4.11 2003/07/12 17:41:47 guus Exp $
+    $Id: protocol_subnet.c,v 1.1.4.13 2003/07/21 14:47:43 guus Exp $
 */
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.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 "connection.h"
+#include "logger.h"
 #include "net.h"
 #include "netutl.h"
-#include "protocol.h"
-#include "meta.h"
-#include "connection.h"
 #include "node.h"
-#include "logger.h"
-
-#include "system.h"
+#include "protocol.h"
+#include "subnet.h"
+#include "utils.h"
+#include "xalloc.h"
 
 int send_add_subnet(connection_t *c, subnet_t *subnet)
 {
@@ -68,7 +58,7 @@ int add_subnet_h(connection_t *c)
 	cp();
 
 	if(sscanf(c->buffer, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_SUBNET", c->name,
+		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_SUBNET", c->name,
 			   c->hostname);
 		return -1;
 	}
@@ -76,7 +66,7 @@ int add_subnet_h(connection_t *c)
 	/* Check if owner name is a valid */
 
 	if(check_id(name)) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name,
+		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name,
 			   c->hostname, _("invalid name"));
 		return -1;
 	}
@@ -86,7 +76,7 @@ int add_subnet_h(connection_t *c)
 	s = str2net(subnetstr);
 
 	if(!s) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name,
+		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name,
 			   c->hostname, _("invalid subnet string"));
 		return -1;
 	}
@@ -158,7 +148,7 @@ int del_subnet_h(connection_t *c)
 	cp();
 
 	if(sscanf(c->buffer, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_SUBNET", c->name,
+		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_SUBNET", c->name,
 			   c->hostname);
 		return -1;
 	}
@@ -166,7 +156,7 @@ int del_subnet_h(connection_t *c)
 	/* Check if owner name is a valid */
 
 	if(check_id(name)) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name,
+		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name,
 			   c->hostname, _("invalid name"));
 		return -1;
 	}
@@ -186,7 +176,7 @@ int del_subnet_h(connection_t *c)
 	s = str2net(subnetstr);
 
 	if(!s) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name,
+		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name,
 			   c->hostname, _("invalid subnet string"));
 		return -1;
 	}