#include "splay_tree.h"
#include "control_common.h"
-#include "device.h"
#include "hash.h"
#include "logger.h"
-#include "names.h"
#include "net.h"
#include "netutl.h"
#include "node.h"
#include "script.h"
#include "subnet.h"
-#include "utils.h"
#include "xalloc.h"
/* lists type of subnet */
-splay_tree_t *subnet_tree;
+splay_tree_t subnet_tree = {
+ .compare = (splay_compare_t) subnet_compare,
+ .delete = (splay_action_t) free_subnet,
+};
/* Subnet lookup cache */
/* Initialising trees */
void init_subnets(void) {
- subnet_tree = splay_alloc_tree((splay_compare_t) subnet_compare, (splay_action_t) free_subnet);
-
ipv4_cache = hash_alloc(0x100, sizeof(ipv4_t));
ipv6_cache = hash_alloc(0x100, sizeof(ipv6_t));
mac_cache = hash_alloc(0x100, sizeof(mac_t));
}
void exit_subnets(void) {
- splay_delete_tree(subnet_tree);
+ splay_empty_tree(&subnet_tree);
hash_free(ipv4_cache);
hash_free(ipv6_cache);
hash_free(mac_cache);
}
-splay_tree_t *new_subnet_tree(void) {
- return splay_alloc_tree((splay_compare_t) subnet_compare, NULL);
-}
-
-void free_subnet_tree(splay_tree_t *subnet_tree) {
- splay_delete_tree(subnet_tree);
+void init_subnet_tree(splay_tree_t *tree) {
+ memset(tree, 0, sizeof(*tree));
+ tree->compare = (splay_compare_t) subnet_compare;
}
/* Allocating and freeing space for subnets */
void subnet_add(node_t *n, subnet_t *subnet) {
subnet->owner = n;
- splay_insert(subnet_tree, subnet);
- if (n)
- splay_insert(n->subnet_tree, subnet);
+ splay_insert(&subnet_tree, subnet);
+
+ if(n) {
+ splay_insert(&n->subnet_tree, subnet);
+ }
subnet_cache_flush();
}
void subnet_del(node_t *n, subnet_t *subnet) {
- if (n)
- splay_delete(n->subnet_tree, subnet);
- splay_delete(subnet_tree, subnet);
+ if(n) {
+ splay_delete(&n->subnet_tree, subnet);
+ }
+
+ splay_delete(&subnet_tree, subnet);
subnet_cache_flush();
}
/* Subnet lookup routines */
-subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
- return splay_search(owner->subnet_tree, subnet);
+subnet_t *lookup_subnet(node_t *owner, const subnet_t *subnet) {
+ return splay_search(&owner->subnet_tree, subnet);
}
subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
// Check if this address is cached
- if((r = hash_search(mac_cache, address)))
+ if((r = hash_search(mac_cache, address))) {
return r;
+ }
// Search all subnets for a matching one
- for splay_each(subnet_t, p, owner ? owner->subnet_tree : subnet_tree) {
- if(!p || p->type != SUBNET_MAC)
+ for splay_each(subnet_t, p, owner ? &owner->subnet_tree : &subnet_tree) {
+ if(!p || p->type != SUBNET_MAC) {
continue;
+ }
- if(!memcmp(address, &p->net.mac.address, sizeof *address)) {
+ if(!memcmp(address, &p->net.mac.address, sizeof(*address))) {
r = p;
- if(!p->owner || p->owner->status.reachable)
+
+ if(!p->owner || p->owner->status.reachable) {
break;
+ }
}
}
// Cache the result
- if(r)
+ if(r) {
hash_insert(mac_cache, address, r);
+ }
return r;
}
// Check if this address is cached
- if((r = hash_search(ipv4_cache, address)))
+ if((r = hash_search(ipv4_cache, address))) {
return r;
+ }
// Search all subnets for a matching one
- for splay_each(subnet_t, p, subnet_tree) {
- if(!p || p->type != SUBNET_IPV4)
+ for splay_each(subnet_t, p, &subnet_tree) {
+ if(!p || p->type != SUBNET_IPV4) {
continue;
+ }
if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength)) {
r = p;
- if(!p->owner || p->owner->status.reachable)
+
+ if(!p->owner || p->owner->status.reachable) {
break;
+ }
}
}
// Cache the result
- if(r)
+ if(r) {
hash_insert(ipv4_cache, address, r);
+ }
return r;
}
// Check if this address is cached
- if((r = hash_search(ipv6_cache, address)))
+ if((r = hash_search(ipv6_cache, address))) {
return r;
+ }
// Search all subnets for a matching one
- for splay_each(subnet_t, p, subnet_tree) {
- if(!p || p->type != SUBNET_IPV6)
+ for splay_each(subnet_t, p, &subnet_tree) {
+ if(!p || p->type != SUBNET_IPV6) {
continue;
+ }
if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength)) {
r = p;
- if(!p->owner || p->owner->status.reachable)
+
+ if(!p->owner || p->owner->status.reachable) {
break;
+ }
}
}
// Cache the result
- if(r)
+ if(r) {
hash_insert(ipv6_cache, address, r);
+ }
return r;
}
name = up ? "subnet-up" : "subnet-down";
if(!subnet) {
- for splay_each(subnet_t, subnet, owner->subnet_tree) {
- if(!net2str(netstr, sizeof netstr, subnet))
+ for splay_each(subnet_t, subnet, &owner->subnet_tree) {
+ if(!net2str(netstr, sizeof(netstr), subnet)) {
continue;
+ }
// Strip the weight from the subnet, and put it in its own environment variable
char *weight = strchr(netstr, '#');
- if(weight)
+
+ if(weight) {
*weight++ = 0;
- else
+ } else {
weight = empty;
+ }
// Prepare the SUBNET and WEIGHT variables
environment_update(&env, env_subnet, "SUBNET=%s", netstr);
execute_script(name, &env);
}
} else {
- if(net2str(netstr, sizeof netstr, subnet)) {
+ if(net2str(netstr, sizeof(netstr), subnet)) {
// Strip the weight from the subnet, and put it in its own environment variable
char *weight = strchr(netstr, '#');
- if(weight)
+
+ if(weight) {
*weight++ = 0;
- else
+ } else {
weight = empty;
+ }
// Prepare the SUBNET and WEIGHT variables
environment_update(&env, env_subnet, "SUBNET=%s", netstr);
}
bool dump_subnets(connection_t *c) {
- for splay_each(subnet_t, subnet, subnet_tree) {
+ for splay_each(subnet_t, subnet, &subnet_tree) {
char netstr[MAXNETSTR];
- if(!net2str(netstr, sizeof netstr, subnet))
+ if(!net2str(netstr, sizeof(netstr), subnet)) {
continue;
+ }
send_request(c, "%d %d %s %s",
- CONTROL, REQ_DUMP_SUBNETS,
- netstr, subnet->owner ? subnet->owner->name : "(broadcast)");
+ CONTROL, REQ_DUMP_SUBNETS,
+ netstr, subnet->owner ? subnet->owner->name : "(broadcast)");
}
return send_request(c, "%d %d", CONTROL, REQ_DUMP_SUBNETS);
projects / tinc / blobdiff