X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=d0dd9f7805024e9cbf5a46f36158ab0aaaa95849;hp=bf54c6a5245289893c88137a3cddfa29ae035c2f;hb=12f6b80429bc05a828051d72cc46f173e4657180;hpb=fcf869cd4250a240ea8d443f70fa373e4fbacf07 diff --git a/src/protocol.c b/src/protocol.c index bf54c6a5..d0dd9f78 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -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.c,v 1.28.4.91 2001/05/25 11:54:28 guus Exp $ + $Id: protocol.c,v 1.28.4.102 2001/07/20 20:25:10 guus Exp $ */ #include "config.h" @@ -40,25 +40,14 @@ #include -#ifdef HAVE_OPENSSL_SHA_H -# include -#else -# include -#endif - -#ifdef HAVE_OPENSSL_RAND_H -# include -#else -# include -#endif +#include +#include +#include -#ifdef HAVE_OPENSSL_EVP_H -# include -#else -# include +#ifndef HAVE_RAND_PSEUDO_BYTES +#define RAND_pseudo_bytes RAND_bytes #endif - #include "conf.h" #include "net.h" #include "netutl.h" @@ -184,12 +173,9 @@ cp int id_h(connection_t *cl) { - connection_t *old; - unsigned short int port; char name[MAX_STRING_SIZE]; - avl_node_t *node; cp - if(sscanf(cl->buffer, "%*d "MAX_STRING" %d %lx %hd", name, &cl->protocol_version, &cl->options, &port) != 4) + if(sscanf(cl->buffer, "%*d "MAX_STRING" %d %lx %hd", name, &cl->protocol_version, &cl->options, &cl->port) != 4) { syslog(LOG_ERR, _("Got bad ID from %s"), cl->hostname); return -1; @@ -214,6 +200,9 @@ cp /* Copy string to cl */ + if(cl->name) + free(cl->name); + cl->name = xstrdup(name); /* Load information about peer */ @@ -224,34 +213,6 @@ cp return -1; } - /* First check if the host we connected to is already in our - connection list. If so, we are probably making a loop, which - is not desirable. - */ - - if(cl->status.outgoing) - { - if((old = lookup_id(cl->name))) - { - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_NOTICE, _("Uplink %s (%s) is already in our connection list"), cl->name, cl->hostname); - cl->status.outgoing = 0; - old->status.outgoing = 1; - terminate_connection(cl); - return 0; - } - } - - /* Now we can add the name to the id tree */ - - id_add(cl); - - /* And uhr... cl->port just changed so we have to unlink it from the connection tree and re-insert... */ - - node = avl_unlink(connection_tree, cl); - cl->port = port; - avl_insert_node(connection_tree, node); - /* Read in the public key, so that we can send a metakey */ if(read_rsa_public_key(cl)) @@ -274,26 +235,44 @@ cp old connection that has timed out but we don't know it yet. */ - while((old = lookup_id(cl->name))) + if((old = lookup_id(cl->name))) { if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"), - cl->name, old->hostname, cl->hostname); - + syslog(LOG_NOTICE, _("Removing old connection for %s at %s in favour of new connection from %s"), + cl->name, old->hostname, cl->hostname); + if(old->status.outgoing) + { + cl->status.outgoing = 1; + old->status.outgoing = 0; + } terminate_connection(old); + return 0; } - + + /* Also check if no other tinc daemon uses the same IP and port for UDP traffic */ + + old = avl_search(active_tree, cl); + if(old) + { + syslog(LOG_ERR, _("%s is listening on %s:%hd, which is already in use by %s!"), + cl->name, cl->hostname, cl->port, old->name); + return -1; + } + /* Activate this connection */ cl->allow_request = ALL; - cl->status.active = 1; cl->nexthop = cl; cl->cipher_pkttype = EVP_bf_cbc(); cl->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len; + active_add(cl); + if(debug_lvl >= DEBUG_CONNECTIONS) syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->name, cl->hostname); + if(cl->status.outgoing) + seconds_till_retry = 5; /* Reset retry timeout */ cp /* Check some options */ @@ -319,11 +298,11 @@ cp /* And send him all the hosts and their subnets we know... */ - for(node = connection_tree->head; node; node = node->next) + for(node = active_tree->head; node; node = node->next) { p = (connection_t *)node->data; - if(p != cl && p->status.active) + if(p != cl) { /* Notify others of this connection */ @@ -340,7 +319,7 @@ cp send_add_subnet(cl, subnet); } } - } + } cp return 0; } @@ -706,7 +685,7 @@ cp for(node = connection_tree->head; node; node = node->next) { p = (connection_t *)node->data; - if(p->status.meta && p->status.active && p!= cl) + if(p->status.active && p!= cl) send_add_subnet(p, subnet); } cp @@ -790,7 +769,7 @@ cp for(node = connection_tree->head; node; node = node->next) { p = (connection_t *)node->data; - if(p->status.meta && p->status.active && p!= cl) + if(p->status.active && p!= cl) send_del_subnet(p, subnet); } cp @@ -854,7 +833,7 @@ cp { if(debug_lvl >= DEBUG_CONNECTIONS) syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"), - old->name, old->hostname, name, new->hostname); + old->name, old->hostname, cl->name, cl->hostname); free_connection(new); return 0; } @@ -868,25 +847,23 @@ cp } } - /* Hook it up into the connection */ + /* Hook it up into the active tree */ new->name = xstrdup(name); - connection_add(new); - id_add(new); + active_add(new); /* Tell the rest about the new host */ for(node = connection_tree->head; node; node = node->next) { p = (connection_t *)node->data; - if(p->status.meta && p->status.active && p!=cl) + if(p->status.active && p!=cl) send_add_host(p, new); } /* Fill in rest of connection structure */ new->nexthop = cl; - new->status.active = 1; new->cipher_pkttype = EVP_bf_cbc(); new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len; cp @@ -937,12 +914,12 @@ cp return 0; } - /* Check if the new host already exists in the connnection list */ + /* Check if the deleted host already exists in the connnection list */ if(!(old = lookup_id(name))) { syslog(LOG_ERR, _("Got DEL_HOST from %s (%s) for %s which is not in our connection list"), - name, cl->name, cl->hostname); + cl->name, cl->hostname, name); return -1; } @@ -956,15 +933,14 @@ cp /* Ok, since EVERYTHING seems to check out all right, delete it */ - old->status.active = 0; terminate_connection(old); - /* Tell the rest about the new host */ + /* Tell the rest about the deleted host */ for(node = connection_tree->head; node; node = node->next) { p = (connection_t *)node->data; - if(p->status.meta && p->status.active && p!=cl) + if(p->status.active && p!=cl) send_del_host(p, old); } cp @@ -1055,7 +1031,7 @@ int send_ping(connection_t *cl) cp cl->status.pinged = 1; cl->last_ping_time = time(NULL); - RAND_bytes(salt, SALTLEN); + RAND_pseudo_bytes(salt, SALTLEN); bin2hex(salt, salt, SALTLEN); salt[SALTLEN*2] = '\0'; cp @@ -1072,7 +1048,7 @@ int send_pong(connection_t *cl) { char salt[SALTLEN*2+1]; cp - RAND_bytes(salt, SALTLEN); + RAND_pseudo_bytes(salt, SALTLEN); bin2hex(salt, salt, SALTLEN); salt[SALTLEN*2] = '\0'; cp @@ -1098,17 +1074,16 @@ cp This reduces unnecessary key_changed broadcasts. */ - if(mykeyused) + if(from==myself && !mykeyused) + return 0; + + for(node = connection_tree->head; node; node = node->next) { - for(node = connection_tree->head; node; node = node->next) - { - p = (connection_t *)node->data; - if(p != cl && p->status.meta && p->status.active) - if(!(p->options & OPTION_INDIRECT) || from == myself) - send_request(p, "%d %s", KEY_CHANGED, from->name); - } - mykeyused = 0; - } + p = (connection_t *)node->data; + if(p != cl && p->status.active) + if(!(p->options & OPTION_INDIRECT) || from == myself) + send_request(p, "%d %s", KEY_CHANGED, from->name); + } cp return 0; }