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.104 2001/08/17 18:14:04 guus Exp $
+ $Id: protocol.c,v 1.28.4.108 2001/10/08 15:37:14 guus Exp $
*/
#include "config.h"
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, 0);
- return 0;
}
/* Also check if no other tinc daemon uses the same IP and port for UDP traffic */
cl->allow_request = ALL;
cl->nexthop = cl;
+ cl->prevhop = myself;
cl->cipher_pkttype = EVP_bf_cbc();
cl->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
cl->options |= OPTION_TCPONLY;
}
+ if((myself->options | cl->options) & OPTION_INDIRECT)
+ cl->via = myself;
+ else
+ cl->via = cl;
+
/* Send him our subnets */
for(node = myself->subnet_tree->head; node; node = node->next)
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));
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);
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,
- other->name, other->address, other->port, other->options);
- else
- return 0;
+ return send_request(cl, "%d %s %lx:%d %lx %s", ADD_HOST,
+ other->name, other->address, other->port, other->options, other->prevhop->name);
}
int add_host_h(connection_t *cl)
{
connection_t *old, *new, *p;
- char name[MAX_STRING_SIZE];
+ char name[MAX_STRING_SIZE], prevhop[MAX_STRING_SIZE];
avl_node_t *node;
cp
new = new_connection();
- if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%hd %lx", name, &new->address, &new->port, &new->options) != 4)
+ if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%hd %lx "MAX_STRING, name, &new->address, &new->port, &new->options, prevhop) != 5)
{
syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->name, cl->hostname);
return -1;
return -1;
}
+ if(check_id(prevhop))
+ {
+ syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid prevhop name"), cl->name, cl->hostname);
+ free_connection(new);
+ return -1;
+ }
+
/* Check if somebody tries to add ourself */
if(!strcmp(name, myself->name))
{
- syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"), cl->name, cl->hostname);
- sighup = 1;
+ syslog(LOG_ERR, _("Got ADD_HOST from %s (%s) for ourself!"), cl->name, cl->hostname);
free_connection(new);
- return 0;
+ return -1;
}
/* Fill in more of the new connection structure */
new->hostname = hostlookup(htonl(new->address));
+ new->prevhop = lookup_id(prevhop);
+
+ if(!new->prevhop)
+ {
+ syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): unknown prevhop"), cl->name, cl->hostname);
+ free_connection(new);
+ return -1;
+ }
+
/* Check if the new host already exists in the connnection list */
if((old = lookup_id(name)))
{
- if((new->address == old->address) && (new->port == old->port) && (cl == old->nexthop))
+ 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)"),
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, 0);
}
new->nexthop = cl;
new->cipher_pkttype = EVP_bf_cbc();
new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
+
+ if(new->options & OPTION_INDIRECT || new->prevhop->via != new->prevhop)
+ new->via = new->prevhop->via;
+ else
+ new->via = new;
cp
return 0;
}
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,
- other->name, other->address, other->port, other->options);
- else
- return 0;
+ return send_request(cl, "%d %s %lx:%d %lx %s", DEL_HOST,
+ other->name, other->address, other->port, other->options, other->prevhop->name);
}
int del_host_h(connection_t *cl)
{
- char name[MAX_STRING_SIZE];
+ char name[MAX_STRING_SIZE], prevhop[MAX_STRING_SIZE];
ipv4_t address;
port_t port;
long int options;
connection_t *old, *p;
avl_node_t *node;
cp
- if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%hd %lx", name, &address, &port, &options) != 4)
+ if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%hd %lx "MAX_STRING, name, &address, &port, &options, prevhop) != 5)
{
syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
cl->name, cl->hostname);
return -1;
}
+ if(check_id(prevhop))
+ {
+ syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid prevhop name"), cl->name, cl->hostname);
+ return -1;
+ }
+
/* Check if somebody tries to delete ourself */
if(!strcmp(name, myself->name))
{
- syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"),
+ syslog(LOG_ERR, _("Got DEL_HOST from %s (%s) for ourself!"),
cl->name, cl->hostname);
- sighup = 1;
- return 0;
+ return -1;
}
/* Check if the deleted host already exists in the connnection list */
/* Check if the rest matches */
- if(address!=old->address || port!=old->port || options!=old->options || cl!=old->nexthop)
+ if(address!=old->address || port!=old->port || options!=old->options || cl!=old->nexthop || strcmp(prevhop, old->prevhop->name))
{
syslog(LOG_WARNING, _("Got DEL_HOST from %s (%s) for %s which doesn't match"), cl->name, cl->hostname, old->name);
return 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);
+ 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;
}