X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=9b35a9fb91079ea1616085ed32ecd8a4e61ccba4;hp=9c83199b8a250de4dccc826d8c1c4a91f6a523e7;hb=82ebfc923ddb050c88bdf5d65ac943a15ca8748a;hpb=5bf4b88666ecafe190e8ed71d6c14c9de8d16e1f diff --git a/src/protocol_edge.c b/src/protocol_edge.c index 9c83199b..9b35a9fb 100644 --- a/src/protocol_edge.c +++ b/src/protocol_edge.c @@ -1,7 +1,7 @@ /* protocol_edge.c -- handle the meta-protocol, edges - Copyright (C) 1999-2002 Ivo Timmermans , - 2000-2002 Guus Sliepen + Copyright (C) 1999-2002 Ivo Timmermans , + 2000-2002 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 @@ -17,7 +17,7 @@ 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.1 2002/02/11 10:05:58 guus Exp $ + $Id: protocol_edge.c,v 1.1.4.9 2002/09/04 13:48:52 guus Exp $ */ #include "config.h" @@ -48,16 +48,14 @@ int send_add_edge(connection_t *c, edge_t *e) { int x; - char *from_addrstr, *to_addrstr; + char *address, *port; cp - from_addrstr = address2str(e->from.address); - to_addrstr = address2str(e->to.address); - x = send_request(c, "%d %s %s %hd %s %s %hd %lx %d", ADD_EDGE, - e->from.node->name, from_addrstr, e->from.port, - e->to.node->name, to_addrstr, e->to.port, + sockaddr2str(&e->address, &address, &port); + x = send_request(c, "%d %lx %s %s %s %s %lx %d", ADD_EDGE, random(), + e->from->name, e->to->name, address, port, e->options, e->weight); - free(from_addrstr); - free(to_addrstr); + free(address); + free(port); cp return x; } @@ -69,18 +67,15 @@ int add_edge_h(connection_t *c) node_t *from, *to; char from_name[MAX_STRING_SIZE]; char to_name[MAX_STRING_SIZE]; - char from_addrstr[MAX_STRING_SIZE]; - char to_addrstr[MAX_STRING_SIZE]; - ipv4_t from_address, to_address; - port_t from_port, to_port; + char to_address[MAX_STRING_SIZE]; + char to_port[MAX_STRING_SIZE]; + sockaddr_t address; long int options; int weight; avl_node_t *node; cp - if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" %hd "MAX_STRING" "MAX_STRING" %hd %lx %d", - from_name, from_addrstr, &from_port, - to_name, to_addrstr, &to_port, - &options, &weight) != 8) + 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) { syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name, c->hostname); return -1; @@ -100,6 +95,9 @@ cp return -1; } + if(seen_request(c->buffer)) + return 0; + /* Lookup nodes */ from = lookup_node(from_name); @@ -122,8 +120,7 @@ cp /* Convert addresses */ - from_address = str2address(from_addrstr); - to_address = str2address(to_addrstr); + address = str2sockaddr(to_address, to_port); /* Check if edge already exists */ @@ -131,12 +128,9 @@ cp if(e) { - if(e->weight != weight || e->options != options - || ((e->from.node == from) && (e->from.address != from_address || e->from.port != from_port || e->to.address != to_address || e->to.port != to_port)) - || ((e->from.node == to) && (e->from.address != to_address || e->from.port != to_port || e->to.address != from_address || e->to.port != from_port)) - ) + if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address)) { - if(from == myself || to == myself) + if(from == myself) { if(debug_lvl >= DEBUG_PROTOCOL) syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not match existing entry"), "ADD_EDGE", c->name, c->hostname); @@ -153,27 +147,22 @@ cp else return 0; } - else if(from == myself || to == myself) + else if(from == myself) { if(debug_lvl >= DEBUG_PROTOCOL) syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not exist"), "ADD_EDGE", c->name, c->hostname); e = new_edge(); - e->from.node = from; - e->to.node = to; + e->from = from; + e->to = to; send_del_edge(c, e); free_edge(e); return 0; } - - e = new_edge(); - e->from.node = from; - e->from.address = from_address; - e->from.port = from_port; - e->to.node = to; - e->to.address = to_address; - e->to.port = to_port; + e->from = from; + e->to = to; + e->address = address; e->options = options; e->weight = weight; edge_add(e); @@ -184,7 +173,7 @@ cp { other = (connection_t *)node->data; if(other->status.active && other != c) - send_add_edge(other, e); + send_request(other, "%s", c->buffer); } /* Run MST before or after we tell the rest? */ @@ -197,8 +186,8 @@ cp int send_del_edge(connection_t *c, edge_t *e) { cp - return send_request(c, "%d %s %s", DEL_EDGE, - e->from.node->name, e->to.node->name); + return send_request(c, "%d %lx %s %s", DEL_EDGE, random(), + e->from->name, e->to->name); } int del_edge_h(connection_t *c) @@ -210,7 +199,7 @@ int del_edge_h(connection_t *c) connection_t *other; avl_node_t *node; cp - if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING"", from_name, to_name) != 2) + 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, c->hostname); @@ -231,6 +220,9 @@ cp return -1; } + if(seen_request(c->buffer)) + return 0; + /* Lookup nodes */ from = lookup_node(from_name); @@ -262,7 +254,7 @@ cp return 0; } - if(e->from.node == myself || e->to.node == myself) + if(e->from == myself) { if(debug_lvl >= DEBUG_PROTOCOL) syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself"), "DEL_EDGE", c->name, c->hostname); @@ -276,7 +268,7 @@ cp { other = (connection_t *)node->data; if(other->status.active && other != c) - send_del_edge(other, e); + send_request(other, "%s", c->buffer); } /* Delete the edge */