j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

What was I thinking? s/vertex/edge/g.

Browse source
This commit is contained in:
Guus Sliepen 2001-10-28 08:41:19 +00:00
parent b98d9787fd
commit 94497336ef
10 changed files with 321 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Makefile.am
View file

@ -1,15 +1,15 @@
## Produce this file with automake to get Makefile.in ## Produce this file with automake to get Makefile.in
# $Id: Makefile.am,v 1.4.4.14 2001/10/13 13:53:07 guus Exp $ # $Id: Makefile.am,v 1.4.4.15 2001/10/28 08:41:19 guus Exp $
sbin_PROGRAMS = tincd sbin_PROGRAMS = tincd
tincd_SOURCES = conf.c connection.c device.c meta.c net.c netutl.c node.c process.c \ tincd_SOURCES = conf.c connection.c device.c meta.c net.c netutl.c node.c process.c \
protocol.c route.c subnet.c tincd.c vertex.c protocol.c route.c subnet.c tincd.c edge.c
INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib -I$(top_srcdir)/intl INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib -I$(top_srcdir)/intl
noinst_HEADERS = conf.h connection.h device.h meta.h net.h netutl.h node.h process.h \ noinst_HEADERS = conf.h connection.h device.h meta.h net.h netutl.h node.h process.h \
protocol.h route.h subnet.h vertex.h protocol.h route.h subnet.h edge.h
LIBS = @LIBS@ @INTLLIBS@ LIBS = @LIBS@ @INTLLIBS@

3
src/conf.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: conf.h,v 1.6.4.28 2001/10/27 12:13:17 guus Exp $ $Id: conf.h,v 1.6.4.29 2001/10/28 08:41:19 guus Exp $
*/ */
#ifndef __TINC_CONF_H__ #ifndef __TINC_CONF_H__
@ -40,6 +40,7 @@ extern int debug_lvl;
extern int timeout; extern int timeout;
extern int maxtimeout; extern int maxtimeout;
extern int sighup; extern int sighup;
extern int bypass_security;
extern char *confbase; extern char *confbase;
extern char *netname; extern char *netname;

3
src/connection.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: connection.c,v 1.1.2.21 2001/10/27 15:19:13 guus Exp $ $Id: connection.c,v 1.1.2.22 2001/10/28 08:41:19 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -65,7 +65,6 @@ connection_t *new_connection(void)
connection_t *c; connection_t *c;
cp cp
c = (connection_t *)xmalloc_and_zero(sizeof(connection_t)); c = (connection_t *)xmalloc_and_zero(sizeof(connection_t));
init_configuration(&c->config_tree);
cp cp
return c; return c;
} }

