Import Upstream version 1.1~pre2
This commit is contained in:
Guus Sliepen
parent
a04a7bcd67
commit
02de1cd2f1
172 changed files with 32291 additions and 25994 deletions
133
src/node.c
133
src/node.c
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
node.c -- node tree management
|
||||
Copyright (C) 2001-2016 Guus Sliepen <guus@tinc-vpn.org>,
|
||||
Copyright (C) 2001-2011 Guus Sliepen <guus@tinc-vpn.org>,
|
||||
2001-2005 Ivo Timmermans
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -20,7 +20,8 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include "avl_tree.h"
|
||||
#include "control_common.h"
|
||||
#include "splay_tree.h"
|
||||
#include "logger.h"
|
||||
#include "net.h"
|
||||
#include "netutl.h"
|
||||
|
|
@ -28,8 +29,8 @@
|
|||
#include "utils.h"
|
||||
#include "xalloc.h"
|
||||
|
||||
avl_tree_t *node_tree; /* Known nodes, sorted by name */
|
||||
avl_tree_t *node_udp_tree; /* Known nodes, sorted by address and port */
|
||||
splay_tree_t *node_tree; /* Known nodes, sorted by name */
|
||||
splay_tree_t *node_udp_tree; /* Known nodes, sorted by address and port */
|
||||
|
||||
node_t *myself;
|
||||
|
||||
|
|
@ -38,35 +39,32 @@ static int node_compare(const node_t *a, const node_t *b) {
|
|||
}
|
||||
|
||||
static int node_udp_compare(const node_t *a, const node_t *b) {
|
||||
return sockaddrcmp(&a->address, &b->address);
|
||||
int result;
|
||||
|
||||
result = sockaddrcmp(&a->address, &b->address);
|
||||
|
||||
if(result)
|
||||
return result;
|
||||
|
||||
return (a->name && b->name) ? strcmp(a->name, b->name) : 0;
|
||||
}
|
||||
|
||||
void init_nodes(void) {
|
||||
node_tree = avl_alloc_tree((avl_compare_t) node_compare, (avl_action_t) free_node);
|
||||
node_udp_tree = avl_alloc_tree((avl_compare_t) node_udp_compare, NULL);
|
||||
node_tree = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node);
|
||||
node_udp_tree = splay_alloc_tree((splay_compare_t) node_udp_compare, NULL);
|
||||
}
|
||||
|
||||
void exit_nodes(void) {
|
||||
avl_delete_tree(node_udp_tree);
|
||||
avl_delete_tree(node_tree);
|
||||
splay_delete_tree(node_udp_tree);
|
||||
splay_delete_tree(node_tree);
|
||||
}
|
||||
|
||||
node_t *new_node(void) {
|
||||
node_t *n = xmalloc_and_zero(sizeof(*n));
|
||||
|
||||
if(replaywin) {
|
||||
n->late = xmalloc_and_zero(replaywin);
|
||||
}
|
||||
node_t *n = xmalloc_and_zero(sizeof *n);
|
||||
|
||||
if(replaywin) n->late = xmalloc_and_zero(replaywin);
|
||||
n->subnet_tree = new_subnet_tree();
|
||||
n->edge_tree = new_edge_tree();
|
||||
n->inctx = EVP_CIPHER_CTX_new();
|
||||
n->outctx = EVP_CIPHER_CTX_new();
|
||||
|
||||
if(!n->inctx || !n->outctx) {
|
||||
abort();
|
||||
}
|
||||
|
||||
n->mtu = MTU;
|
||||
n->maxmtu = MTU;
|
||||
|
||||
|
|
@ -74,52 +72,43 @@ node_t *new_node(void) {
|
|||
}
|
||||
|
||||
void free_node(node_t *n) {
|
||||
if(n->inkey) {
|
||||
free(n->inkey);
|
||||
}
|
||||
|
||||
if(n->outkey) {
|
||||
free(n->outkey);
|
||||
}
|
||||
|
||||
if(n->subnet_tree) {
|
||||
if(n->subnet_tree)
|
||||
free_subnet_tree(n->subnet_tree);
|
||||
}
|
||||
|
||||
if(n->edge_tree) {
|
||||
if(n->edge_tree)
|
||||
free_edge_tree(n->edge_tree);
|
||||
}
|
||||
|
||||
sockaddrfree(&n->address);
|
||||
|
||||
EVP_CIPHER_CTX_free(n->outctx);
|
||||
EVP_CIPHER_CTX_free(n->inctx);
|
||||
cipher_close(&n->incipher);
|
||||
digest_close(&n->indigest);
|
||||
cipher_close(&n->outcipher);
|
||||
digest_close(&n->outdigest);
|
||||
|
||||
if(n->mtuevent) {
|
||||
event_del(n->mtuevent);
|
||||
}
|
||||
ecdh_free(&n->ecdh);
|
||||
ecdsa_free(&n->ecdsa);
|
||||
|
||||
if(n->hostname) {
|
||||
if(timeout_initialized(&n->mtuevent))
|
||||
event_del(&n->mtuevent);
|
||||
|
||||
if(n->hostname)
|
||||
free(n->hostname);
|
||||
}
|
||||
|
||||
if(n->name) {
|
||||
if(n->name)
|
||||
free(n->name);
|
||||
}
|
||||
|
||||
if(n->late) {
|
||||
if(n->late)
|
||||
free(n->late);
|
||||
}
|
||||
|
||||
free(n);
|
||||
}
|
||||
|
||||
void node_add(node_t *n) {
|
||||
avl_insert(node_tree, n);
|
||||
splay_insert(node_tree, n);
|
||||
}
|
||||
|
||||
void node_del(node_t *n) {
|
||||
avl_node_t *node, *next;
|
||||
splay_node_t *node, *next;
|
||||
edge_t *e;
|
||||
subnet_t *s;
|
||||
|
||||
|
|
@ -135,25 +124,25 @@ void node_del(node_t *n) {
|
|||
edge_del(e);
|
||||
}
|
||||
|
||||
avl_delete(node_udp_tree, n);
|
||||
avl_delete(node_tree, n);
|
||||
splay_delete(node_udp_tree, n);
|
||||
splay_delete(node_tree, n);
|
||||
}
|
||||
|
||||
node_t *lookup_node(char *name) {
|
||||
node_t n = {0};
|
||||
node_t n = {NULL};
|
||||
|
||||
n.name = name;
|
||||
|
||||
return avl_search(node_tree, &n);
|
||||
return splay_search(node_tree, &n);
|
||||
}
|
||||
|
||||
node_t *lookup_node_udp(const sockaddr_t *sa) {
|
||||
node_t n = {0};
|
||||
node_t n = {NULL};
|
||||
|
||||
n.address = *sa;
|
||||
n.name = NULL;
|
||||
|
||||
return avl_search(node_udp_tree, &n);
|
||||
return splay_search(node_udp_tree, &n);
|
||||
}
|
||||
|
||||
void update_node_udp(node_t *n, const sockaddr_t *sa) {
|
||||
|
|
@ -162,38 +151,48 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) {
|
|||
return;
|
||||
}
|
||||
|
||||
avl_delete(node_udp_tree, n);
|
||||
splay_delete(node_udp_tree, n);
|
||||
|
||||
if(n->hostname) {
|
||||
if(n->hostname)
|
||||
free(n->hostname);
|
||||
}
|
||||
|
||||
if(sa) {
|
||||
n->address = *sa;
|
||||
n->hostname = sockaddr2hostname(&n->address);
|
||||
avl_insert(node_udp_tree, n);
|
||||
splay_insert(node_udp_tree, n);
|
||||
ifdebug(PROTOCOL) logger(LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
|
||||
} else {
|
||||
memset(&n->address, 0, sizeof(n->address));
|
||||
memset(&n->address, 0, sizeof n->address);
|
||||
n->hostname = NULL;
|
||||
ifdebug(PROTOCOL) logger(LOG_DEBUG, "UDP address of %s cleared", n->name);
|
||||
}
|
||||
}
|
||||
|
||||
void dump_nodes(void) {
|
||||
avl_node_t *node;
|
||||
bool dump_nodes(connection_t *c) {
|
||||
splay_node_t *node;
|
||||
node_t *n;
|
||||
|
||||
logger(LOG_DEBUG, "Nodes:");
|
||||
|
||||
for(node = node_tree->head; node; node = node->next) {
|
||||
n = node->data;
|
||||
logger(LOG_DEBUG, " %s at %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s pmtu %d (min %d max %d)",
|
||||
n->name, n->hostname, n->outcipher ? EVP_CIPHER_nid(n->outcipher) : 0,
|
||||
n->outdigest ? EVP_MD_type(n->outdigest) : 0, n->outmaclength, n->outcompression,
|
||||
n->options, bitfield_to_int(&n->status, sizeof(n->status)), n->nexthop ? n->nexthop->name : "-",
|
||||
n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu);
|
||||
send_request(c, "%d %d %s at %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %hd (min %hd max %hd)", CONTROL, REQ_DUMP_NODES,
|
||||
n->name, n->hostname, cipher_get_nid(&n->outcipher),
|
||||
digest_get_nid(&n->outdigest), (int)digest_length(&n->outdigest), n->outcompression,
|
||||
n->options, bitfield_to_int(&n->status, sizeof n->status), n->nexthop ? n->nexthop->name : "-",
|
||||
n->via ? n->via->name ?: "-" : "-", n->distance, n->mtu, n->minmtu, n->maxmtu);
|
||||
}
|
||||
|
||||
logger(LOG_DEBUG, "End of nodes.");
|
||||
return send_request(c, "%d %d", CONTROL, REQ_DUMP_NODES);
|
||||
}
|
||||
|
||||
bool dump_traffic(connection_t *c) {
|
||||
splay_node_t *node;
|
||||
node_t *n;
|
||||
|
||||
for(node = node_tree->head; node; node = node->next) {
|
||||
n = node->data;
|
||||
send_request(c, "%d %d %s %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, CONTROL, REQ_DUMP_TRAFFIC,
|
||||
n->name, n->in_packets, n->in_bytes, n->out_packets, n->out_bytes);
|
||||
}
|
||||
|
||||
return send_request(c, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue