X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=3b89cdec9bd438cf8169e5f310de91b796ca1714;hb=2e606e5823d06aece9a0d4719e07ce3b28ebeadc;hp=bf283dd667949caad12e90f79c7f22ba4e9ae039;hpb=40c28589328a2aa96c2ce1419c5d90616c758b3d;p=meshlink diff --git a/src/protocol_edge.c b/src/protocol_edge.c index bf283dd6..3b89cdec 100644 --- a/src/protocol_edge.c +++ b/src/protocol_edge.c @@ -1,8 +1,6 @@ /* protocol_edge.c -- handle the meta-protocol, edges - Copyright (C) 1999-2005 Ivo Timmermans, - 2000-2009 Guus Sliepen - 2009 Michael Tokarev + 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 @@ -21,12 +19,12 @@ #include "system.h" -#include "splay_tree.h" #include "conf.h" #include "connection.h" #include "edge.h" #include "graph.h" #include "logger.h" +#include "meshlink_internal.h" #include "meta.h" #include "net.h" #include "netutl.h" @@ -35,13 +33,13 @@ #include "utils.h" #include "xalloc.h" -bool send_add_edge(connection_t *c, const edge_t *e) { +bool send_add_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e) { bool x; char *address, *port; sockaddr2str(&e->address, &address, &port); - x = send_request(c, "%d %x %s %s %s %s %x %d", ADD_EDGE, rand(), + 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); @@ -50,7 +48,7 @@ bool send_add_edge(connection_t *c, const edge_t *e) { return x; } -bool add_edge_h(connection_t *c, char *request) { +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]; @@ -76,34 +74,24 @@ bool add_edge_h(connection_t *c, char *request) { return false; } - if(seen_request(request)) + if(seen_request(mesh, request)) return true; /* Lookup nodes */ - from = lookup_node(from_name); - to = lookup_node(to_name); - - if(tunnelserver && - from != myself && from != c->node && - to != myself && to != c->node) { - /* ignore indirect edge registrations for tunnelserver */ - logger(DEBUG_PROTOCOL, LOG_WARNING, - "Ignoring indirect %s from %s (%s)", - "ADD_EDGE", c->name, c->hostname); - return true; - } + 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); } if(!to) { to = new_node(); to->name = xstrdup(to_name); - node_add(to); + node_add(mesh, to); } @@ -117,27 +105,27 @@ bool add_edge_h(connection_t *c, char *request) { if(e) { if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address)) { - if(from == myself) { + if(from == mesh->self) { logger(DEBUG_PROTOCOL, 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); + send_add_edge(mesh, c, e); return true; } else { logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) which does not match existing entry", "ADD_EDGE", c->name, c->hostname); - edge_del(e); - graph(); + edge_del(mesh, e); + graph(mesh); } } else return true; - } else if(from == myself) { + } else if(from == mesh->self) { logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not exist", "ADD_EDGE", c->name, c->hostname); - contradicting_add_edge++; + 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 true; } @@ -148,26 +136,25 @@ bool add_edge_h(connection_t *c, char *request) { e->address = address; e->options = options; e->weight = weight; - edge_add(e); + edge_add(mesh, e); /* Tell the rest about the new edge */ - if(!tunnelserver) - forward_request(c, request); + forward_request(mesh, c, request); /* Run MST before or after we tell the rest? */ - graph(); + graph(mesh); return true; } -bool send_del_edge(connection_t *c, const edge_t *e) { - return send_request(c, "%d %x %s %s", DEL_EDGE, rand(), +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); } -bool del_edge_h(connection_t *c, char *request) { +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]; @@ -187,23 +174,13 @@ bool del_edge_h(connection_t *c, char *request) { return false; } - if(seen_request(request)) + if(seen_request(mesh, request)) return true; /* Lookup nodes */ - from = lookup_node(from_name); - to = lookup_node(to_name); - - if(tunnelserver && - from != myself && from != c->node && - to != myself && to != c->node) { - /* ignore indirect edge registrations for tunnelserver */ - logger(DEBUG_PROTOCOL, LOG_WARNING, - "Ignoring indirect %s from %s (%s)", - "DEL_EDGE", c->name, c->hostname); - return true; - } + from = lookup_node(mesh, from_name); + to = lookup_node(mesh, to_name); if(!from) { logger(DEBUG_PROTOCOL, LOG_ERR, "Got %s from %s (%s) which does not appear in the edge tree", @@ -227,35 +204,33 @@ bool del_edge_h(connection_t *c, char *request) { return true; } - if(e->from == myself) { + if(e->from == mesh->self) { logger(DEBUG_PROTOCOL, 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 */ + mesh->contradicting_del_edge++; + send_add_edge(mesh, c, e); /* Send back a correction */ return true; } /* Tell the rest about the deleted edge */ - if(!tunnelserver) - forward_request(c, request); + 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, myself); + e = lookup_edge(to, mesh->self); if(e) { - if(!tunnelserver) - send_del_edge(everyone, e); - edge_del(e); + send_del_edge(mesh, mesh->everyone, e); + edge_del(mesh, e); } }