6
src/connection.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: connection.h,v 1.1.2.17 2001/10/27 12:13:17 guus Exp $ $Id: connection.h,v 1.1.2.18 2001/10/28 08:41:19 guus Exp $
*/ */
#ifndef __TINC_CONNECTION_H__ #ifndef __TINC_CONNECTION_H__
@ -42,7 +42,7 @@
#include "conf.h" #include "conf.h"
#include "node.h" #include "node.h"
#include "vertex.h" #include "edge.h"
#define OPTION_INDIRECT 0x0001 #define OPTION_INDIRECT 0x0001
#define OPTION_TCPONLY 0x0002 #define OPTION_TCPONLY 0x0002
@ -72,7 +72,7 @@ typedef struct connection_t {
struct connection_status_t status; /* status info */ struct connection_status_t status; /* status info */
struct node_t *node; /* node associated with the other end */ struct node_t *node; /* node associated with the other end */
struct vertex_t *vertex; /* vertex associated with this connection */ struct edge_t *edge; /* edge associated with this connection */
RSA *rsa_key; /* his public/private key */ RSA *rsa_key; /* his public/private key */
EVP_CIPHER *incipher; /* Cipher he will use to send data to us */ EVP_CIPHER *incipher; /* Cipher he will use to send data to us */

44
src/vertex.c → src/edge.c
View file

@ -1,5 +1,5 @@
/* /*
vertex.c -- vertex tree management edge.c -- edge tree management
Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>, Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
2000,2001 Ivo Timmermans <itimmermans@bigfoot.com> 2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>
@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: vertex.c,v 1.1.2.3 2001/10/27 13:13:35 guus Exp $ $Id: edge.c,v 1.1.2.1 2001/10/28 08:41:19 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -39,9 +39,9 @@
#include "xalloc.h" #include "xalloc.h"
#include "system.h" #include "system.h"
avl_tree_t *vertex_tree; /* Tree with all known vertices (replaces active_tree) */ avl_tree_t *edge_tree; /* Tree with all known vertices (replaces active_tree) */
int vertex_compare(vertex_t *a, vertex_t *b) int edge_compare(edge_t *a, edge_t *b)
{ {
int result; int result;
@ -53,9 +53,9 @@ int vertex_compare(vertex_t *a, vertex_t *b)
return strcmp(a->to->name, b->to->name); return strcmp(a->to->name, b->to->name);
} }
/* Evil vertex_compare() from a parallel universe ;) /* Evil edge_compare() from a parallel universe ;)
int vertex_compare(vertex_t *a, vertex_t *b) int edge_compare(edge_t *a, edge_t *b)
{ {
int result; int result;
@ -67,56 +67,56 @@ int vertex_compare(vertex_t *a, vertex_t *b)
void init_vertices(void) void init_vertices(void)
{ {
cp cp
vertex_tree = avl_alloc_tree((avl_compare_t)vertex_compare, NULL); edge_tree = avl_alloc_tree((avl_compare_t)edge_compare, NULL);
cp cp
} }
void exit_vertices(void) void exit_vertices(void)
{ {
cp cp
avl_delete_tree(vertex_tree); avl_delete_tree(edge_tree);
cp cp
} }
/* Creation and deletion of connection elements */ /* Creation and deletion of connection elements */
vertex_t *new_vertex(void) edge_t *new_edge(void)
{ {
cp cp
vertex_t *v = (vertex_t *)xmalloc_and_zero(sizeof(*v)); edge_t *v = (edge_t *)xmalloc_and_zero(sizeof(*v));
cp cp
return v; return v;
} }
void free_vertex(vertex_t *v) void free_edge(edge_t *v)
{ {
cp cp
free(v); free(v);
cp cp
} }
void vertex_add(vertex_t *v) void edge_add(edge_t *v)
{ {
cp cp
avl_insert(vertex_tree, v); avl_insert(edge_tree, v);
cp cp
} }
void vertex_del(vertex_t *v) void edge_del(edge_t *v)
{ {
cp cp
avl_delete(vertex_tree, v); avl_delete(edge_tree, v);
cp cp
} }
vertex_t *lookup_vertex(node_t *from, node_t *to) edge_t *lookup_edge(node_t *from, node_t *to)
{ {
vertex_t v, *result; edge_t v, *result;
cp cp
v.from = from; v.from = from;
v.to = to; v.to = to;
result = avl_search(vertex_tree, &v); result = avl_search(edge_tree, &v);
if(result) if(result)
return result; return result;
@ -124,19 +124,19 @@ cp
v.from = to; v.from = to;
v.to = from; v.to = from;
return avl_search(vertex_tree, &v); return avl_search(edge_tree, &v);
} }
void dump_vertices(void) void dump_vertices(void)
{ {
avl_node_t *node; avl_node_t *node;
vertex_t *v; edge_t *v;
cp cp
syslog(LOG_DEBUG, _("Vertices:")); syslog(LOG_DEBUG, _("Vertices:"));
for(node = vertex_tree->head; node; node = node->next) for(node = edge_tree->head; node; node = node->next)
{ {
v = (vertex_t *)node->data; v = (edge_t *)node->data;
syslog(LOG_DEBUG, _(" %s - %s options %ld"), syslog(LOG_DEBUG, _(" %s - %s options %ld"),
v->from->name, v->to->name, v->options); v->from->name, v->to->name, v->options);
} }

30
src/vertex.h → src/edge.h
View file

@ -1,5 +1,5 @@
/* /*
vertex.h -- header for vertex.c edge.h -- header for edge.c
Copyright (C) 2001 Guus Sliepen <guus@sliepen.warande.net>, Copyright (C) 2001 Guus Sliepen <guus@sliepen.warande.net>,
2001 Ivo Timmermans <itimmermans@bigfoot.com> 2001 Ivo Timmermans <itimmermans@bigfoot.com>
@ -17,11 +17,11 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: vertex.h,v 1.1.2.5 2001/10/27 12:13:17 guus Exp $ $Id: edge.h,v 1.1.2.1 2001/10/28 08:41:19 guus Exp $
*/ */
#ifndef __TINC_VERTEX_H__ #ifndef __TINC_EDGE_H__
#define __TINC_VERTEX_H__ #define __TINC_EDGE_H__
#include <avl_tree.h> #include <avl_tree.h>
@ -38,25 +38,25 @@ typedef struct halfconnection_t {
char *hostname; /* the hostname of real ip */ char *hostname; /* the hostname of real ip */
} halfconnection_t; } halfconnection_t;
typedef struct vertex_t { typedef struct edge_t {
struct node_t *from; struct node_t *from;
struct node_t *to; struct node_t *to;
long int options; /* options turned on for this connection */ long int options; /* options turned on for this connection */
int metric; /* weight of this vertex */ int metric; /* weight of this edge */
struct connection_t *connection; /* connection associated with this vertex, if available */ struct connection_t *connection; /* connection associated with this edge, if available */
} vertex_t; } edge_t;
extern avl_tree_t *vertex_tree; /* Tree with all known vertices (replaces active_tree) */ extern avl_tree_t *edge_tree; /* Tree with all known vertices (replaces active_tree) */
extern void init_vertices(void); extern void init_vertices(void);
extern void exit_vertices(void); extern void exit_vertices(void);
extern vertex_t *new_vertex(void); extern edge_t *new_edge(void);
extern void free_vertex(vertex_t *); extern void free_edge(edge_t *);
extern void vertex_add(vertex_t *); extern void edge_add(edge_t *);
extern void vertex_del(vertex_t *); extern void edge_del(edge_t *);
extern vertex_t *lookup_vertex(struct node_t *, struct node_t *); extern edge_t *lookup_edge(struct node_t *, struct node_t *);
extern void dump_vertices(void); extern void dump_vertices(void);
#endif /* __TINC_VERTEX_H__ */ #endif /* __TINC_EDGE_H__ */

9
src/net.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.c,v 1.35.4.139 2001/10/27 15:19:13 guus Exp $ $Id: net.c,v 1.35.4.140 2001/10/28 08:41:19 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -458,6 +458,7 @@ cp
c = new_connection(); c = new_connection();
c->name = xstrdup(name); c->name = xstrdup(name);
init_configuration(&c->config_tree);
read_connection_config(c); read_connection_config(c);
if(!get_config_string(lookup_config(c->config_tree, "Address"), &c->hostname)) if(!get_config_string(lookup_config(c->config_tree, "Address"), &c->hostname))
@ -622,6 +623,7 @@ int setup_myself(void)
cp cp
myself = new_node(); myself = new_node();
myself->connection = new_connection(); myself->connection = new_connection();
init_configuration(&myself->connection->config_tree);
asprintf(&myself->hostname, _("MYSELF")); asprintf(&myself->hostname, _("MYSELF"));
asprintf(&myself->connection->hostname, _("MYSELF")); asprintf(&myself->connection->hostname, _("MYSELF"));
@ -774,6 +776,7 @@ cp
init_connections(); init_connections();
init_subnets(); init_subnets();
init_nodes(); init_nodes();
init_vertices();
if(get_config_int(lookup_config(config_tree, "PingTimeout"), &timeout)) if(get_config_int(lookup_config(config_tree, "PingTimeout"), &timeout))
{ {
@ -1197,9 +1200,9 @@ cp
if(FD_ISSET(device_fd, &fset)) if(FD_ISSET(device_fd, &fset))
{ {
if(read_packet(&packet)) if(read_packet(&packet))
route_outgoing(&packet);
else
return; return;
else
route_outgoing(&packet);
} }
} }
} }

