projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make is not always GNU make.
[tinc]
/
src
/
protocol.c
diff --git
a/src/protocol.c
b/src/protocol.c
index
e9ee966
..
492f289
100644
(file)
--- 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.
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.10
6 2001/09/24 14:12:00
guus Exp $
+ $Id: protocol.c,v 1.28.4.10
8 2001/10/08 15:37:14
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-245,8
+245,8
@@
cp
cl->status.outgoing = 1;
old->status.outgoing = 0;
}
cl->status.outgoing = 1;
old->status.outgoing = 0;
}
+
terminate_connection(old, 0);
terminate_connection(old, 0);
- return 0;
}
/* Also check if no other tinc daemon uses the same IP and port for UDP traffic */
}
/* Also check if no other tinc daemon uses the same IP and port for UDP traffic */
@@
-263,7
+263,7
@@
cp
cl->allow_request = ALL;
cl->nexthop = cl;
cl->allow_request = ALL;
cl->nexthop = cl;
- cl->
lastbutone
hop = myself;
+ cl->
prev
hop = myself;
cl->cipher_pkttype = EVP_bf_cbc();
cl->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
cl->cipher_pkttype = EVP_bf_cbc();
cl->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
@@
-289,6
+289,11
@@
cp
cl->options |= OPTION_TCPONLY;
}
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)
/* Send him our subnets */
for(node = myself->subnet_tree->head; node; node = node->next)
@@
-777,18
+782,18
@@
int send_add_host(connection_t *cl, connection_t *other)
{
cp
return send_request(cl, "%d %s %lx:%d %lx %s", ADD_HOST,
{
cp
return send_request(cl, "%d %s %lx:%d %lx %s", ADD_HOST,
- other->name, other->address, other->port, other->options, other->
lastbutone
hop->name);
+ other->name, other->address, other->port, other->options, other->
prev
hop->name);
}
int add_host_h(connection_t *cl)
{
connection_t *old, *new, *p;
}
int add_host_h(connection_t *cl)
{
connection_t *old, *new, *p;
- char name[MAX_STRING_SIZE],
lastbutone
[MAX_STRING_SIZE];
+ char name[MAX_STRING_SIZE],
prevhop
[MAX_STRING_SIZE];
avl_node_t *node;
cp
new = new_connection();
avl_node_t *node;
cp
new = new_connection();
- if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%hd %lx "MAX_STRING, name, &new->address, &new->port, &new->options,
lastbutone
) != 5)
+ 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;
{
syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->name, cl->hostname);
return -1;
@@
-803,9
+808,9
@@
cp
return -1;
}
return -1;
}
- if(check_id(
lastbutone
))
+ if(check_id(
prevhop
))
{
{
- syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid
lastbutone
name"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid
prevhop
name"), cl->name, cl->hostname);
free_connection(new);
return -1;
}
free_connection(new);
return -1;
}
@@
-823,11
+828,11
@@
cp
new->hostname = hostlookup(htonl(new->address));
new->hostname = hostlookup(htonl(new->address));
- new->
lastbutonehop = lookup_id(lastbutone
);
+ new->
prevhop = lookup_id(prevhop
);
- if(!new->
lastbutone
hop)
+ if(!new->
prev
hop)
{
{
- syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): unknown
lastbutone
"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): unknown
prevhop
"), cl->name, cl->hostname);
free_connection(new);
return -1;
}
free_connection(new);
return -1;
}
@@
-873,6
+878,11
@@
cp
new->nexthop = cl;
new->cipher_pkttype = EVP_bf_cbc();
new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
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;
}
cp
return 0;
}
@@
-881,19
+891,19
@@
int send_del_host(connection_t *cl, connection_t *other)
{
cp
return send_request(cl, "%d %s %lx:%d %lx %s", DEL_HOST,
{
cp
return send_request(cl, "%d %s %lx:%d %lx %s", DEL_HOST,
- other->name, other->address, other->port, other->options, other->
lastbutone
hop->name);
+ other->name, other->address, other->port, other->options, other->
prev
hop->name);
}
int del_host_h(connection_t *cl)
{
}
int del_host_h(connection_t *cl)
{
- char name[MAX_STRING_SIZE],
lastbutone
[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
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 "MAX_STRING, name, &address, &port, &options,
lastbutone
) != 5)
+ 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);
{
syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
cl->name, cl->hostname);
@@
-908,9
+918,9
@@
cp
return -1;
}
return -1;
}
- if(check_id(
lastbutone
))
+ if(check_id(
prevhop
))
{
{
- syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid
lastbutone
name"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid
prevhop
name"), cl->name, cl->hostname);
return -1;
}
return -1;
}
@@
-934,7
+944,7
@@
cp
/* Check if the rest matches */
/* Check if the rest matches */
- if(address!=old->address || port!=old->port || options!=old->options || cl!=old->nexthop || strcmp(
lastbutone, old->lastbutone
hop->name))
+ if(address!=old->address || port!=old->port || options!=old->options || cl!=old->nexthop || strcmp(
prevhop, old->prev
hop->name))
{
syslog(LOG_WARNING, _("Got DEL_HOST from %s (%s) for %s which doesn't match"), cl->name, cl->hostname, old->name);
return 0;
{
syslog(LOG_WARNING, _("Got DEL_HOST from %s (%s) for %s which doesn't match"), cl->name, cl->hostname, old->name);
return 0;