/*
subnet.c -- handle subnet lookups and lists
- Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
- 2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>
+ Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.warande.net>,
+ 2000-2002 Ivo Timmermans <itimmermans@bigfoot.com>
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.24 2001/08/28 20:52:39 guus Exp $
+ $Id: subnet.c,v 1.1.2.29 2002/02/10 21:57:54 guus Exp $
*/
#include "config.h"
#include <stdio.h>
#include <syslog.h>
#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <netinet/in.h>
#include "conf.h"
#include "net.h"
-#include "connection.h"
+#include "node.h"
#include "subnet.h"
#include "system.h"
avl_tree_t *subnet_tree;
-void init_subnets(void)
-{
-cp
- subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, (avl_action_t)free_subnet);
-cp
-}
-
/* Subnet comparison */
int subnet_compare_mac(subnet_t *a, subnet_t *b)
cp
/* We compare as if a subnet is a number that equals (address << 32 + netmask). */
- if(a->net.ipv4.address == b->net.ipv4.address)
- {
- if(a->net.ipv4.mask < b->net.ipv4.mask)
- return -1;
- else if(a->net.ipv4.mask > b->net.ipv4.mask)
- return 1;
- else
- return 0;
- }
- else
- {
- if(a->net.ipv4.address < b->net.ipv4.address)
- return -1;
- else if(a->net.ipv4.address > b->net.ipv4.address)
- return 1;
- else
- return 0;
- }
+ if(a->net.ipv4.address < b->net.ipv4.address)
+ return -1;
+ else if(a->net.ipv4.address > b->net.ipv4.address)
+ return 1;
+
+ if(a->net.ipv4.mask < b->net.ipv4.mask)
+ return -1;
+ else if(a->net.ipv4.mask > b->net.ipv4.mask)
+ return 1;
+
+ return 0;
}
int subnet_compare_ipv6(subnet_t *a, subnet_t *b)
{
+ int result;
cp
/* Same as ipv4 case, but with nasty 128 bit addresses */
- if(memcmp(&a->net.ipv6.mask, &b->net.ipv6.mask, sizeof(ipv6_t)) > 0)
- if((a->net.ipv6.address.x[0] & b->net.ipv6.mask.x[0]) == b->net.ipv6.address.x[0] &&
- (a->net.ipv6.address.x[1] & b->net.ipv6.mask.x[1]) == b->net.ipv6.address.x[1] &&
- (a->net.ipv6.address.x[2] & b->net.ipv6.mask.x[2]) == b->net.ipv6.address.x[2] &&
- (a->net.ipv6.address.x[3] & b->net.ipv6.mask.x[3]) == b->net.ipv6.address.x[3] &&
- (a->net.ipv6.address.x[4] & b->net.ipv6.mask.x[4]) == b->net.ipv6.address.x[4] &&
- (a->net.ipv6.address.x[5] & b->net.ipv6.mask.x[5]) == b->net.ipv6.address.x[5] &&
- (a->net.ipv6.address.x[6] & b->net.ipv6.mask.x[6]) == b->net.ipv6.address.x[6] &&
- (a->net.ipv6.address.x[7] & b->net.ipv6.mask.x[7]) == b->net.ipv6.address.x[7])
- return -1;
+ result = memcmp(a->net.ipv6.address.x, b->net.ipv6.address.x, sizeof(ipv6_t));
+
+ if(result)
+ return result;
+
+ result = memcmp(a->net.ipv6.mask.x, b->net.ipv6.mask.x, sizeof(ipv6_t));
- return memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t));
+ if(result)
+ return result;
+
+ return 0;
}
int subnet_compare(subnet_t *a, subnet_t *b)
case SUBNET_IPV6:
return subnet_compare_ipv6(a, b);
default:
- syslog(LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, restarting!"), a->type);
- sighup = 1;
- return 0;
+ syslog(LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, exitting!"), a->type);
+ cp_trace();
+ exit(0);
}
+
+ return 0;
+}
+
+/* Initialising trees */
+
+void init_subnets(void)
+{
+cp
+ subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, (avl_action_t)free_subnet);
+cp
+}
+
+void exit_subnets(void)
+{
+cp
+ avl_delete_tree(subnet_tree);
+cp
+}
+
+avl_tree_t *new_subnet_tree(void)
+{
+cp
+ return avl_alloc_tree((avl_compare_t)subnet_compare, NULL);
+cp
+}
+
+void free_subnet_tree(avl_tree_t *subnet_tree)
+{
+cp
+ avl_delete_tree(subnet_tree);
+cp
}
/* Allocating and freeing space for subnets */
free(subnet);
}
-/* Linked list management */
+/* Adding and removing subnets */
-void subnet_add(connection_t *cl, subnet_t *subnet)
+void subnet_add(node_t *n, subnet_t *subnet)
{
cp
- subnet->owner = cl;
-
- while(!avl_insert(subnet_tree, subnet))
- {
- subnet_t *old;
-
- old = (subnet_t *)avl_search(subnet_tree, subnet);
-
- if(debug_lvl >= DEBUG_PROTOCOL)
- {
- char *subnetstr;
- subnetstr = net2str(subnet);
- syslog(LOG_WARNING, _("Duplicate subnet %s for %s (%s), previous owner %s (%s)!"),
- subnetstr, cl->name, cl->hostname, old->owner->name, old->owner->hostname);
- free(subnetstr);
- }
-
- subnet_del(old);
- }
+ subnet->owner = n;
- avl_insert(cl->subnet_tree, subnet);
+ avl_insert(subnet_tree, subnet);
+cp
+ avl_insert(n->subnet_tree, subnet);
cp
}
-void subnet_del(subnet_t *subnet)
+void subnet_del(node_t *n, subnet_t *subnet)
{
cp
- avl_delete(subnet->owner->subnet_tree, subnet);
+ avl_delete(n->subnet_tree, subnet);
cp
avl_delete(subnet_tree, subnet);
cp
subnet_t *str2net(char *subnetstr)
{
- int type;
+ int i, l;
subnet_t *subnet;
-cp
- if(sscanf(subnetstr, "%d,", &type) != 1)
- return NULL;
+ unsigned short int x[6];
cp
subnet = new_subnet();
cp
- switch(type)
+ if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d",
+ &x[0],
+ &x[1],
+ &x[2],
+ &x[3],
+ &subnet->net.ipv4.masklength) == 5)
{
- case SUBNET_MAC:
- if(sscanf(subnetstr, "%d,%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &subnet->type,
- &subnet->net.mac.address.x[0],
- &subnet->net.mac.address.x[1],
- &subnet->net.mac.address.x[2],
- &subnet->net.mac.address.x[3],
- &subnet->net.mac.address.x[4],
- &subnet->net.mac.address.x[5]) != 7)
- {
- free_subnet(subnet);
- return NULL;
- }
- break;
- case SUBNET_IPV4:
- if(sscanf(subnetstr, "%d,%lx/%lx", &subnet->type, &subnet->net.ipv4.address, &subnet->net.ipv4.mask) != 3)
- {
- free_subnet(subnet);
- return NULL;
- }
- break;
- case SUBNET_IPV6:
- if(sscanf(subnetstr, "%d,%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx", &subnet->type,
- &subnet->net.ipv6.address.x[0],
- &subnet->net.ipv6.address.x[1],
- &subnet->net.ipv6.address.x[2],
- &subnet->net.ipv6.address.x[3],
- &subnet->net.ipv6.address.x[4],
- &subnet->net.ipv6.address.x[5],
- &subnet->net.ipv6.address.x[6],
- &subnet->net.ipv6.address.x[7],
- &subnet->net.ipv6.mask.x[0],
- &subnet->net.ipv6.mask.x[1],
- &subnet->net.ipv6.mask.x[2],
- &subnet->net.ipv6.mask.x[3],
- &subnet->net.ipv6.mask.x[4],
- &subnet->net.ipv6.mask.x[5],
- &subnet->net.ipv6.mask.x[6],
- &subnet->net.ipv6.mask.x[7]) != 17)
- {
- free_subnet(subnet);
- return NULL;
- }
- break;
- default:
- free_subnet(subnet);
- return NULL;
+ subnet->type = SUBNET_IPV4;
+ subnet->net.ipv4.address = (((((x[0] << 8) + x[1]) << 8) + x[2]) << 8) + x[3];
+ subnet->net.ipv4.mask = ~((1 << (32 - subnet->net.ipv4.masklength)) - 1);
+ return subnet;
}
-cp
- return subnet;
+
+ if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
+ &subnet->net.ipv6.address.x[0],
+ &subnet->net.ipv6.address.x[1],
+ &subnet->net.ipv6.address.x[2],
+ &subnet->net.ipv6.address.x[3],
+ &subnet->net.ipv6.address.x[4],
+ &subnet->net.ipv6.address.x[5],
+ &subnet->net.ipv6.address.x[6],
+ &subnet->net.ipv6.address.x[7],
+ &subnet->net.ipv6.masklength) == 9)
+ {
+ subnet->type = SUBNET_IPV6;
+ for(l = subnet->net.ipv6.masklength, i = 0; i < 8; l -= 16, i++)
+ {
+ subnet->net.ipv6.address.x[i] = htons(subnet->net.ipv6.address.x[i]);
+ if(l >= 16)
+ subnet->net.ipv6.mask.x[i] = 65535;
+ else if (l > 0)
+ subnet->net.ipv6.mask.x[i] = htons(65536 - (1 << l));
+ else
+ subnet->net.ipv6.mask.x[i] = 0;
+ }
+ return subnet;
+ }
+
+ if(sscanf(subnetstr, "%hu.%hu.%hu.%hu",
+ &x[0],
+ &x[1],
+ &x[2],
+ &x[3]) == 4)
+ {
+ subnet->type = SUBNET_IPV4;
+ subnet->net.ipv4.address = (((((x[0] << 8) + x[1]) << 8) + x[2]) << 8) + x[3];
+ subnet->net.ipv4.mask = ~0;
+ subnet->net.ipv4.masklength = 32;
+ return subnet;
+ }
+
+ if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx",
+ &subnet->net.ipv6.address.x[0],
+ &subnet->net.ipv6.address.x[1],
+ &subnet->net.ipv6.address.x[2],
+ &subnet->net.ipv6.address.x[3],
+ &subnet->net.ipv6.address.x[4],
+ &subnet->net.ipv6.address.x[5],
+ &subnet->net.ipv6.address.x[6],
+ &subnet->net.ipv6.address.x[7]) == 8)
+ {
+ subnet->type = SUBNET_IPV6;
+ subnet->net.ipv6.masklength = 128;
+ for(l = subnet->net.ipv6.masklength, i = 0; i < 8; l -= 16, i++)
+ {
+ subnet->net.ipv6.address.x[i] = htons(subnet->net.ipv6.address.x[i]);
+ if(l >= 16)
+ subnet->net.ipv6.mask.x[i] = 65535;
+ else if (l > 0)
+ subnet->net.ipv6.mask.x[i] = htons(65536 - (1 << l));
+ else
+ subnet->net.ipv6.mask.x[i] = 0;
+ }
+ return subnet;
+ }
+
+ if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx",
+ &x[0],
+ &x[1],
+ &x[2],
+ &x[3],
+ &x[4],
+ &x[5]) == 6)
+ {
+ subnet->type = SUBNET_MAC;
+ subnet->net.mac.address.x[0] = x[0];
+ subnet->net.mac.address.x[1] = x[1];
+ subnet->net.mac.address.x[2] = x[2];
+ subnet->net.mac.address.x[3] = x[3];
+ subnet->net.mac.address.x[4] = x[4];
+ subnet->net.mac.address.x[5] = x[5];
+ return subnet;
+ }
+
+ free(subnet);
+ return NULL;
}
char *net2str(subnet_t *subnet)
switch(subnet->type)
{
case SUBNET_MAC:
- asprintf(&netstr, "%d,%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", subnet->type,
+ asprintf(&netstr, "%hx:%hx:%hx:%hx:%hx:%hx",
subnet->net.mac.address.x[0],
subnet->net.mac.address.x[1],
subnet->net.mac.address.x[2],
subnet->net.mac.address.x[5]);
break;
case SUBNET_IPV4:
- asprintf(&netstr, "%d,%lx/%lx", subnet->type, subnet->net.ipv4.address, subnet->net.ipv4.mask);
+ asprintf(&netstr, "%hu.%hu.%hu.%hu/%d",
+ (unsigned short int)((subnet->net.ipv4.address >> 24) & 255),
+ (unsigned short int)((subnet->net.ipv4.address >> 16) & 255),
+ (unsigned short int)((subnet->net.ipv4.address >> 8) & 255),
+ (unsigned short int)(subnet->net.ipv4.address & 255),
+ subnet->net.ipv4.masklength);
break;
case SUBNET_IPV6:
- asprintf(&netstr, "%d,%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx", subnet->type,
- subnet->net.ipv6.address.x[0],
- subnet->net.ipv6.address.x[1],
- subnet->net.ipv6.address.x[2],
- subnet->net.ipv6.address.x[3],
- subnet->net.ipv6.address.x[4],
- subnet->net.ipv6.address.x[5],
- subnet->net.ipv6.address.x[6],
- subnet->net.ipv6.address.x[7],
- subnet->net.ipv6.mask.x[0],
- subnet->net.ipv6.mask.x[1],
- subnet->net.ipv6.mask.x[2],
- subnet->net.ipv6.mask.x[3],
- subnet->net.ipv6.mask.x[4],
- subnet->net.ipv6.mask.x[5],
- subnet->net.ipv6.mask.x[6],
- subnet->net.ipv6.mask.x[7]);
+ asprintf(&netstr, "%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]),
+ ntohs(subnet->net.ipv6.address.x[3]),
+ ntohs(subnet->net.ipv6.address.x[4]),
+ ntohs(subnet->net.ipv6.address.x[5]),
+ ntohs(subnet->net.ipv6.address.x[6]),
+ ntohs(subnet->net.ipv6.address.x[7]),
+ subnet->net.ipv6.masklength);
break;
default:
asprintf(&netstr, _("unknown subnet type"));
/* Subnet lookup routines */
+subnet_t *lookup_subnet(node_t *owner, subnet_t *subnet)
+{
+cp
+ return avl_search(owner->subnet_tree, subnet);
+}
+
subnet_t *lookup_subnet_mac(mac_t *address)
{
subnet_t subnet, *p;
int i;
cp
subnet.type = SUBNET_IPV6;
- memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
- memset(&subnet.net.ipv6.mask, 0xFF, 16);
+ memcpy(subnet.net.ipv6.address.x, address, sizeof(ipv6_t));
+ memset(subnet.net.ipv6.mask.x, 0xFF, 16);
p = (subnet_t *)avl_search_closest_greater(subnet_tree, &subnet);
return p;
}
-void dump_subnet_list(void)
+void dump_subnets(void)
{
char *netstr;
subnet_t *subnet;
{
subnet = (subnet_t *)node->data;
netstr = net2str(subnet);
- syslog(LOG_DEBUG, " %s owner %s", netstr, subnet->owner->name);
+ syslog(LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name);
free(netstr);
}
syslog(LOG_DEBUG, _("End of subnet list."));
projects / tinc / blobdiff