313
src/protocol.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: protocol.c,v 1.28.4.109 2001/10/27 12:13:17 guus Exp $ $Id: protocol.c,v 1.28.4.110 2001/10/28 08:41:19 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -55,7 +55,7 @@
#include "meta.h" #include "meta.h"
#include "connection.h" #include "connection.h"
#include "node.h" #include "node.h"
#include "vertex.h" #include "edge.h"
#include "system.h" #include "system.h"
@ -176,10 +176,11 @@ cp
int id_h(connection_t *c) int id_h(connection_t *c)
{ {
char name[MAX_STRING_SIZE]; char name[MAX_STRING_SIZE];
int bla;
cp cp
if(sscanf(c->buffer, "%*d "MAX_STRING" %d", name, &c->protocol_version) != 2) if(sscanf(c->buffer, "%*d "MAX_STRING" %d", name, &c->protocol_version) != 2)
{ {
syslog(LOG_ERR, _("Got bad %s from %s"), "ID", c->hostname); syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ID", c->name, c->hostname);
return -1; return -1;
} }
@ -187,7 +188,7 @@ cp
if(check_id(name)) if(check_id(name))
{ {
syslog(LOG_ERR, _("Peer %s uses invalid identity name"), c->hostname); syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ID", c->name, c->hostname, "invalid name");
return -1; return -1;
} }
@ -213,9 +214,19 @@ cp
return -1; return -1;
} }
if(bypass_security)
{
if(!c->config_tree)
init_configuration(&c->config_tree);
c->allow_request = ACK;
return send_ack(c);
}
if(!c->config_tree) if(!c->config_tree)
{ {
if(read_connection_config(c)) init_configuration(&c->config_tree);
if((bla = read_connection_config(c)))
{ {
syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), c->hostname, c->name); syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), c->hostname, c->name);
return -1; return -1;
@ -314,7 +325,7 @@ int metakey_h(connection_t *c)
cp cp
if(sscanf(c->buffer, "%*d "MAX_STRING, buffer) != 1) if(sscanf(c->buffer, "%*d "MAX_STRING, buffer) != 1)
{ {
syslog(LOG_ERR, _("Got bad METAKEY from %s (%s)"), c->name, c->hostname); syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "METAKEY", c->name, c->hostname);
return -1; return -1;
} }
@ -324,7 +335,7 @@ cp
if(strlen(buffer) != len*2) if(strlen(buffer) != len*2)
{ {
syslog(LOG_ERR, _("Intruder: wrong meta key length from %s (%s)"), c->name, c->hostname); syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, "wrong keylength");
return -1; return -1;
} }
@ -412,7 +423,7 @@ int challenge_h(connection_t *c)
cp cp
if(sscanf(c->buffer, "%*d "MAX_STRING, buffer) != 1) if(sscanf(c->buffer, "%*d "MAX_STRING, buffer) != 1)
{ {
syslog(LOG_ERR, _("Got bad CHALLENGE from %s (%s)"), c->name, c->hostname); syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "CHALLENGE", c->name, c->hostname);
return -1; return -1;
} }
@ -422,7 +433,7 @@ cp
if(strlen(buffer) != len*2) if(strlen(buffer) != len*2)
{ {
syslog(LOG_ERR, _("Intruder: wrong challenge length from %s (%s)"), c->name, c->hostname); syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, "wrong challenge length");
return -1; return -1;
} }
@ -446,12 +457,6 @@ int send_chal_reply(connection_t *c)
{ {
char hash[SHA_DIGEST_LENGTH*2+1]; char hash[SHA_DIGEST_LENGTH*2+1];
cp cp
if(!c->mychallenge)
{
syslog(LOG_ERR, _("Trying to send CHAL_REPLY to %s (%s) without a valid CHALLENGE"), c->name, c->hostname);
return -1;
}
/* Calculate the hash from the challenge we received */ /* Calculate the hash from the challenge we received */
SHA1(c->mychallenge, RSA_size(myself->connection->rsa_key), hash); SHA1(c->mychallenge, RSA_size(myself->connection->rsa_key), hash);
@ -474,7 +479,7 @@ int chal_reply_h(connection_t *c)
cp cp
if(sscanf(c->buffer, "%*d "MAX_STRING, hishash) != 1) if(sscanf(c->buffer, "%*d "MAX_STRING, hishash) != 1)
{ {
syslog(LOG_ERR, _("Got bad CHAL_REPLY from %s (%s)"), c->name, c->hostname); syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "CHAL_REPLY", c->name, c->hostname);
return -1; return -1;
} }
@ -482,7 +487,7 @@ cp
if(strlen(hishash) != SHA_DIGEST_LENGTH*2) if(strlen(hishash) != SHA_DIGEST_LENGTH*2)
{ {
syslog(LOG_ERR, _("Intruder: wrong challenge reply length from %s (%s)"), c->name, c->hostname); syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, _("wrong challenge reply length"));
return -1; return -1;
} }
@ -498,7 +503,7 @@ cp
if(memcmp(hishash, myhash, SHA_DIGEST_LENGTH)) if(memcmp(hishash, myhash, SHA_DIGEST_LENGTH))
{ {
syslog(LOG_ERR, _("Intruder: wrong challenge reply from %s (%s)"), c->name, c->hostname); syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, _("wrong challenge reply"));
if(debug_lvl >= DEBUG_SCARY_THINGS) if(debug_lvl >= DEBUG_SCARY_THINGS)
{ {
bin2hex(myhash, hishash, SHA_DIGEST_LENGTH); bin2hex(myhash, hishash, SHA_DIGEST_LENGTH);
@ -520,7 +525,7 @@ cp
int send_ack(connection_t *c) int send_ack(connection_t *c)
{ {
/* ACK message contains rest of the information the other end needs /* ACK message contains rest of the information the other end needs
to create node_t and vertex_t structures. */ to create node_t and edge_t structures. */
cp cp
return send_request(c, "%d %d", ACK, myself->port); return send_request(c, "%d %d", ACK, myself->port);
} }
@ -534,7 +539,7 @@ int ack_h(connection_t *c)
cp cp
if(sscanf(c->buffer, "%*d %hd", &port) != 1) if(sscanf(c->buffer, "%*d %hd", &port) != 1)
{ {
syslog(LOG_ERR, _("Got bad %s from %s"), "ACK", c->hostname); syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ACK", c->name, c->hostname);
return -1; return -1;
} }
@ -589,20 +594,21 @@ cp
*/ */
/* Create a vertex_t for this connection */ /* Create a edge_t for this connection */
c->vertex = new_vertex(); c->edge = new_edge();
c->vertex->from = myself; c->edge->from = myself;
c->vertex->to = n; c->edge->to = n;
c->vertex->metric = 1; c->edge->metric = 1;
c->vertex->connection = c; c->edge->connection = c;
vertex_add(c->vertex); edge_add(c->edge);
/* Activate this connection */ /* Activate this connection */
c->allow_request = ALL; c->allow_request = ALL;
c->status.active = 1;
if(debug_lvl >= DEBUG_CONNECTIONS) if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), c->name, c->hostname); syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), c->name, c->hostname);
@ -622,8 +628,9 @@ cp
{ {
n = (node_t *)node->data; n = (node_t *)node->data;
if(n != c->node) if(n == c->node || n == myself)
{ continue;
/* Notify others of this connection */ /* Notify others of this connection */
if(n->connection) if(n->connection)
@ -639,7 +646,6 @@ cp
send_add_subnet(c, s); send_add_subnet(c, s);
} }
} }
}
cp cp
return 0; return 0;
} }
@ -671,7 +677,7 @@ int add_subnet_h(connection_t *c)
cp cp
if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 2) if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 2)
{ {
syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s)"), c->name, c->hostname); syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_SUBNET", c->name, c->hostname);
return -1; return -1;
} }
@ -679,7 +685,7 @@ cp
if(check_id(name)) if(check_id(name))
{ {
syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid identity name"), c->name, c->hostname); syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name, c->hostname, _("invalid name"));
return -1; return -1;
} }
@ -687,7 +693,7 @@ cp
if(!(s = str2net(subnetstr))) if(!(s = str2net(subnetstr)))
{ {
syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid subnet string"), c->name, c->hostname); syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name, c->hostname, _("invalid subnet string"));
return -1; return -1;
} }
@ -695,7 +701,7 @@ cp
if(!(owner = lookup_node(name))) if(!(owner = lookup_node(name)))
{ {
syslog(LOG_ERR, _("Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"), syslog(LOG_ERR, _("Got ADD_SUBNET from %s (%s) for %s which is not in our connection list"),
name, c->name, c->hostname); name, c->name, c->hostname);
return -1; return -1;
} }
@ -738,7 +744,7 @@ int del_subnet_h(connection_t *c)
cp cp
if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 3) if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 3)
{ {
syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s)"), c->name, c->hostname); syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_SUBNET", c->name, c->hostname);
return -1; return -1;
} }
@ -746,7 +752,7 @@ cp
if(check_id(name)) if(check_id(name))
{ {
syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid identity name"), c->name, c->hostname); syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name, c->hostname, _("invalid name"));
return -1; return -1;
} }
@ -754,7 +760,7 @@ cp
if(!(s = str2net(subnetstr))) if(!(s = str2net(subnetstr)))
{ {
syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid subnet string"), c->name, c->hostname); syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name, c->hostname, _("invalid subnet string"));
return -1; return -1;
} }
@ -762,8 +768,8 @@ cp
if(!(owner = lookup_node(name))) if(!(owner = lookup_node(name)))
{ {
syslog(LOG_ERR, _("Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"), syslog(LOG_ERR, _("Got %s from %s (%s) for %s which is not in our connection list"),
name, c->name, c->hostname); "DEL_SUBNET", c->name, c->hostname, name);
return -1; return -1;
} }
@ -773,8 +779,8 @@ cp
if(!find) if(!find)
{ {
syslog(LOG_ERR, _("Got DEL_SUBNET for %s from %s (%s) which does not appear in his subnet tree"), syslog(LOG_ERR, _("Got %s from %s (%s) for %s which does not appear in his subnet tree"),
name, c->name, c->hostname); "DEL_SUBNET", c->name, c->hostname, name);
return -1; return -1;
} }
@ -812,7 +818,7 @@ int add_node_h(connection_t *c)
cp cp
if(sscanf(c->buffer, "%*d "MAX_STRING" %lx:%hd", name, &address, &port) != 3) if(sscanf(c->buffer, "%*d "MAX_STRING" %lx:%hd", name, &address, &port) != 3)
{ {
syslog(LOG_ERR, _("Got bad ADD_NODE from %s (%s)"), c->name, c->hostname); syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_NODE", c->name, c->hostname);
return -1; return -1;
} }
@ -820,15 +826,7 @@ cp
if(check_id(name)) if(check_id(name))
{ {
syslog(LOG_ERR, _("Got bad ADD_NODE from %s (%s): invalid identity name"), c->name, c->hostname); syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_NODE", c->name, c->hostname, _("invalid name"));
return -1;
}
/* Check if somebody tries to add ourself */
if(!strcmp(name, myself->name))
{
syslog(LOG_ERR, _("Got ADD_NODE from %s (%s) for ourself!"), c->name, c->hostname);
return -1; return -1;
} }
@ -880,7 +878,7 @@ int del_node_h(connection_t *c)
cp cp
if(sscanf(c->buffer, "%*d "MAX_STRING" %lx:%hd", name, &address, &port) != 3) if(sscanf(c->buffer, "%*d "MAX_STRING" %lx:%hd", name, &address, &port) != 3)
{ {
syslog(LOG_ERR, _("Got bad DEL_NODE from %s (%s)"), syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_NODE",
c->name, c->hostname); c->name, c->hostname);
return -1; return -1;
} }
@ -889,7 +887,7 @@ cp
if(check_id(name)) if(check_id(name))
{ {
syslog(LOG_ERR, _("Got bad DEL_NODE from %s (%s): invalid identity name"), c->name, c->hostname); syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_NODE", c->name, c->hostname, _("invalid name"));
return -1; return -1;
} }
@ -897,7 +895,7 @@ cp
if(!strcmp(name, myself->name)) if(!strcmp(name, myself->name))
{ {
syslog(LOG_ERR, _("Got DEL_NODE from %s (%s) for ourself!"), syslog(LOG_ERR, _("Got %s from %s (%s) for ourself!"), "DEL_NODE",
c->name, c->hostname); c->name, c->hostname);
return -1; return -1;
} }
@ -908,7 +906,7 @@ cp
if(!n) if(!n)
{ {
syslog(LOG_WARNING, _("Got DEL_NODE from %s (%s) for %s which does not exist"), c->name, c->hostname, n->name); syslog(LOG_WARNING, _("Got %s from %s (%s) for %s which does not exist"), "DEL_NODE", c->name, c->hostname, n->name);
return 0; return 0;
} }
@ -916,7 +914,7 @@ cp
if(address != n->address || port != n->port) if(address != n->address || port != n->port)
{ {
syslog(LOG_WARNING, _("Got DEL_NODE from %s (%s) for %s which doesn't match"), c->name, c->hostname, n->name); syslog(LOG_WARNING, _("Got %s from %s (%s) for %s which doesn't match"), "DEL_NODE", c->name, c->hostname, n->name);
return 0; return 0;
} }
@ -936,6 +934,180 @@ cp
return 0; return 0;
} }
/* Vertices */
int send_add_edge(connection_t *c, edge_t *v)
{
cp
return send_request(c, "%d %s %s %lx", ADD_NODE,
v->from->name, v->to->name, v->options);
}
int add_edge_h(connection_t *c)
{
connection_t *other;
edge_t *v;
node_t *from, *to;
char from_name[MAX_STRING_SIZE];
char to_name[MAX_STRING_SIZE];
long int options;
avl_node_t *node;
cp
if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" %lx", from_name, to_name, &options) != 3)
{
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name, c->hostname);
return -1;
}
/* Check if names are valid */
if(check_id(from_name))
{
syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("invalid name"));
return -1;
}
if(check_id(to_name))
{
syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("invalid name"));
return -1;
}
/* Lookup nodes */
from = lookup_node(from_name);
if(!from)
{
syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("unknown node"));
return -1;
}
to = lookup_node(to_name);
if(!to)
{
syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("unknown node"));
return -1;
}
/* Check if node already exists */
v = lookup_edge(from, to);
if(v)
{
/* Check if it matches */
}
else
{
v = new_edge();
v->from = from;
v->to = to;
v->options = options;
edge_add(v);
}
/* Tell the rest about the new edge */
for(node = connection_tree->head; node; node = node->next)
{
other = (connection_t *)node->data;
if(other->status.active && other != c)
send_add_edge(other, v);
}
cp
return 0;
}
int send_del_edge(connection_t *c, edge_t *v)
{
cp
return send_request(c, "%d %s %s %lx", DEL_EDGE,
v->from->name, v->to->name, v->options);
}
int del_edge_h(connection_t *c)
{
edge_t *v;
char from_name[MAX_STRING_SIZE];
char to_name[MAX_STRING_SIZE];
node_t *from, *to;
long int options;
connection_t *other;
avl_node_t *node;
cp
if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" %lx", from_name, to_name, &options) != 3)
{
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_EDGE",
c->name, c->hostname);
return -1;
}
/* Check if names are valid */
if(check_id(from_name))
{
syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("invalid name"));
return -1;
}
if(check_id(to_name))
{
syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("invalid name"));
return -1;
}
/* Lookup nodes */
from = lookup_node(from_name);
if(!from)
{
syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown node"));
return -1;
}
to = lookup_node(to_name);
if(!to)
{
syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown node"));
return -1;
}
/* Check if edge exists */
v = lookup_edge(from, to);
if(v)
{
/* Check if it matches */
}
else
{
syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown edge"));
return -1;
}
/* Tell the rest about the deleted edge */
for(node = connection_tree->head; node; node = node->next)
{
other = (connection_t *)node->data;
if(other->status.active && other != c)
send_del_edge(other, v);
}
/* Delete the edge */
edge_del(v);
cp
return 0;
}
/* Status and error notification routines */ /* Status and error notification routines */
int send_status(connection_t *c, int statusno, char *statusstring) int send_status(connection_t *c, int statusno, char *statusstring)
@ -954,7 +1126,7 @@ int status_h(connection_t *c)
cp cp
if(sscanf(c->buffer, "%*d %d "MAX_STRING, &statusno, statusstring) != 2) if(sscanf(c->buffer, "%*d %d "MAX_STRING, &statusno, statusstring) != 2)
{ {
syslog(LOG_ERR, _("Got bad STATUS from %s (%s)"), syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
c->name, c->hostname); c->name, c->hostname);
return -1; return -1;
} }
@ -984,7 +1156,7 @@ int error_h(connection_t *c)
cp cp
if(sscanf(c->buffer, "%*d %d "MAX_STRING, &err, errorstring) != 2) if(sscanf(c->buffer, "%*d %d "MAX_STRING, &err, errorstring) != 2)
{ {
syslog(LOG_ERR, _("Got bad ERROR from %s (%s)"), syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
c->name, c->hostname); c->name, c->hostname);
return -1; return -1;
} }
@ -1083,7 +1255,7 @@ int key_changed_h(connection_t *c)
cp cp
if(sscanf(c->buffer, "%*d "MAX_STRING, name) != 1) if(sscanf(c->buffer, "%*d "MAX_STRING, name) != 1)
{ {
syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"), syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "KEY_CHANGED",
c->name, c->hostname); c->name, c->hostname);
return -1; return -1;
} }
@ -1092,7 +1264,7 @@ cp
if(!n) if(!n)
{ {
syslog(LOG_ERR, _("Got KEY_CHANGED from %s (%s) origin %s which does not exist"), syslog(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist"), "KEY_CHANGED",
c->name, c->hostname, name); c->name, c->hostname, name);
return -1; return -1;
} }
@ -1121,7 +1293,7 @@ int req_key_h(connection_t *c)
cp cp
if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, from_name, to_name) != 2)
{ {
syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"), syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "REQ_KEY",
c->name, c->hostname); c->name, c->hostname);
return -1; return -1;
} }
@ -1130,7 +1302,7 @@ cp
if(!from) if(!from)
{ {
syslog(LOG_ERR, _("Got REQ_KEY from %s (%s) origin %s which does not exist in our connection list"), syslog(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist in our connection list"), "REQ_KEY",
c->name, c->hostname, from_name); c->name, c->hostname, from_name);
return -1; return -1;
} }
@ -1139,7 +1311,7 @@ cp
if(!to) if(!to)
{ {
syslog(LOG_ERR, _("Got REQ_KEY from %s (%s) destination %s which does not exist in our connection list"), syslog(LOG_ERR, _("Got %s from %s (%s) destination %s which does not exist in our connection list"), "REQ_KEY",
c->name, c->hostname, to_name); c->name, c->hostname, to_name);
return -1; return -1;
} }
@ -1186,7 +1358,7 @@ int ans_key_h(connection_t *c)
cp cp
if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING, from_name, to_name, key) != 3) if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING, from_name, to_name, key) != 3)
{ {
syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"), syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ANS_KEY",
c->name, c->hostname); c->name, c->hostname);
return -1; return -1;
} }
@ -1195,7 +1367,7 @@ cp
if(!from) if(!from)
{ {
syslog(LOG_ERR, _("Got ANS_KEY from %s (%s) origin %s which does not exist in our connection list"), syslog(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist in our connection list"), "ANS_KEY",
c->name, c->hostname, from_name); c->name, c->hostname, from_name);
return -1; return -1;
} }
@ -1204,7 +1376,7 @@ cp
if(!to) if(!to)
{ {
syslog(LOG_ERR, _("Got ANS_KEY from %s (%s) destination %s which does not exist in our connection list"), syslog(LOG_ERR, _("Got %s from %s (%s) destination %s which does not exist in our connection list"), "ANS_KEY",
c->name, c->hostname, to_name); c->name, c->hostname, to_name);
return -1; return -1;
} }
@ -1215,8 +1387,8 @@ cp
if(keylength != from->keylength * 2) if(keylength != from->keylength * 2)
{ {
syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s) origin %s: invalid key length"), syslog(LOG_ERR, _("Got bad %s from %s (%s) origin %s: %s"), "ANS_KEY",
c->name, c->hostname, from->name); c->name, c->hostname, from->name, _("invalid key length"));
return -1; return -1;
} }
@ -1265,7 +1437,7 @@ int tcppacket_h(connection_t *c)
cp cp
if(sscanf(c->buffer, "%*d %hd", &len) != 1) if(sscanf(c->buffer, "%*d %hd", &len) != 1)
{ {
syslog(LOG_ERR, _("Got bad PACKET from %s (%s)"), c->name, c->hostname); syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name, c->hostname);
return -1; return -1;
} }
@ -1284,6 +1456,7 @@ int (*request_handlers[])(connection_t*) = {
ping_h, pong_h, ping_h, pong_h,
add_node_h, del_node_h, add_node_h, del_node_h,
add_subnet_h, del_subnet_h, add_subnet_h, del_subnet_h,
add_edge_h, del_edge_h,
key_changed_h, req_key_h, ans_key_h, key_changed_h, req_key_h, ans_key_h,
tcppacket_h, tcppacket_h,
}; };
@ -1296,7 +1469,7 @@ char (*request_name[]) = {
"PING", "PONG", "PING", "PONG",
"ADD_NODE", "DEL_NODE", "ADD_NODE", "DEL_NODE",
"ADD_SUBNET", "DEL_SUBNET", "ADD_SUBNET", "DEL_SUBNET",
"ADD_VERTEX", "DEL_VERTEX", "ADD_EDGE", "DEL_EDGE",
"KEY_CHANGED", "REQ_KEY", "ANS_KEY", "KEY_CHANGED", "REQ_KEY", "ANS_KEY",
"PACKET", "PACKET",
}; };

