projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use functions from logger.c
[tinc]
/
src
/
protocol_subnet.c
diff --git
a/src/protocol_subnet.c
b/src/protocol_subnet.c
index
81cd52c
..
79fbb41
100644
(file)
--- a/
src/protocol_subnet.c
+++ b/
src/protocol_subnet.c
@@
-1,7
+1,7
@@
/*
protocol_subnet.c -- handle the meta-protocol, subnets
/*
protocol_subnet.c -- handle the meta-protocol, subnets
- Copyright (C) 1999-200
2
Ivo Timmermans <ivo@o2w.nl>,
- 2000-200
2
Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 1999-200
3
Ivo Timmermans <ivo@o2w.nl>,
+ 2000-200
3
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
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,33
+17,23
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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.
8 2002/09/09 21:25:02
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 <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 "conf.h"
+#include "connection.h"
+#include "logger.h"
#include "net.h"
#include "netutl.h"
#include "net.h"
#include "netutl.h"
-#include "protocol.h"
-#include "meta.h"
-#include "connection.h"
#include "node.h"
#include "node.h"
+#include "protocol.h"
+#include "subnet.h"
+#include "utils.h"
+#include "xalloc.h"
-#include "system.h"
-
-int send_add_subnet(connection_t * c, subnet_t * subnet)
+int send_add_subnet(connection_t *c, subnet_t *subnet)
{
int x;
char *netstr;
{
int x;
char *netstr;
@@
-58,7
+48,7
@@
int send_add_subnet(connection_t * c, subnet_t * subnet)
return x;
}
return x;
}
-int add_subnet_h(connection_t *
c)
+int add_subnet_h(connection_t *c)
{
char subnetstr[MAX_STRING_SIZE];
char name[MAX_STRING_SIZE];
{
char subnetstr[MAX_STRING_SIZE];
char name[MAX_STRING_SIZE];
@@
-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) {
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;
}
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)) {
/* 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;
}
c->hostname, _("invalid name"));
return -1;
}
@@
-86,7
+76,7
@@
int add_subnet_h(connection_t * c)
s = str2net(subnetstr);
if(!s) {
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;
}
c->hostname, _("invalid subnet string"));
return -1;
}
@@
-114,8
+104,7
@@
int add_subnet_h(connection_t * c)
/* If we don't know this subnet, but we are the owner, retaliate with a DEL_SUBNET */
if(owner == myself) {
/* If we don't know this subnet, but we are the owner, retaliate with a DEL_SUBNET */
if(owner == myself) {
- if(debug_lvl >= DEBUG_PROTOCOL)
- syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself"),
+ ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself"),
"ADD_SUBNET", c->name, c->hostname);
s->owner = myself;
send_del_subnet(c, s);
"ADD_SUBNET", c->name, c->hostname);
s->owner = myself;
send_del_subnet(c, s);
@@
-133,7
+122,7
@@
int add_subnet_h(connection_t * c)
return 0;
}
return 0;
}
-int send_del_subnet(connection_t *
c, subnet_t *
s)
+int send_del_subnet(connection_t *
c, subnet_t *
s)
{
int x;
char *netstr;
{
int x;
char *netstr;
@@
-149,7
+138,7
@@
int send_del_subnet(connection_t * c, subnet_t * s)
return x;
}
return x;
}
-int del_subnet_h(connection_t *
c)
+int del_subnet_h(connection_t *c)
{
char subnetstr[MAX_STRING_SIZE];
char name[MAX_STRING_SIZE];
{
char subnetstr[MAX_STRING_SIZE];
char name[MAX_STRING_SIZE];
@@
-159,7
+148,7
@@
int del_subnet_h(connection_t * c)
cp();
if(sscanf(c->buffer, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
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;
}
c->hostname);
return -1;
}
@@
-167,7
+156,7
@@
int del_subnet_h(connection_t * c)
/* Check if owner name is a valid */
if(check_id(name)) {
/* 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;
}
c->hostname, _("invalid name"));
return -1;
}
@@
-177,8
+166,7
@@
int del_subnet_h(connection_t * c)
owner = lookup_node(name);
if(!owner) {
owner = lookup_node(name);
if(!owner) {
- if(debug_lvl >= DEBUG_PROTOCOL)
- syslog(LOG_WARNING, _("Got %s from %s (%s) for %s which is not in our node tree"),
+ ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for %s which is not in our node tree"),
"DEL_SUBNET", c->name, c->hostname, name);
return 0;
}
"DEL_SUBNET", c->name, c->hostname, name);
return 0;
}
@@
-188,7
+176,7
@@
int del_subnet_h(connection_t * c)
s = str2net(subnetstr);
if(!s) {
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;
}
c->hostname, _("invalid subnet string"));
return -1;
}
@@
-205,8
+193,7
@@
int del_subnet_h(connection_t * c)
free_subnet(s);
if(!find) {
free_subnet(s);
if(!find) {
- if(debug_lvl >= DEBUG_PROTOCOL)
- syslog(LOG_WARNING, _("Got %s from %s (%s) for %s which does not appear in his subnet tree"),
+ ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for %s which does not appear in his subnet tree"),
"DEL_SUBNET", c->name, c->hostname, name);
return 0;
}
"DEL_SUBNET", c->name, c->hostname, name);
return 0;
}
@@
-214,8
+201,7
@@
int del_subnet_h(connection_t * c)
/* If we are the owner of this subnet, retaliate with an ADD_SUBNET */
if(owner == myself) {
/* If we are the owner of this subnet, retaliate with an ADD_SUBNET */
if(owner == myself) {
- if(debug_lvl >= DEBUG_PROTOCOL)
- syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself"),
+ ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself"),
"DEL_SUBNET", c->name, c->hostname);
send_add_subnet(c, find);
return 0;
"DEL_SUBNET", c->name, c->hostname);
send_add_subnet(c, find);
return 0;