projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small fixes to get really working control sockets on Windows.
[tinc]
/
src
/
subnet.c
diff --git
a/src/subnet.c
b/src/subnet.c
index
fa1ee63
..
29ea96d
100644
(file)
--- a/
src/subnet.c
+++ b/
src/subnet.c
@@
-20,7
+20,7
@@
#include "system.h"
#include "system.h"
-#include "
avl
_tree.h"
+#include "
splay
_tree.h"
#include "device.h"
#include "logger.h"
#include "net.h"
#include "device.h"
#include "logger.h"
#include "net.h"
@@
-33,7
+33,7
@@
/* lists type of subnet */
/* lists type of subnet */
-
avl
_tree_t *subnet_tree;
+
splay
_tree_t *subnet_tree;
/* Subnet lookup cache */
/* Subnet lookup cache */
@@
-47,9
+47,15
@@
static subnet_t *cache_ipv6_subnet[2];
static bool cache_ipv6_valid[2];
static int cache_ipv6_slot;
static bool cache_ipv6_valid[2];
static int cache_ipv6_slot;
+static mac_t cache_mac_address[2];
+static subnet_t *cache_mac_subnet[2];
+static bool cache_mac_valid[2];
+static int cache_mac_slot;
+
void subnet_cache_flush() {
cache_ipv4_valid[0] = cache_ipv4_valid[1] = false;
cache_ipv6_valid[0] = cache_ipv6_valid[1] = false;
void subnet_cache_flush() {
cache_ipv4_valid[0] = cache_ipv4_valid[1] = false;
cache_ipv6_valid[0] = cache_ipv6_valid[1] = false;
+ cache_mac_valid[0] = cache_mac_valid[1] = false;
}
/* Subnet comparison */
}
/* Subnet comparison */
@@
-57,7
+63,7
@@
void subnet_cache_flush() {
static int subnet_compare_mac(const subnet_t *a, const subnet_t *b) {
int result;
static int subnet_compare_mac(const subnet_t *a, const subnet_t *b) {
int result;
- result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof
(mac_t)
);
+ result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof
a->net.mac.address
);
if(result)
return result;
if(result)
return result;
@@
-128,9
+134,8
@@
int subnet_compare(const subnet_t *a, const subnet_t *b) {
case SUBNET_IPV6:
return subnet_compare_ipv6(a, b);
default:
case SUBNET_IPV6:
return subnet_compare_ipv6(a, b);
default:
- logger(LOG_ERR,
_("subnet_compare() was called with unknown subnet type %d, exitting!")
,
+ logger(LOG_ERR,
"subnet_compare() was called with unknown subnet type %d, exitting!"
,
a->type);
a->type);
- cp_trace();
exit(0);
}
exit(0);
}
@@
-140,63
+145,47
@@
int subnet_compare(const subnet_t *a, const subnet_t *b) {
/* Initialising trees */
void init_subnets(void) {
/* Initialising trees */
void init_subnets(void) {
- cp();
-
- subnet_tree = avl_alloc_tree((avl_compare_t) subnet_compare, (avl_action_t) free_subnet);
+ subnet_tree = splay_alloc_tree((splay_compare_t) subnet_compare, (splay_action_t) free_subnet);
subnet_cache_flush();
}
void exit_subnets(void) {
subnet_cache_flush();
}
void exit_subnets(void) {
- cp();
-
- avl_delete_tree(subnet_tree);
+ splay_delete_tree(subnet_tree);
}
}
-avl_tree_t *new_subnet_tree(void) {
- cp();
-
- return avl_alloc_tree((avl_compare_t) subnet_compare, NULL);
+splay_tree_t *new_subnet_tree(void) {
+ return splay_alloc_tree((splay_compare_t) subnet_compare, NULL);
}
}
-void free_subnet_tree(avl_tree_t *subnet_tree) {
- cp();
-
- avl_delete_tree(subnet_tree);
+void free_subnet_tree(splay_tree_t *subnet_tree) {
+ splay_delete_tree(subnet_tree);
}
/* Allocating and freeing space for subnets */
subnet_t *new_subnet(void) {
}
/* Allocating and freeing space for subnets */
subnet_t *new_subnet(void) {
- cp();
-
return xmalloc_and_zero(sizeof(subnet_t));
}
void free_subnet(subnet_t *subnet) {
return xmalloc_and_zero(sizeof(subnet_t));
}
void free_subnet(subnet_t *subnet) {
- cp();
-
free(subnet);
}
/* Adding and removing subnets */
void subnet_add(node_t *n, subnet_t *subnet) {
free(subnet);
}
/* Adding and removing subnets */
void subnet_add(node_t *n, subnet_t *subnet) {
- cp();
-
subnet->owner = n;
subnet->owner = n;
-
avl
_insert(subnet_tree, subnet);
-
avl
_insert(n->subnet_tree, subnet);
+
splay
_insert(subnet_tree, subnet);
+
splay
_insert(n->subnet_tree, subnet);
subnet_cache_flush();
}
void subnet_del(node_t *n, subnet_t *subnet) {
subnet_cache_flush();
}
void subnet_del(node_t *n, subnet_t *subnet) {
- cp();
-
- avl_delete(n->subnet_tree, subnet);
- avl_delete(subnet_tree, subnet);
+ splay_delete(n->subnet_tree, subnet);
+ splay_delete(subnet_tree, subnet);
subnet_cache_flush();
}
subnet_cache_flush();
}
@@
-208,8
+197,6
@@
bool str2net(subnet_t *subnet, const char *subnetstr) {
uint16_t x[8];
int weight = 10;
uint16_t x[8];
int weight = 10;
- cp();
-
if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d#%d",
&x[0], &x[1], &x[2], &x[3], &l, &weight) >= 5) {
if(l < 0 || l > 32)
if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d#%d",
&x[0], &x[1], &x[2], &x[3], &l, &weight) >= 5) {
if(l < 0 || l > 32)
@@
-285,10
+272,8
@@
bool str2net(subnet_t *subnet, const char *subnetstr) {
}
bool net2str(char *netstr, int len, const subnet_t *subnet) {
}
bool net2str(char *netstr, int len, const subnet_t *subnet) {
- cp();
-
if(!netstr || !subnet) {
if(!netstr || !subnet) {
- logger(LOG_ERR,
_("net2str() was called with netstr=%p, subnet=%p!\n")
, netstr, subnet);
+ logger(LOG_ERR,
"net2str() was called with netstr=%p, subnet=%p!\n"
, netstr, subnet);
return false;
}
return false;
}
@@
-330,9
+315,8
@@
bool net2str(char *netstr, int len, const subnet_t *subnet) {
default:
logger(LOG_ERR,
default:
logger(LOG_ERR,
-
_("net2str() was called with unknown subnet type %d, exiting!")
,
+
"net2str() was called with unknown subnet type %d, exiting!"
,
subnet->type);
subnet->type);
- cp_trace();
exit(0);
}
exit(0);
}
@@
-342,32
+326,57
@@
bool net2str(char *netstr, int len, const subnet_t *subnet) {
/* Subnet lookup routines */
subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
/* Subnet lookup routines */
subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
- cp();
-
- return avl_search(owner->subnet_tree, subnet);
+ return splay_search(owner->subnet_tree, subnet);
}
subnet_t *lookup_subnet_mac(const mac_t *address) {
}
subnet_t *lookup_subnet_mac(const mac_t *address) {
- subnet_t *p, subnet = {0};
+ subnet_t *p, *r = NULL, subnet = {0};
+ splay_node_t *n;
+ int i;
+
+ // Check if this address is cached
- cp();
+ for(i = 0; i < 2; i++) {
+ if(!cache_mac_valid[i])
+ continue;
+ if(!memcmp(address, &cache_mac_address[i], sizeof *address))
+ return cache_mac_subnet[i];
+ }
+
+ // Search all subnets for a matching one
subnet.type = SUBNET_MAC;
subnet.net.mac.address = *address;
subnet.owner = NULL;
subnet.type = SUBNET_MAC;
subnet.net.mac.address = *address;
subnet.owner = NULL;
- p = avl_search(subnet_tree, &subnet);
+ for(n = subnet_tree->head; n; n = n->next) {
+ p = n->data;
+
+ if(!p || p->type != subnet.type)
+ continue;
+
+ if(!memcmp(address, &p->net.mac.address, sizeof *address)) {
+ r = p;
+ if(p->owner->status.reachable)
+ break;
+ }
+ }
+
+ // Cache the result
- return p;
+ cache_mac_slot = !cache_mac_slot;
+ memcpy(&cache_mac_address[cache_mac_slot], address, sizeof *address);
+ cache_mac_subnet[cache_mac_slot] = r;
+ cache_mac_valid[cache_mac_slot] = true;
+
+ return r;
}
subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
subnet_t *p, *r = NULL, subnet = {0};
}
subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
subnet_t *p, *r = NULL, subnet = {0};
-
avl
_node_t *n;
+
splay
_node_t *n;
int i;
int i;
- cp();
-
// Check if this address is cached
for(i = 0; i < 2; i++) {
// Check if this address is cached
for(i = 0; i < 2; i++) {
@@
-409,11
+418,9
@@
subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
subnet_t *p, *r = NULL, subnet = {0};
subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
subnet_t *p, *r = NULL, subnet = {0};
-
avl
_node_t *n;
+
splay
_node_t *n;
int i;
int i;
- cp();
-
// Check if this address is cached
for(i = 0; i < 2; i++) {
// Check if this address is cached
for(i = 0; i < 2; i++) {
@@
-454,7
+461,7
@@
subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
}
void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
}
void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
-
avl
_node_t *node;
+
splay
_node_t *node;
int i;
char *envp[9] = {0};
char netstr[MAXNETSTR];
int i;
char *envp[9] = {0};
char netstr[MAXNETSTR];
@@
-520,21
+527,19
@@
void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
free(envp[i]);
}
free(envp[i]);
}
-
void dump_subnets(void
) {
+
int dump_subnets(struct evbuffer *out
) {
char netstr[MAXNETSTR];
subnet_t *subnet;
char netstr[MAXNETSTR];
subnet_t *subnet;
- avl_node_t *node;
-
- cp();
-
- logger(LOG_DEBUG, _("Subnet list:"));
+ splay_node_t *node;
for(node = subnet_tree->head; node; node = node->next) {
subnet = node->data;
if(!net2str(netstr, sizeof netstr, subnet))
continue;
for(node = subnet_tree->head; node; node = node->next) {
subnet = node->data;
if(!net2str(netstr, sizeof netstr, subnet))
continue;
- logger(LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name);
+ if(evbuffer_add_printf(out, " %s owner %s\n",
+ netstr, subnet->owner->name) == -1)
+ return errno;
}
}
-
logger(LOG_DEBUG, _("End of subnet list."))
;
+
return 0
;
}
}