projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't forget to set prevhop to myself for new connections.
[tinc]
/
src
/
subnet.c
diff --git
a/src/subnet.c
b/src/subnet.c
index
525c14e
..
ada8112
100644
(file)
--- a/
src/subnet.c
+++ b/
src/subnet.c
@@
-1,7
+1,7
@@
/*
subnet.c -- handle subnet lookups and lists
/*
subnet.c -- handle subnet lookups and lists
- Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.
warande.net
>,
- 2000-2002 Ivo Timmermans <i
timmermans@bigfoot.com
>
+ Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.
eu.org
>,
+ 2000-2002 Ivo Timmermans <i
vo@o2w.nl
>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-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.3
2 2002/03/11 11:23:04
guus Exp $
+ $Id: subnet.c,v 1.1.2.3
9 2002/07/11 12:42:43
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-42,10
+42,6
@@
#include "system.h"
#include "system.h"
-int cache_mac_valid = 0;
-int cache_ipv4_valid = 0;
-int cache_ipv6_valid = 0;
-
/* lists type of subnet */
avl_tree_t *subnet_tree;
/* lists type of subnet */
avl_tree_t *subnet_tree;
@@
-54,8
+50,14
@@
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)
{
+ int result;
cp
cp
- return memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
+ 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 subnet_compare_ipv4(subnet_t *a, subnet_t *b)
@@
-67,7
+69,12
@@
cp
if(result)
return result;
if(result)
return result;
- return a->net.ipv4.masklength - b->net.ipv4.masklength;
+ 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 subnet_compare_ipv6(subnet_t *a, subnet_t *b)
@@
-79,7
+86,12
@@
cp
if(result)
return result;
if(result)
return result;
- return a->net.ipv6.masklength - b->net.ipv6.masklength;
+ 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 subnet_compare(subnet_t *a, subnet_t *b)
@@
-143,7
+155,7
@@
cp
subnet_t *new_subnet(void)
{
cp
subnet_t *new_subnet(void)
{
cp
- return (subnet_t *)xmalloc(sizeof(subnet_t));
+ return (subnet_t *)xmalloc
_and_zero
(sizeof(subnet_t));
}
void free_subnet(subnet_t *subnet)
}
void free_subnet(subnet_t *subnet)
@@
-154,20
+166,11
@@
cp
/* Adding and removing subnets */
/* Adding and removing subnets */
-void cache_invalidate(void)
-{
- cache_mac_valid = 0;
- cache_ipv4_valid = 0;
- cache_ipv6_valid = 0;
-}
-
void subnet_add(node_t *n, subnet_t *subnet)
{
cp
subnet->owner = n;
void subnet_add(node_t *n, subnet_t *subnet)
{
cp
subnet->owner = n;
- cache_invalidate();
-
avl_insert(subnet_tree, subnet);
cp
avl_insert(n->subnet_tree, subnet);
avl_insert(subnet_tree, subnet);
cp
avl_insert(n->subnet_tree, subnet);
@@
-177,8
+180,6
@@
cp
void subnet_del(node_t *n, subnet_t *subnet)
{
cp
void subnet_del(node_t *n, subnet_t *subnet)
{
cp
- cache_invalidate();
-
avl_delete(n->subnet_tree, subnet);
cp
avl_delete(subnet_tree, subnet);
avl_delete(n->subnet_tree, subnet);
cp
avl_delete(subnet_tree, subnet);
@@
-191,7
+192,7
@@
subnet_t *str2net(char *subnetstr)
{
int i, l;
subnet_t *subnet;
{
int i, l;
subnet_t *subnet;
- u
nsigned short in
t x[8];
+ u
int16_
t x[8];
cp
subnet = new_subnet();
cp
cp
subnet = new_subnet();
cp
@@
-200,7
+201,7
@@
cp
&l) == 5)
{
subnet->type = SUBNET_IPV4;
&l) == 5)
{
subnet->type = SUBNET_IPV4;
- subnet->net.ipv4.
mask
length = l;
+ subnet->net.ipv4.
prefix
length = l;
for(i = 0; i < 4; i++)
subnet->net.ipv4.address.x[i] = x[i];
return subnet;
for(i = 0; i < 4; i++)
subnet->net.ipv4.address.x[i] = x[i];
return subnet;
@@
-211,7
+212,7
@@
cp
&l) == 9)
{
subnet->type = SUBNET_IPV6;
&l) == 9)
{
subnet->type = SUBNET_IPV6;
- subnet->net.ipv6.
mask
length = l;
+ subnet->net.ipv6.
prefix
length = l;
for(i = 0; i < 8; i++)
subnet->net.ipv6.address.x[i] = htons(x[i]);
return subnet;
for(i = 0; i < 8; i++)
subnet->net.ipv6.address.x[i] = htons(x[i]);
return subnet;
@@
-221,7
+222,7
@@
cp
&x[0], &x[1], &x[2], &x[3]) == 4)
{
subnet->type = SUBNET_IPV4;
&x[0], &x[1], &x[2], &x[3]) == 4)
{
subnet->type = SUBNET_IPV4;
- subnet->net.ipv4.
mask
length = 32;
+ subnet->net.ipv4.
prefix
length = 32;
for(i = 0; i < 4; i++)
subnet->net.ipv4.address.x[i] = x[i];
return subnet;
for(i = 0; i < 4; i++)
subnet->net.ipv4.address.x[i] = x[i];
return subnet;
@@
-231,7
+232,7
@@
cp
&x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7]) == 8)
{
subnet->type = SUBNET_IPV6;
&x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7]) == 8)
{
subnet->type = SUBNET_IPV6;
- subnet->net.ipv6.
mask
length = 128;
+ subnet->net.ipv6.
prefix
length = 128;
for(i = 0; i < 8; i++)
subnet->net.ipv6.address.x[i] = htons(x[i]);
return subnet;
for(i = 0; i < 8; i++)
subnet->net.ipv6.address.x[i] = htons(x[i]);
return subnet;
@@
-271,7
+272,7
@@
cp
subnet->net.ipv4.address.x[1],
subnet->net.ipv4.address.x[2],
subnet->net.ipv4.address.x[3],
subnet->net.ipv4.address.x[1],
subnet->net.ipv4.address.x[2],
subnet->net.ipv4.address.x[3],
- subnet->net.ipv4.
mask
length);
+ subnet->net.ipv4.
prefix
length);
break;
case SUBNET_IPV6:
asprintf(&netstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
break;
case SUBNET_IPV6:
asprintf(&netstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
@@
-283,10
+284,10
@@
cp
ntohs(subnet->net.ipv6.address.x[5]),
ntohs(subnet->net.ipv6.address.x[6]),
ntohs(subnet->net.ipv6.address.x[7]),
ntohs(subnet->net.ipv6.address.x[5]),
ntohs(subnet->net.ipv6.address.x[6]),
ntohs(subnet->net.ipv6.address.x[7]),
- subnet->net.ipv6.
mask
length);
+ subnet->net.ipv6.
prefix
length);
break;
default:
break;
default:
- syslog(LOG_ERR, _("net2str() was called with unknown subnet type %d, exit
t
ing!"), subnet->type);
+ syslog(LOG_ERR, _("net2str() was called with unknown subnet type %d, exiting!"), subnet->type);
cp_trace();
exit(0);
}
cp_trace();
exit(0);
}
@@
-304,30
+305,25
@@
cp
subnet_t *lookup_subnet_mac(mac_t *address)
{
subnet_t *lookup_subnet_mac(mac_t *address)
{
- s
tatic s
ubnet_t subnet, *p;
+ subnet_t subnet, *p;
cp
cp
- if(cache_mac_valid && !memcmp(&subnet.net.mac.address, address, sizeof(mac_t)))
- return p;
-
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);
- cache_mac_valid = 1;
cp
return p;
}
subnet_t *lookup_subnet_ipv4(ipv4_t *address)
{
cp
return p;
}
subnet_t *lookup_subnet_ipv4(ipv4_t *address)
{
- s
tatic s
ubnet_t subnet, *p;
+ subnet_t subnet, *p;
cp
cp
- if(cache_ipv4_valid && !memcmp(&subnet.net.ipv4.address, address, sizeof(ipv4_t)))
- return p;
-
subnet.type = SUBNET_IPV4;
memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
subnet.type = SUBNET_IPV4;
memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
- subnet.net.ipv4.masklength = 32;
+ subnet.net.ipv4.prefixlength = 32;
+ subnet.owner = NULL;
do
{
do
{
@@
-345,34
+341,29
@@
cp
break;
}
break;
}
- if (!maskcmp(
(char *)address, (char *)&p->net.ipv4.address, p->net.ipv4.mask
length, sizeof(ipv4_t)))
+ if (!maskcmp(
address, &p->net.ipv4.address, p->net.ipv4.prefix
length, sizeof(ipv4_t)))
break;
else
{
/* Otherwise, see if there is a bigger enclosing subnet */
break;
else
{
/* Otherwise, see if there is a bigger enclosing subnet */
- subnet.net.ipv4.
masklength = p->net.ipv4.mask
length - 1;
- maskcpy(
(char *)&subnet.net.ipv4.address, (char *)&p->net.ipv4.address, subnet.net.ipv4.mask
length, sizeof(ipv4_t));
+ subnet.net.ipv4.
prefixlength = p->net.ipv4.prefix
length - 1;
+ maskcpy(
&subnet.net.ipv4.address, &p->net.ipv4.address, subnet.net.ipv4.prefix
length, sizeof(ipv4_t));
}
}
} while (p);
}
}
} while (p);
-
- memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
- cache_ipv4_valid = 1;
cp
return p;
}
subnet_t *lookup_subnet_ipv6(ipv6_t *address)
{
cp
return p;
}
subnet_t *lookup_subnet_ipv6(ipv6_t *address)
{
- s
tatic s
ubnet_t subnet, *p;
+ subnet_t subnet, *p;
cp
cp
- if(cache_ipv6_valid && !memcmp(&subnet.net.ipv6.address, address, sizeof(ipv6_t)))
- return p;
-
subnet.type = SUBNET_IPV6;
memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
subnet.type = SUBNET_IPV6;
memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
- subnet.net.ipv6.masklength = 128;
+ subnet.net.ipv6.prefixlength = 128;
+ subnet.owner = NULL;
do
{
do
{
@@
-388,20
+379,17
@@
cp
if(p->type != SUBNET_IPV6)
return NULL;
if(p->type != SUBNET_IPV6)
return NULL;
- if (!maskcmp(
(char *)address, (char *)&p->net.ipv6.address, p->net.ipv6.mask
length, sizeof(ipv6_t)))
+ if (!maskcmp(
address, &p->net.ipv6.address, p->net.ipv6.prefix
length, sizeof(ipv6_t)))
break;
else
{
/* Otherwise, see if there is a bigger enclosing subnet */
break;
else
{
/* Otherwise, see if there is a bigger enclosing subnet */
- subnet.net.ipv6.
masklength = p->net.ipv6.mask
length - 1;
- maskcpy(
(char *)&subnet.net.ipv6.address, (char *)&p->net.ipv6.address, subnet.net.ipv6.mask
length, sizeof(ipv6_t));
+ subnet.net.ipv6.
prefixlength = p->net.ipv6.prefix
length - 1;
+ maskcpy(
&subnet.net.ipv6.address, &p->net.ipv6.address, subnet.net.ipv6.prefix
length, sizeof(ipv6_t));
}
}
} while (p);
}
}
} while (p);
-
- memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
- cache_ipv6_valid = 1;
cp
return p;
}
cp
return p;
}