8
src/protocol.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: protocol.h,v 1.5.4.23 2001/10/27 12:13:17 guus Exp $ $Id: protocol.h,v 1.5.4.24 2001/10/28 08:41:19 guus Exp $
*/ */
#ifndef __TINC_PROTOCOL_H__ #ifndef __TINC_PROTOCOL_H__
@ -42,7 +42,7 @@ enum {
PING, PONG, PING, PONG,
ADD_NODE, DEL_NODE, ADD_NODE, DEL_NODE,
ADD_SUBNET, DEL_SUBNET, ADD_SUBNET, DEL_SUBNET,
ADD_VERTEX, DEL_VERTEX, ADD_EDGE, DEL_EDGE,
KEY_CHANGED, REQ_KEY, ANS_KEY, KEY_CHANGED, REQ_KEY, ANS_KEY,
PACKET, PACKET,
LAST /* Guardian for the highest request number */ LAST /* Guardian for the highest request number */
@ -69,8 +69,8 @@ extern int send_add_node(connection_t*, node_t*);
extern int send_del_node(connection_t*, node_t*); extern int send_del_node(connection_t*, node_t*);
extern int send_add_subnet(connection_t*, subnet_t*); extern int send_add_subnet(connection_t*, subnet_t*);
extern int send_del_subnet(connection_t*, subnet_t*); extern int send_del_subnet(connection_t*, subnet_t*);
extern int send_add_vertex(connection_t*, node_t*); extern int send_add_edge(connection_t*, edge_t*);
extern int send_del_vertex(connection_t*, node_t*); extern int send_del_edge(connection_t*, edge_t*);
extern int send_key_changed(connection_t*, node_t*); extern int send_key_changed(connection_t*, node_t*);
extern int send_req_key(connection_t*, node_t*, node_t*); extern int send_req_key(connection_t*, node_t*, node_t*);
extern int send_ans_key(connection_t*, node_t*, node_t*, char*); extern int send_ans_key(connection_t*, node_t*, node_t*, char*);

14
src/tincd.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: tincd.c,v 1.10.4.54 2001/10/27 15:19:13 guus Exp $ $Id: tincd.c,v 1.10.4.55 2001/10/28 08:41:19 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -58,16 +58,19 @@
char *program_name; char *program_name;
/* If nonzero, display usage information and exit. */ /* If nonzero, display usage information and exit. */
static int show_help; int show_help;
/* If nonzero, print the version on standard output and exit. */ /* If nonzero, print the version on standard output and exit. */
static int show_version; int show_version;
/* If nonzero, it will attempt to kill a running tincd and exit. */ /* If nonzero, it will attempt to kill a running tincd and exit. */
static int kill_tincd = 0; int kill_tincd = 0;
/* If nonzero, generate public/private keypair for this host/net. */ /* If nonzero, generate public/private keypair for this host/net. */
static int generate_keys = 0; int generate_keys = 0;
/* If nonzero, use null ciphers and skip all key exchanges. */
int bypass_security = 0;
char *identname; /* program name for syslog */ char *identname; /* program name for syslog */
char *pidfilename; /* pid file location */ char *pidfilename; /* pid file location */
@ -85,6 +88,7 @@ static struct option const long_options[] =
{ "no-detach", no_argument, &do_detach, 0 }, { "no-detach", no_argument, &do_detach, 0 },
{ "generate-keys", optional_argument, NULL, 'K'}, { "generate-keys", optional_argument, NULL, 'K'},
{ "debug", optional_argument, NULL, 'd'}, { "debug", optional_argument, NULL, 'd'},
{ "bypass-security", no_argument, &bypass_security, 1 },
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };