projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop support for localisation.
[tinc]
/
src
/
subnet.c
diff --git
a/src/subnet.c
b/src/subnet.c
index
3c7ccc5
..
ef4e59e
100644
(file)
--- a/
src/subnet.c
+++ b/
src/subnet.c
@@
-54,8
+54,7
@@
void subnet_cache_flush() {
/* Subnet comparison */
/* Subnet comparison */
-static int subnet_compare_mac(const subnet_t *a, const subnet_t *b)
-{
+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));
int result;
result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
@@
-71,8
+70,7
@@
static int subnet_compare_mac(const subnet_t *a, const subnet_t *b)
return strcmp(a->owner->name, b->owner->name);
}
return strcmp(a->owner->name, b->owner->name);
}
-static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b)
-{
+static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b) {
int result;
result = b->net.ipv4.prefixlength - a->net.ipv4.prefixlength;
int result;
result = b->net.ipv4.prefixlength - a->net.ipv4.prefixlength;
@@
-93,8
+91,7
@@
static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b)
return strcmp(a->owner->name, b->owner->name);
}
return strcmp(a->owner->name, b->owner->name);
}
-static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b)
-{
+static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b) {
int result;
result = b->net.ipv6.prefixlength - a->net.ipv6.prefixlength;
int result;
result = b->net.ipv6.prefixlength - a->net.ipv6.prefixlength;
@@
-115,8
+112,7
@@
static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b)
return strcmp(a->owner->name, b->owner->name);
}
return strcmp(a->owner->name, b->owner->name);
}
-int subnet_compare(const subnet_t *a, const subnet_t *b)
-{
+int subnet_compare(const subnet_t *a, const subnet_t *b) {
int result;
result = a->type - b->type;
int result;
result = a->type - b->type;
@@
-132,9
+128,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);
}
@@
-143,58
+138,37
@@
int subnet_compare(const subnet_t *a, const subnet_t *b)
/* Initialising trees */
/* Initialising trees */
-void init_subnets(void)
-{
- cp();
-
+void init_subnets(void) {
subnet_tree = avl_alloc_tree((avl_compare_t) subnet_compare, (avl_action_t) free_subnet);
subnet_cache_flush();
}
subnet_tree = avl_alloc_tree((avl_compare_t) subnet_compare, (avl_action_t) free_subnet);
subnet_cache_flush();
}
-void exit_subnets(void)
-{
- cp();
-
+void exit_subnets(void) {
avl_delete_tree(subnet_tree);
}
avl_delete_tree(subnet_tree);
}
-avl_tree_t *new_subnet_tree(void)
-{
- cp();
-
+avl_tree_t *new_subnet_tree(void) {
return avl_alloc_tree((avl_compare_t) subnet_compare, NULL);
}
return avl_alloc_tree((avl_compare_t) subnet_compare, NULL);
}
-void free_subnet_tree(avl_tree_t *subnet_tree)
-{
- cp();
-
+void free_subnet_tree(avl_tree_t *subnet_tree) {
avl_delete_tree(subnet_tree);
}
/* Allocating and freeing space for subnets */
avl_delete_tree(subnet_tree);
}
/* Allocating and freeing space for subnets */
-subnet_t *new_subnet(void)
-{
- cp();
-
+subnet_t *new_subnet(void) {
return xmalloc_and_zero(sizeof(subnet_t));
}
return xmalloc_and_zero(sizeof(subnet_t));
}
-void free_subnet(subnet_t *subnet)
-{
- cp();
-
+void free_subnet(subnet_t *subnet) {
free(subnet);
}
/* Adding and removing subnets */
free(subnet);
}
/* Adding and removing subnets */
-void subnet_add(node_t *n, subnet_t *subnet)
-{
- cp();
-
+void subnet_add(node_t *n, subnet_t *subnet) {
subnet->owner = n;
avl_insert(subnet_tree, subnet);
subnet->owner = n;
avl_insert(subnet_tree, subnet);
@@
-203,10
+177,7
@@
void subnet_add(node_t *n, subnet_t *subnet)
subnet_cache_flush();
}
subnet_cache_flush();
}
-void subnet_del(node_t *n, subnet_t *subnet)
-{
- cp();
-
+void subnet_del(node_t *n, subnet_t *subnet) {
avl_delete(n->subnet_tree, subnet);
avl_delete(subnet_tree, subnet);
avl_delete(n->subnet_tree, subnet);
avl_delete(subnet_tree, subnet);
@@
-215,14
+186,11
@@
void subnet_del(node_t *n, subnet_t *subnet)
/* Ascii representation of subnets */
/* Ascii representation of subnets */
-bool str2net(subnet_t *subnet, const char *subnetstr)
-{
+bool str2net(subnet_t *subnet, const char *subnetstr) {
int i, l;
uint16_t x[8];
int weight = 10;
int i, l;
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)
@@
-297,12
+265,9
@@
bool str2net(subnet_t *subnet, const char *subnetstr)
return false;
}
return false;
}
-bool net2str(char *netstr, int len, const subnet_t *subnet)
-{
- cp();
-
+bool net2str(char *netstr, int len, const subnet_t *subnet) {
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;
}
@@
-344,9
+309,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);
}
@@
-355,19
+319,13
@@
bool net2str(char *netstr, int len, const subnet_t *subnet)
/* Subnet lookup routines */
/* Subnet lookup routines */
-subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet)
-{
- cp();
-
+subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
return avl_search(owner->subnet_tree, subnet);
}
return avl_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, subnet = {0};
- cp();
-
subnet.type = SUBNET_MAC;
subnet.net.mac.address = *address;
subnet.owner = NULL;
subnet.type = SUBNET_MAC;
subnet.net.mac.address = *address;
subnet.owner = NULL;
@@
-377,14
+335,11
@@
subnet_t *lookup_subnet_mac(const mac_t *address)
return p;
}
return p;
}
-subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
-{
+subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
subnet_t *p, *r = NULL, subnet = {0};
avl_node_t *n;
int i;
subnet_t *p, *r = NULL, subnet = {0};
avl_node_t *n;
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++) {
@@
-424,14
+379,11
@@
subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
return r;
}
return r;
}
-subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
-{
+subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
subnet_t *p, *r = NULL, subnet = {0};
avl_node_t *n;
int i;
subnet_t *p, *r = NULL, subnet = {0};
avl_node_t *n;
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++) {
@@
-538,22
+490,19
@@
void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
free(envp[i]);
}
free(envp[i]);
}
-void dump_subnets(void)
-{
+void dump_subnets(void) {
char netstr[MAXNETSTR];
subnet_t *subnet;
avl_node_t *node;
char netstr[MAXNETSTR];
subnet_t *subnet;
avl_node_t *node;
- cp();
-
- logger(LOG_DEBUG, _("Subnet list:"));
+ logger(LOG_DEBUG, "Subnet list:");
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);
+ logger(LOG_DEBUG,
" %s owner %s"
, netstr, subnet->owner->name);
}
}
- logger(LOG_DEBUG,
_("End of subnet list.")
);
+ logger(LOG_DEBUG,
"End of subnet list."
);
}
}