/*
protocol_edge.c -- handle the meta-protocol, edges
- 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
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: protocol_edge.c,v 1.1.4.16 2003/07/06 22:11:32 guus Exp $
+ $Id: protocol_edge.c,v 1.1.4.23 2003/11/17 15:30:18 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 "avl_tree.h"
#include "conf.h"
-#include "net.h"
-#include "netutl.h"
-#include "protocol.h"
-#include "meta.h"
#include "connection.h"
-#include "node.h"
#include "edge.h"
#include "graph.h"
#include "logger.h"
+#include "meta.h"
+#include "net.h"
+#include "netutl.h"
+#include "node.h"
+#include "protocol.h"
+#include "utils.h"
+#include "xalloc.h"
-#include "system.h"
-
-int send_add_edge(connection_t *c, edge_t *e)
+bool send_add_edge(connection_t *c, const edge_t *e)
{
- int x;
+ bool x;
char *address, *port;
cp();
return x;
}
-int add_edge_h(connection_t *c)
+bool add_edge_h(connection_t *c)
{
edge_t *e;
node_t *from, *to;
if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %lx %d",
from_name, to_name, to_address, to_port, &options, &weight) != 6) {
- logger(DEBUG_ALWAYS, LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name,
+ logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name,
c->hostname);
- return -1;
+ return false;
}
/* Check if names are valid */
- if(check_id(from_name)) {
- logger(DEBUG_ALWAYS, LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
+ if(!check_id(from_name)) {
+ logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
c->hostname, _("invalid name"));
- return -1;
+ return false;
}
- if(check_id(to_name)) {
- logger(DEBUG_ALWAYS, LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
+ if(!check_id(to_name)) {
+ logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
c->hostname, _("invalid name"));
- return -1;
+ return false;
}
if(seen_request(c->buffer))
- return 0;
+ return true;
/* Lookup nodes */
node_add(to);
}
+ if(tunnelserver && from != myself && from != c->node && to != myself && to != c->node)
+ return false;
+
/* Convert addresses */
address = str2sockaddr(to_address, to_port);
if(e) {
if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address)) {
if(from == myself) {
- logger(DEBUG_PROTOCOL, LOG_WARNING, _("Got %s from %s (%s) for ourself which does not match existing entry"),
+ ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not match existing entry"),
"ADD_EDGE", c->name, c->hostname);
send_add_edge(c, e);
- return 0;
+ return true;
} else {
- logger(DEBUG_PROTOCOL, LOG_WARNING, _("Got %s from %s (%s) which does not match existing entry"),
+ ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) which does not match existing entry"),
"ADD_EDGE", c->name, c->hostname);
edge_del(e);
graph();
}
} else
- return 0;
+ return true;
} else if(from == myself) {
- logger(DEBUG_PROTOCOL, LOG_WARNING, _("Got %s from %s (%s) for ourself which does not exist"),
+ ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not exist"),
"ADD_EDGE", c->name, c->hostname);
e = new_edge();
e->from = from;
e->to = to;
send_del_edge(c, e);
free_edge(e);
- return 0;
+ return true;
}
e = new_edge();
/* Tell the rest about the new edge */
- forward_request(c);
+ if(!tunnelserver)
+ forward_request(c);
/* Run MST before or after we tell the rest? */
graph();
- return 0;
+ return true;
}
-int send_del_edge(connection_t *c, edge_t *e)
+bool send_del_edge(connection_t *c, const edge_t *e)
{
cp();
e->from->name, e->to->name);
}
-int del_edge_h(connection_t *c)
+bool del_edge_h(connection_t *c)
{
edge_t *e;
char from_name[MAX_STRING_SIZE];
cp();
if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) {
- logger(DEBUG_ALWAYS, LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_EDGE", c->name,
+ logger(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_EDGE", c->name,
c->hostname);
- return -1;
+ return false;
}
/* Check if names are valid */
- if(check_id(from_name)) {
- logger(DEBUG_ALWAYS, LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
+ if(!check_id(from_name)) {
+ logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
c->hostname, _("invalid name"));
- return -1;
+ return false;
}
- if(check_id(to_name)) {
- logger(DEBUG_ALWAYS, LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
+ if(!check_id(to_name)) {
+ logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
c->hostname, _("invalid name"));
- return -1;
+ return false;
}
if(seen_request(c->buffer))
- return 0;
+ return true;
/* Lookup nodes */
from = lookup_node(from_name);
if(!from) {
- logger(DEBUG_PROTOCOL, LOG_ERR, _("Got %s from %s (%s) which does not appear in the edge tree"),
+ ifdebug(PROTOCOL) logger(LOG_ERR, _("Got %s from %s (%s) which does not appear in the edge tree"),
"DEL_EDGE", c->name, c->hostname);
- return 0;
+ return true;
}
to = lookup_node(to_name);
if(!to) {
- logger(DEBUG_PROTOCOL, LOG_ERR, _("Got %s from %s (%s) which does not appear in the edge tree"),
+ ifdebug(PROTOCOL) logger(LOG_ERR, _("Got %s from %s (%s) which does not appear in the edge tree"),
"DEL_EDGE", c->name, c->hostname);
- return 0;
+ return true;
}
+ if(tunnelserver && from != myself && from != c->node && to != myself && to != c->node)
+ return false;
+
/* Check if edge exists */
e = lookup_edge(from, to);
if(!e) {
- logger(DEBUG_PROTOCOL, LOG_WARNING, _("Got %s from %s (%s) which does not appear in the edge tree"),
+ ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) which does not appear in the edge tree"),
"DEL_EDGE", c->name, c->hostname);
- return 0;
+ return true;
}
if(e->from == myself) {
- logger(DEBUG_PROTOCOL, LOG_WARNING, _("Got %s from %s (%s) for ourself"),
+ ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself"),
"DEL_EDGE", c->name, c->hostname);
send_add_edge(c, e); /* Send back a correction */
- return 0;
+ return true;
}
/* Tell the rest about the deleted edge */
- forward_request(c);
+ if(!tunnelserver)
+ forward_request(c);
/* Delete the edge */
graph();
- return 0;
+ /* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
+
+ if(!to->status.reachable) {
+ e = lookup_edge(to, myself);
+ if(e) {
+ if(!tunnelserver)
+ send_del_edge(broadcast, e);
+ edge_del(e);
+ }
+ }
+
+ return true;
}
projects / tinc / blobdiff