/*
subnet.c -- handle subnet lookups and lists
- Copyright (C) 2000-2003 Guus Sliepen <guus@sliepen.eu.org>,
- 2000-2003 Ivo Timmermans <ivo@o2w.nl>
+ Copyright (C) 2000-2004 Guus Sliepen <guus@tinc-vpn.org>,
+ 2000-2004 Ivo Timmermans <ivo@tinc-vpn.org>
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
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.47 2003/07/17 15:06:27 guus Exp $
+ $Id$
*/
#include "system.h"
/* Subnet comparison */
-static int subnet_compare_mac(subnet_t *a, subnet_t *b)
+static int subnet_compare_mac(const subnet_t *a, const subnet_t *b)
{
int result;
return strcmp(a->owner->name, b->owner->name);
}
-static int subnet_compare_ipv4(subnet_t *a, subnet_t *b)
+static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b)
{
int result;
return strcmp(a->owner->name, b->owner->name);
}
-static int subnet_compare_ipv6(subnet_t *a, subnet_t *b)
+static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b)
{
int result;
return strcmp(a->owner->name, b->owner->name);
}
-static int subnet_compare(subnet_t *a, subnet_t *b)
+int subnet_compare(const subnet_t *a, const subnet_t *b)
{
int result;
{
cp();
- return (subnet_t *) xmalloc_and_zero(sizeof(subnet_t));
+ return xmalloc_and_zero(sizeof(subnet_t));
}
void free_subnet(subnet_t *subnet)
/* Ascii representation of subnets */
-subnet_t *str2net(char *subnetstr)
+bool str2net(subnet_t *subnet, const char *subnetstr)
{
int i, l;
- subnet_t *subnet;
uint16_t x[8];
cp();
- subnet = new_subnet();
-
if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d",
&x[0], &x[1], &x[2], &x[3], &l) == 5) {
subnet->type = SUBNET_IPV4;
for(i = 0; i < 4; i++)
subnet->net.ipv4.address.x[i] = x[i];
- return subnet;
+ return true;
}
if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
for(i = 0; i < 8; i++)
subnet->net.ipv6.address.x[i] = htons(x[i]);
- return subnet;
+ return true;
}
if(sscanf(subnetstr, "%hu.%hu.%hu.%hu", &x[0], &x[1], &x[2], &x[3]) == 4) {
for(i = 0; i < 4; i++)
subnet->net.ipv4.address.x[i] = x[i];
- return subnet;
+ return true;
}
if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx",
for(i = 0; i < 8; i++)
subnet->net.ipv6.address.x[i] = htons(x[i]);
- return subnet;
+ return true;
}
if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx",
for(i = 0; i < 6; i++)
subnet->net.mac.address.x[i] = x[i];
- return subnet;
+ return true;
}
- free(subnet);
-
- return NULL;
+ return false;
}
-char *net2str(subnet_t *subnet)
+bool net2str(char *netstr, int len, const subnet_t *subnet)
{
- char *netstr;
-
cp();
switch (subnet->type) {
case SUBNET_MAC:
- asprintf(&netstr, "%hx:%hx:%hx:%hx:%hx:%hx",
+ snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx",
subnet->net.mac.address.x[0],
subnet->net.mac.address.x[1],
subnet->net.mac.address.x[2],
break;
case SUBNET_IPV4:
- asprintf(&netstr, "%hu.%hu.%hu.%hu/%d",
+ snprintf(netstr, len, "%hu.%hu.%hu.%hu/%d",
subnet->net.ipv4.address.x[0],
subnet->net.ipv4.address.x[1],
subnet->net.ipv4.address.x[2],
break;
case SUBNET_IPV6:
- asprintf(&netstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
+ snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
ntohs(subnet->net.ipv6.address.x[0]),
ntohs(subnet->net.ipv6.address.x[1]),
ntohs(subnet->net.ipv6.address.x[2]),
exit(0);
}
- return netstr;
+ return true;
}
/* Subnet lookup routines */
-subnet_t *lookup_subnet(node_t *owner, subnet_t *subnet)
+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(mac_t *address)
+subnet_t *lookup_subnet_mac(const mac_t *address)
{
- subnet_t subnet, *p;
+ subnet_t *p, subnet = {0};
cp();
subnet.type = SUBNET_MAC;
- memcpy(&subnet.net.mac.address, address, sizeof(mac_t));
+ subnet.net.mac.address = *address;
subnet.owner = NULL;
- p = (subnet_t *) avl_search(subnet_tree, &subnet);
+ p = avl_search(subnet_tree, &subnet);
return p;
}
-subnet_t *lookup_subnet_ipv4(ipv4_t *address)
+subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
{
- subnet_t subnet, *p;
+ subnet_t *p, subnet = {0};
cp();
subnet.type = SUBNET_IPV4;
- memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
+ subnet.net.ipv4.address = *address;
subnet.net.ipv4.prefixlength = 32;
subnet.owner = NULL;
do {
/* Go find subnet */
- p = (subnet_t *) avl_search_closest_smaller(subnet_tree, &subnet);
+ p = avl_search_closest_smaller(subnet_tree, &subnet);
/* Check if the found subnet REALLY matches */
return p;
}
-subnet_t *lookup_subnet_ipv6(ipv6_t *address)
+subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
{
- subnet_t subnet, *p;
+ subnet_t *p, subnet = {0};
cp();
subnet.type = SUBNET_IPV6;
- memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
+ subnet.net.ipv6.address = *address;
subnet.net.ipv6.prefixlength = 128;
subnet.owner = NULL;
do {
/* Go find subnet */
- p = (subnet_t *) avl_search_closest_smaller(subnet_tree, &subnet);
+ p = avl_search_closest_smaller(subnet_tree, &subnet);
/* Check if the found subnet REALLY matches */
void dump_subnets(void)
{
- char *netstr;
+ char netstr[MAXNETSTR];
subnet_t *subnet;
avl_node_t *node;
logger(LOG_DEBUG, _("Subnet list:"));
for(node = subnet_tree->head; node; node = node->next) {
- subnet = (subnet_t *) node->data;
- netstr = net2str(subnet);
+ subnet = node->data;
+ if(!net2str(netstr, sizeof netstr, subnet))
+ continue;
logger(LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name);
- free(netstr);
}
logger(LOG_DEBUG, _("End of subnet list."));
projects / tinc / blobdiff