/*
protocol_edge.c -- handle the meta-protocol, edges
Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2016 Guus Sliepen <guus@tinc-vpn.org>
2009 Michael Tokarev <mjt@corpit.ru>
This program is free software; you can redistribute it and/or modify
bool x;
char *address, *port;
- cp();
-
sockaddr2str(&e->address, &address, &port);
- x = send_request(c, "%d %x %s %s %s %s %lx %d", ADD_EDGE, rand(),
- e->from->name, e->to->name, address, port,
- e->options, e->weight);
+ x = send_request(c, "%d %x %s %s %s %s %x %d", ADD_EDGE, rand(),
+ e->from->name, e->to->name, address, port,
+ e->options, e->weight);
free(address);
free(port);
char to_address[MAX_STRING_SIZE];
char to_port[MAX_STRING_SIZE];
sockaddr_t address;
- long int options;
+ uint32_t options;
int weight;
- cp();
-
- 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(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name,
- c->hostname);
+ if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %x %d",
+ from_name, to_name, to_address, to_port, &options, &weight) != 6) {
+ logger(LOG_ERR, "Got bad %s from %s (%s)", "ADD_EDGE", c->name,
+ c->hostname);
return false;
}
/* Check if names are valid */
- if(!check_id(from_name)) {
- logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
- c->hostname, _("invalid name"));
- return false;
- }
-
- if(!check_id(to_name)) {
- logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
- c->hostname, _("invalid name"));
+ if(!check_id(from_name) || !check_id(to_name)) {
+ logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
+ c->hostname, "invalid name");
return false;
}
- if(seen_request(c->buffer))
+ if(seen_request(c->buffer)) {
return true;
+ }
/* Lookup nodes */
to = lookup_node(to_name);
if(tunnelserver &&
- from != myself && from != c->node &&
- to != myself && to != c->node) {
+ from != myself && from != c->node &&
+ to != myself && to != c->node) {
/* ignore indirect edge registrations for tunnelserver */
ifdebug(PROTOCOL) logger(LOG_WARNING,
- _("Ignoring indirect %s from %s (%s)"),
- "ADD_EDGE", c->name, c->hostname);
+ "Ignoring indirect %s from %s (%s)",
+ "ADD_EDGE", c->name, c->hostname);
return true;
}
if(e) {
if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address)) {
if(from == myself) {
- ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not match existing entry"),
- "ADD_EDGE", c->name, c->hostname);
+ 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 true;
} else {
- 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();
+ ifdebug(PROTOCOL) logger(LOG_WARNING, "Got %s from %s (%s) which does not match existing entry",
+ "ADD_EDGE", c->name, c->hostname);
+ e->options = options;
+
+ if(sockaddrcmp(&e->address, &address)) {
+ sockaddrfree(&e->address);
+ e->address = address;
+ }
+
+ if(e->weight != weight) {
+ avl_node_t *node = avl_unlink(edge_weight_tree, e);
+ e->weight = weight;
+ avl_insert_node(edge_weight_tree, node);
+ }
+
+ goto done;
}
- } else
+ } else {
return true;
+ }
} else if(from == myself) {
- ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not exist"),
- "ADD_EDGE", c->name, c->hostname);
+ ifdebug(PROTOCOL) logger(LOG_WARNING, "Got %s from %s (%s) for ourself which does not exist",
+ "ADD_EDGE", c->name, c->hostname);
+ contradicting_add_edge++;
e = new_edge();
e->from = from;
e->to = to;
e->weight = weight;
edge_add(e);
+done:
/* Tell the rest about the new edge */
- if(!tunnelserver)
+ if(!tunnelserver) {
forward_request(c);
+ }
/* Run MST before or after we tell the rest? */
}
bool send_del_edge(connection_t *c, const edge_t *e) {
- cp();
-
return send_request(c, "%d %x %s %s", DEL_EDGE, rand(),
- e->from->name, e->to->name);
+ e->from->name, e->to->name);
}
bool del_edge_h(connection_t *c) {
char to_name[MAX_STRING_SIZE];
node_t *from, *to;
- cp();
-
if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) {
- logger(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_EDGE", c->name,
- c->hostname);
+ logger(LOG_ERR, "Got bad %s from %s (%s)", "DEL_EDGE", c->name,
+ c->hostname);
return false;
}
/* Check if names are valid */
- if(!check_id(from_name)) {
- logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
- c->hostname, _("invalid name"));
+ if(!check_id(from_name) || !check_id(to_name)) {
+ logger(LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_EDGE", c->name,
+ c->hostname, "invalid name");
return false;
}
- if(!check_id(to_name)) {
- logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
- c->hostname, _("invalid name"));
- return false;
- }
-
- if(seen_request(c->buffer))
+ if(seen_request(c->buffer)) {
return true;
+ }
/* Lookup nodes */
to = lookup_node(to_name);
if(tunnelserver &&
- from != myself && from != c->node &&
- to != myself && to != c->node) {
+ from != myself && from != c->node &&
+ to != myself && to != c->node) {
/* ignore indirect edge registrations for tunnelserver */
ifdebug(PROTOCOL) logger(LOG_WARNING,
- _("Ignoring indirect %s from %s (%s)"),
- "DEL_EDGE", c->name, c->hostname);
+ "Ignoring indirect %s from %s (%s)",
+ "DEL_EDGE", c->name, c->hostname);
return true;
}
if(!from) {
- ifdebug(PROTOCOL) logger(LOG_ERR, _("Got %s from %s (%s) which does not appear in the edge tree"),
- "DEL_EDGE", c->name, c->hostname);
+ 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 true;
}
if(!to) {
- ifdebug(PROTOCOL) logger(LOG_ERR, _("Got %s from %s (%s) which does not appear in the edge tree"),
- "DEL_EDGE", c->name, c->hostname);
+ 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 true;
}
e = lookup_edge(from, to);
if(!e) {
- ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) which does not appear in the edge tree"),
- "DEL_EDGE", c->name, c->hostname);
+ 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 true;
}
if(e->from == myself) {
- 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 */
+ ifdebug(PROTOCOL) logger(LOG_WARNING, "Got %s from %s (%s) for ourself",
+ "DEL_EDGE", c->name, c->hostname);
+ contradicting_del_edge++;
+ send_add_edge(c, e); /* Send back a correction */
return true;
}
/* Tell the rest about the deleted edge */
- if(!tunnelserver)
+ if(!tunnelserver) {
forward_request(c);
+ }
/* Delete the edge */
if(!to->status.reachable) {
e = lookup_edge(to, myself);
+
if(e) {
- if(!tunnelserver)
- send_del_edge(broadcast, e);
+ if(!tunnelserver) {
+ send_del_edge(everyone, e);
+ }
+
edge_del(e);
}
}
projects / tinc / blobdiff