X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=9b35a9fb91079ea1616085ed32ecd8a4e61ccba4;hp=4fd5354bd70a0b478164b08eecccca1b73ae50f6;hb=82ebfc923ddb050c88bdf5d65ac943a15ca8748a;hpb=9da5390666ad532825d820b3554da3f39d3bc511;ds=sidebyside diff --git a/src/protocol_edge.c b/src/protocol_edge.c index 4fd5354b..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.3 2002/03/21 23:11:53 guus Exp $ + $Id: protocol_edge.c,v 1.1.4.9 2002/09/04 13:48:52 guus Exp $ */ #include "config.h" @@ -48,25 +48,14 @@ int send_add_edge(connection_t *c, edge_t *e) { int x; - char *from_tcpaddress, *from_tcpport, *from_udpaddress, *from_udpport; - char *to_tcpaddress, *to_tcpport, *to_udpaddress, *to_udpport; + char *address, *port; cp - sockaddr2str(&e->from.tcpaddress, &from_tcpaddress, &from_tcpport); - sockaddr2str(&e->from.udpaddress, &from_udpaddress, &from_udpport); - sockaddr2str(&e->to.tcpaddress, &to_tcpaddress, &to_tcpport); - sockaddr2str(&e->to.udpaddress, &to_udpaddress, &to_udpport); - x = send_request(c, "%d %lx %s %s %s %s %s %s %s %s %lx %d", ADD_EDGE, random(), - e->from.node->name, from_tcpaddress, from_tcpport, from_udpport, - e->to.node->name, to_tcpaddress, to_tcpport, to_udpport, + 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_tcpaddress); - free(from_tcpport); - free(from_udpaddress); - free(from_udpport); - free(to_tcpaddress); - free(to_tcpport); - free(to_udpaddress); - free(to_udpport); + free(address); + free(port); cp return x; } @@ -78,22 +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_address[MAX_STRING_SIZE]; - char from_tcpport[MAX_STRING_SIZE]; - char from_udpport[MAX_STRING_SIZE]; char to_address[MAX_STRING_SIZE]; - char to_tcpport[MAX_STRING_SIZE]; - char to_udpport[MAX_STRING_SIZE]; - sockaddr_t from_tcpaddress, from_udpaddress; - sockaddr_t to_tcpaddress, to_udpaddress; + char to_port[MAX_STRING_SIZE]; + sockaddr_t address; long int options; int weight; avl_node_t *node; cp - if(sscanf(c->buffer, "%*d %*lx "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %lx %d", - from_name, from_address, from_tcpport, from_udpport, - to_name, to_address, to_tcpport, to_udpport, - &options, &weight) != 10) + 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; @@ -138,10 +120,7 @@ cp /* Convert addresses */ - from_tcpaddress = str2sockaddr(from_address, from_tcpport); - from_udpaddress = str2sockaddr(from_address, from_udpport); - to_tcpaddress = str2sockaddr(to_address, to_tcpport); - to_udpaddress = str2sockaddr(to_address, to_udpport); + address = str2sockaddr(to_address, to_port); /* Check if edge already exists */ @@ -149,12 +128,9 @@ cp if(e) { - if(e->weight != weight || e->options != options - || ((e->from.node == from) && (sockaddrcmp(&e->from.tcpaddress, &from_tcpaddress) || sockaddrcmp(&e->from.udpaddress, &from_udpaddress) || sockaddrcmp(&e->to.tcpaddress, &to_tcpaddress) || sockaddrcmp(&e->to.udpaddress, &to_udpaddress))) - || ((e->from.node == to) && (sockaddrcmp(&e->from.tcpaddress, &to_tcpaddress) || sockaddrcmp(&e->from.udpaddress, &to_udpaddress) || sockaddrcmp(&e->to.tcpaddress, &from_tcpaddress) || sockaddrcmp(&e->to.udpaddress, &from_udpaddress))) - ) + 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); @@ -171,25 +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.tcpaddress = from_tcpaddress; - e->from.udpaddress = from_udpaddress; - e->to.node = to; - e->to.tcpaddress = to_tcpaddress; - e->to.udpaddress = to_udpaddress; + e->from = from; + e->to = to; + e->address = address; e->options = options; e->weight = weight; edge_add(e); @@ -214,7 +187,7 @@ int send_del_edge(connection_t *c, edge_t *e) { cp return send_request(c, "%d %lx %s %s", DEL_EDGE, random(), - e->from.node->name, e->to.node->name); + e->from->name, e->to->name); } int del_edge_h(connection_t *c) @@ -226,7 +199,7 @@ int del_edge_h(connection_t *c) connection_t *other; avl_node_t *node; cp - if(sscanf(c->buffer, "%*d %*lx "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); @@ -281,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);