X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=5c47f5837a544a1cc833905ef0f85e97a9083b07;hb=1da7f28315be17a4ed854cdceb97a870f16a511e;hp=bd473f15c714a621b8475cc572b2ce0dbc8ec41e;hpb=f75dcef72a81a337e847adf0bae54198894f65b9;p=meshlink diff --git a/src/protocol_edge.c b/src/protocol_edge.c index bd473f15..5c47f583 100644 --- a/src/protocol_edge.c +++ b/src/protocol_edge.c @@ -1,7 +1,6 @@ /* protocol_edge.c -- handle the meta-protocol, edges - Copyright (C) 1999-2002 Ivo Timmermans , - 2000-2002 Guus Sliepen + Copyright (C) 2014 Guus Sliepen 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 @@ -13,48 +12,34 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - 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.12 2002/09/09 21:24:48 guus Exp $ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" - -#include -#include -#include -#include -#include -#include - -#include -#include -#include +#include "system.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 "meshlink_internal.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) -{ - int x; +bool send_add_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e) { + bool x; char *address, *port; - cp(); - sockaddr2str(&e->address, &address, &port); - x = send_request(c, "%d %lx %s %s %s %s %lx %d", ADD_EDGE, random(), + x = send_request(mesh, 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); @@ -63,8 +48,7 @@ int send_add_edge(connection_t * c, edge_t * e) return x; } -int add_edge_h(connection_t * c) -{ +bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { edge_t *e; node_t *from, *to; char from_name[MAX_STRING_SIZE]; @@ -72,53 +56,45 @@ int add_edge_h(connection_t * c) 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", + if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %x %d", from_name, to_name, to_address, to_port, &options, &weight) != 6) { - syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name, + logger(mesh, MESHLINK_ERROR, "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)) { - syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, - c->hostname, _("invalid name")); - return -1; - } - - if(check_id(to_name)) { - syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, - c->hostname, _("invalid name")); - return -1; + if(!check_id(from_name) || !check_id(to_name)) { + logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name, + c->hostname, "invalid name"); + return false; } - if(seen_request(c->buffer)) - return 0; + if(seen_request(mesh, request)) + return true; /* Lookup nodes */ - from = lookup_node(from_name); + from = lookup_node(mesh, from_name); + to = lookup_node(mesh, to_name); if(!from) { from = new_node(); from->name = xstrdup(from_name); - node_add(from); + node_add(mesh, from); } - to = lookup_node(to_name); - if(!to) { to = new_node(); to->name = xstrdup(to_name); - node_add(to); + node_add(mesh, to); } + /* Convert addresses */ address = str2sockaddr(to_address, to_port); @@ -129,30 +105,29 @@ int add_edge_h(connection_t * c) if(e) { if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address)) { - if(from == myself) { - if(debug_lvl >= DEBUG_PROTOCOL) - syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not match existing entry"), + if(from == mesh->self) { + logger(mesh, MESHLINK_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; + send_add_edge(mesh, c, e); + return true; } else { - if(debug_lvl >= DEBUG_PROTOCOL) - syslog(LOG_WARNING, _("Got %s from %s (%s) which does not match existing entry"), + logger(mesh, MESHLINK_WARNING, "Got %s from %s (%s) which does not match existing entry", "ADD_EDGE", c->name, c->hostname); - edge_del(e); + edge_del(mesh, e); + graph(mesh); } } else - return 0; - } else if(from == myself) { - if(debug_lvl >= DEBUG_PROTOCOL) - syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not exist"), + return true; + } else if(from == mesh->self) { + logger(mesh, MESHLINK_WARNING, "Got %s from %s (%s) for ourself which does not exist", "ADD_EDGE", c->name, c->hostname); + mesh->contradicting_add_edge++; e = new_edge(); e->from = from; e->to = to; - send_del_edge(c, e); + send_del_edge(mesh, c, e); free_edge(e); - return 0; + return true; } e = new_edge(); @@ -161,81 +136,62 @@ int add_edge_h(connection_t * c) e->address = address; e->options = options; e->weight = weight; - edge_add(e); + edge_add(mesh, e); /* Tell the rest about the new edge */ - forward_request(c); + forward_request(mesh, c, request); /* Run MST before or after we tell the rest? */ - graph(); + graph(mesh); - return 0; + return true; } -int send_del_edge(connection_t * c, edge_t * e) -{ - cp(); - - return send_request(c, "%d %lx %s %s", DEL_EDGE, random(), +bool send_del_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e) { + return send_request(mesh, c, "%d %x %s %s", DEL_EDGE, rand(), e->from->name, e->to->name); } -int del_edge_h(connection_t * c) -{ +bool del_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { edge_t *e; char from_name[MAX_STRING_SIZE]; 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) { - syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_EDGE", c->name, + if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) { + logger(mesh, MESHLINK_ERROR, "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)) { - syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, - c->hostname, _("invalid name")); - return -1; - } - - if(check_id(to_name)) { - syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, - c->hostname, _("invalid name")); - return -1; + if(!check_id(from_name) || !check_id(to_name)) { + logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "DEL_EDGE", c->name, + c->hostname, "invalid name"); + return false; } - if(seen_request(c->buffer)) - return 0; + if(seen_request(mesh, request)) + return true; /* Lookup nodes */ - from = lookup_node(from_name); + from = lookup_node(mesh, from_name); + to = lookup_node(mesh, to_name); if(!from) { - if(debug_lvl >= DEBUG_PROTOCOL) - syslog(LOG_ERR, - _ - ("Got %s from %s (%s) which does not appear in the edge tree"), + logger(mesh, MESHLINK_ERROR, "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) { - if(debug_lvl >= DEBUG_PROTOCOL) - syslog(LOG_ERR, - _ - ("Got %s from %s (%s) which does not appear in the edge tree"), + logger(mesh, MESHLINK_ERROR, "Got %s from %s (%s) which does not appear in the edge tree", "DEL_EDGE", c->name, c->hostname); - return 0; + return true; } /* Check if edge exists */ @@ -243,33 +199,40 @@ int del_edge_h(connection_t * c) e = lookup_edge(from, to); if(!e) { - if(debug_lvl >= DEBUG_PROTOCOL) - syslog(LOG_WARNING, - _ - ("Got %s from %s (%s) which does not appear in the edge tree"), + logger(mesh, MESHLINK_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) { - if(debug_lvl >= DEBUG_PROTOCOL) - syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself"), + if(e->from == mesh->self) { + logger(mesh, MESHLINK_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; + mesh->contradicting_del_edge++; + send_add_edge(mesh, c, e); /* Send back a correction */ + return true; } /* Tell the rest about the deleted edge */ - forward_request(c); + forward_request(mesh, c, request); /* Delete the edge */ - edge_del(e); + edge_del(mesh, e); /* Run MST before or after we tell the rest? */ - graph(); + graph(mesh); + + /* 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, mesh->self); + if(e) { + send_del_edge(mesh, mesh->everyone, e); + edge_del(mesh, e); + } + } - return 0; + return true; }