projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanups:
[tinc]
/
src
/
subnet.c
diff --git
a/src/subnet.c
b/src/subnet.c
index
f4b1474
..
e6d8b9b
100644
(file)
--- a/
src/subnet.c
+++ b/
src/subnet.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: subnet.c,v 1.1.2.
37 2002/06/21 10:11:33
guus Exp $
+ $Id: subnet.c,v 1.1.2.
40 2002/09/09 19:40:11
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-50,38
+50,54
@@
avl_tree_t *subnet_tree;
int subnet_compare_mac(subnet_t *a, subnet_t *b)
{
int subnet_compare_mac(subnet_t *a, subnet_t *b)
{
-cp
- return memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
+ int result;
+ cp();
+ result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
+
+ if(result || !a->owner || !b->owner)
+ return result;
+
+ return strcmp(a->owner->name, b->owner->name);
}
int subnet_compare_ipv4(subnet_t *a, subnet_t *b)
{
int result;
}
int subnet_compare_ipv4(subnet_t *a, subnet_t *b)
{
int result;
-cp
+ cp();
result = memcmp(&a->net.ipv4.address, &b->net.ipv4.address, sizeof(ipv4_t));
if(result)
return result;
result = memcmp(&a->net.ipv4.address, &b->net.ipv4.address, sizeof(ipv4_t));
if(result)
return result;
- return a->net.ipv4.prefixlength - b->net.ipv4.prefixlength;
+ result = a->net.ipv4.prefixlength - b->net.ipv4.prefixlength;
+
+ if(result || !a->owner || !b->owner)
+ return result;
+
+ return strcmp(a->owner->name, b->owner->name);
}
int subnet_compare_ipv6(subnet_t *a, subnet_t *b)
{
int result;
}
int subnet_compare_ipv6(subnet_t *a, subnet_t *b)
{
int result;
-cp
+ cp();
result = memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t));
if(result)
return result;
result = memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t));
if(result)
return result;
- return a->net.ipv6.prefixlength - b->net.ipv6.prefixlength;
+ result = a->net.ipv6.prefixlength - b->net.ipv6.prefixlength;
+
+ if(result || !a->owner || !b->owner)
+ return result;
+
+ return strcmp(a->owner->name, b->owner->name);
}
int subnet_compare(subnet_t *a, subnet_t *b)
{
int result;
}
int subnet_compare(subnet_t *a, subnet_t *b)
{
int result;
-cp
+ cp();
result = a->type - b->type;
if(result)
result = a->type - b->type;
if(result)
@@
-108,43
+124,43
@@
cp
void init_subnets(void)
{
void init_subnets(void)
{
-cp
+ cp();
subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, (avl_action_t)free_subnet);
subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, (avl_action_t)free_subnet);
-cp
+ cp();
}
void exit_subnets(void)
{
}
void exit_subnets(void)
{
-cp
+ cp();
avl_delete_tree(subnet_tree);
avl_delete_tree(subnet_tree);
-cp
+ cp();
}
avl_tree_t *new_subnet_tree(void)
{
}
avl_tree_t *new_subnet_tree(void)
{
-cp
+ cp();
return avl_alloc_tree((avl_compare_t)subnet_compare, NULL);
return avl_alloc_tree((avl_compare_t)subnet_compare, NULL);
-cp
+ cp();
}
void free_subnet_tree(avl_tree_t *subnet_tree)
{
}
void free_subnet_tree(avl_tree_t *subnet_tree)
{
-cp
+ cp();
avl_delete_tree(subnet_tree);
avl_delete_tree(subnet_tree);
-cp
+ cp();
}
/* Allocating and freeing space for subnets */
subnet_t *new_subnet(void)
{
}
/* Allocating and freeing space for subnets */
subnet_t *new_subnet(void)
{
-cp
- return (subnet_t *)xmalloc(sizeof(subnet_t));
+ cp();
+ return (subnet_t *)xmalloc
_and_zero
(sizeof(subnet_t));
}
void free_subnet(subnet_t *subnet)
{
}
void free_subnet(subnet_t *subnet)
{
-cp
+ cp();
free(subnet);
}
free(subnet);
}
@@
-152,22
+168,22
@@
cp
void subnet_add(node_t *n, subnet_t *subnet)
{
void subnet_add(node_t *n, subnet_t *subnet)
{
-cp
+ cp();
subnet->owner = n;
avl_insert(subnet_tree, subnet);
subnet->owner = n;
avl_insert(subnet_tree, subnet);
-cp
+ cp();
avl_insert(n->subnet_tree, subnet);
avl_insert(n->subnet_tree, subnet);
-cp
+ cp();
}
void subnet_del(node_t *n, subnet_t *subnet)
{
}
void subnet_del(node_t *n, subnet_t *subnet)
{
-cp
+ cp();
avl_delete(n->subnet_tree, subnet);
avl_delete(n->subnet_tree, subnet);
-cp
+ cp();
avl_delete(subnet_tree, subnet);
avl_delete(subnet_tree, subnet);
-cp
+ cp();
}
/* Ascii representation of subnets */
}
/* Ascii representation of subnets */
@@
-177,9
+193,9
@@
subnet_t *str2net(char *subnetstr)
int i, l;
subnet_t *subnet;
uint16_t x[8];
int i, l;
subnet_t *subnet;
uint16_t x[8];
-cp
+ cp();
subnet = new_subnet();
subnet = new_subnet();
-cp
+ cp();
if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d",
&x[0], &x[1], &x[2], &x[3],
&l) == 5)
if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d",
&x[0], &x[1], &x[2], &x[3],
&l) == 5)
@@
-238,7
+254,7
@@
cp
char *net2str(subnet_t *subnet)
{
char *netstr;
char *net2str(subnet_t *subnet)
{
char *netstr;
-cp
+ cp();
switch(subnet->type)
{
case SUBNET_MAC:
switch(subnet->type)
{
case SUBNET_MAC:
@@
-275,7
+291,7
@@
cp
cp_trace();
exit(0);
}
cp_trace();
exit(0);
}
-cp
+ cp();
return netstr;
}
return netstr;
}
@@
-283,29
+299,31
@@
cp
subnet_t *lookup_subnet(node_t *owner, subnet_t *subnet)
{
subnet_t *lookup_subnet(node_t *owner, subnet_t *subnet)
{
-cp
+ cp();
return avl_search(owner->subnet_tree, subnet);
}
subnet_t *lookup_subnet_mac(mac_t *address)
{
subnet_t subnet, *p;
return avl_search(owner->subnet_tree, subnet);
}
subnet_t *lookup_subnet_mac(mac_t *address)
{
subnet_t subnet, *p;
-cp
+ cp();
subnet.type = SUBNET_MAC;
memcpy(&subnet.net.mac.address, address, sizeof(mac_t));
subnet.type = SUBNET_MAC;
memcpy(&subnet.net.mac.address, address, sizeof(mac_t));
+ subnet.owner = NULL;
p = (subnet_t *)avl_search(subnet_tree, &subnet);
p = (subnet_t *)avl_search(subnet_tree, &subnet);
-cp
+ cp();
return p;
}
subnet_t *lookup_subnet_ipv4(ipv4_t *address)
{
subnet_t subnet, *p;
return p;
}
subnet_t *lookup_subnet_ipv4(ipv4_t *address)
{
subnet_t subnet, *p;
-cp
+ cp();
subnet.type = SUBNET_IPV4;
memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
subnet.net.ipv4.prefixlength = 32;
subnet.type = SUBNET_IPV4;
memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
subnet.net.ipv4.prefixlength = 32;
+ subnet.owner = NULL;
do
{
do
{
@@
-314,7
+332,7
@@
cp
p = (subnet_t *)avl_search_closest_smaller(subnet_tree, &subnet);
/* Check if the found subnet REALLY matches */
p = (subnet_t *)avl_search_closest_smaller(subnet_tree, &subnet);
/* Check if the found subnet REALLY matches */
-cp
+ cp();
if(p)
{
if(p->type != SUBNET_IPV4)
if(p)
{
if(p->type != SUBNET_IPV4)
@@
-334,17
+352,18
@@
cp
}
}
} while (p);
}
}
} while (p);
-cp
+ cp();
return p;
}
subnet_t *lookup_subnet_ipv6(ipv6_t *address)
{
subnet_t subnet, *p;
return p;
}
subnet_t *lookup_subnet_ipv6(ipv6_t *address)
{
subnet_t subnet, *p;
-cp
+ cp();
subnet.type = SUBNET_IPV6;
memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
subnet.net.ipv6.prefixlength = 128;
subnet.type = SUBNET_IPV6;
memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
subnet.net.ipv6.prefixlength = 128;
+ subnet.owner = NULL;
do
{
do
{
@@
-354,7
+373,7
@@
cp
/* Check if the found subnet REALLY matches */
/* Check if the found subnet REALLY matches */
-cp
+ cp();
if(p)
{
if(p->type != SUBNET_IPV6)
if(p)
{
if(p->type != SUBNET_IPV6)
@@
-371,7
+390,7
@@
cp
}
}
} while (p);
}
}
} while (p);
-cp
+ cp();
return p;
}
return p;
}
@@
-380,7
+399,7
@@
void dump_subnets(void)
char *netstr;
subnet_t *subnet;
avl_node_t *node;
char *netstr;
subnet_t *subnet;
avl_node_t *node;
-cp
+ cp();
syslog(LOG_DEBUG, _("Subnet list:"));
for(node = subnet_tree->head; node; node = node->next)
{
syslog(LOG_DEBUG, _("Subnet list:"));
for(node = subnet_tree->head; node; node = node->next)
{
@@
-390,5
+409,5
@@
cp
free(netstr);
}
syslog(LOG_DEBUG, _("End of subnet list."));
free(netstr);
}
syslog(LOG_DEBUG, _("End of subnet list."));
-cp
+ cp();
}
}