projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure that the texinfo manual can be converted to HTML.
[tinc]
/
src
/
subnet.c
diff --git
a/src/subnet.c
b/src/subnet.c
index
fa1ee63
..
ef4e59e
100644
(file)
--- a/
src/subnet.c
+++ b/
src/subnet.c
@@
-128,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);
}
@@
-140,50
+139,36
@@
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_cache_flush();
}
void exit_subnets(void) {
subnet_tree = avl_alloc_tree((avl_compare_t) subnet_compare, (avl_action_t) free_subnet);
subnet_cache_flush();
}
void exit_subnets(void) {
- cp();
-
avl_delete_tree(subnet_tree);
}
avl_tree_t *new_subnet_tree(void) {
avl_delete_tree(subnet_tree);
}
avl_tree_t *new_subnet_tree(void) {
- cp();
-
return avl_alloc_tree((avl_compare_t) subnet_compare, NULL);
}
void free_subnet_tree(avl_tree_t *subnet_tree) {
return avl_alloc_tree((avl_compare_t) subnet_compare, NULL);
}
void free_subnet_tree(avl_tree_t *subnet_tree) {
- cp();
-
avl_delete_tree(subnet_tree);
}
/* Allocating and freeing space for subnets */
subnet_t *new_subnet(void) {
avl_delete_tree(subnet_tree);
}
/* 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;
avl_insert(subnet_tree, subnet);
subnet->owner = n;
avl_insert(subnet_tree, subnet);
@@
-193,8
+178,6
@@
void subnet_add(node_t *n, subnet_t *subnet) {
}
void subnet_del(node_t *n, subnet_t *subnet) {
}
void subnet_del(node_t *n, subnet_t *subnet) {
- cp();
-
avl_delete(n->subnet_tree, subnet);
avl_delete(subnet_tree, subnet);
avl_delete(n->subnet_tree, subnet);
avl_delete(subnet_tree, subnet);
@@
-208,8
+191,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
+266,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
+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);
}
@@
-342,16
+320,12
@@
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);
}
subnet_t *lookup_subnet_mac(const mac_t *address) {
subnet_t *p, subnet = {0};
return avl_search(owner->subnet_tree, subnet);
}
subnet_t *lookup_subnet_mac(const mac_t *address) {
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;
@@
-366,8
+340,6
@@
subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
avl_node_t *n;
int i;
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++) {
@@
-412,8
+384,6
@@
subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
avl_node_t *n;
int i;
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++) {
@@
-525,16
+495,14
@@
void dump_subnets(void) {
subnet_t *subnet;
avl_node_t *node;
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."
);
}
}