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.99 2001/07/15 18:07:31 guus Exp $
+ $Id: protocol.c,v 1.28.4.105 2001/09/01 12:02:39 guus Exp $
*/
#include "config.h"
int id_h(connection_t *cl)
{
- connection_t *old;
char name[MAX_STRING_SIZE];
cp
if(sscanf(cl->buffer, "%*d "MAX_STRING" %d %lx %hd", name, &cl->protocol_version, &cl->options, &cl->port) != 4)
cl->name = xstrdup(name);
- /* Make sure we don't make an outgoing connection to a host that is already in our connection list */
-
- if(cl->status.outgoing)
- if((old = lookup_id(cl->name)))
- {
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("We are already connected to %s."), cl->name);
- old->status.outgoing = 1;
- return -1;
- }
-
/* Load information about peer */
if(read_host_config(cl))
if((old = lookup_id(cl->name)))
{
if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Removing old connection 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 at %s"),
+ old->name, old->hostname, cl->hostname);
if(old->status.outgoing)
{
cl->status.outgoing = 1;
old->status.outgoing = 0;
}
- terminate_connection(old);
+ terminate_connection(old, 0);
return 0;
}
- /* Now we can add the name to the id tree */
-
- id_add(cl);
-
/* Also check if no other tinc daemon uses the same IP and port for UDP traffic */
old = avl_search(active_tree, cl);
/* 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;
/* 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 */
send_add_subnet(cl, subnet);
}
}
- }
+ }
cp
return 0;
}
char *netstr;
char *owner;
cp
- if((cl->options | myself->options | subnet->owner->options) & OPTION_INDIRECT)
- owner = myself->name;
- else
- owner = subnet->owner->name;
+ owner = subnet->owner->name;
x = send_request(cl, "%d %s %s", ADD_SUBNET,
owner, netstr = net2str(subnet));
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
char *netstr;
char *owner;
cp
- if(cl->options & OPTION_INDIRECT)
- owner = myself->name;
- else
- owner = subnet->owner->name;
+ owner = subnet->owner->name;
x = send_request(cl, "%d %s %s", DEL_SUBNET, owner, netstr = net2str(subnet));
free(netstr);
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
int send_add_host(connection_t *cl, connection_t *other)
{
cp
- if(!((cl->options | myself->options | other->options) & OPTION_INDIRECT))
- return send_request(cl, "%d %s %lx:%d %lx", ADD_HOST,
+ return send_request(cl, "%d %s %lx:%d %lx", ADD_HOST,
other->name, other->address, other->port, other->options);
- else
- return 0;
}
int add_host_h(connection_t *cl)
if((old = lookup_id(name)))
{
- if((new->address == old->address) && (new->port == old->port))
+ if((new->address == old->address) && (new->port == old->port) && (cl->nexthop == old->nexthop))
{
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;
}
else
{
if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Removing old entry for %s (%s) in favour of new connection"),
- old->name, old->hostname);
+ syslog(LOG_NOTICE, _("Removing old entry for %s (%s) from %s in favour of new connection from %s"),
+ old->name, old->hostname, old->nexthop->name, cl->nexthop->name);
- terminate_connection(old);
+ terminate_connection(old, 0);
}
}
- /* 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
int send_del_host(connection_t *cl, connection_t *other)
{
cp
- if(!((cl->options | myself->options) & OPTION_INDIRECT))
- return send_request(cl, "%d %s %lx:%d %lx", DEL_HOST,
+ return send_request(cl, "%d %s %lx:%d %lx", DEL_HOST,
other->name, other->address, other->port, other->options);
- else
- return 0;
}
int del_host_h(connection_t *cl)
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;
}
/* Ok, since EVERYTHING seems to check out all right, delete it */
- old->status.active = 0;
- terminate_connection(old);
+ terminate_connection(old, 0);
- /* 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
cl->name, cl->hostname, strerror(err), errorstring);
}
- terminate_connection(cl);
+ terminate_connection(cl, cl->status.meta);
cp
return 0;
}
int termreq_h(connection_t *cl)
{
cp
- terminate_connection(cl);
+ terminate_connection(cl, cl->status.meta);
cp
return 0;
}
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);
+ if(p != cl && p->status.active)
+ send_request(p, "%d %s", KEY_CHANGED, from->name);
}
cp
return 0;
from->status.validkey = 0;
from->status.waitingforkey = 0;
- if(!(from->options | cl->options | myself->options) & OPTION_INDIRECT)
- send_key_changed(from, cl);
+ send_key_changed(from, cl);
cp
return 0;
}