/*
subnet.c -- handle subnet lookups and lists
- Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.warande.net>,
- 2000-2002 Ivo Timmermans <itimmermans@bigfoot.com>
+ Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.eu.org>,
+ 2000-2002 Ivo Timmermans <ivo@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
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.30 2002/02/18 16:25:19 guus Exp $
+ $Id: subnet.c,v 1.1.2.39 2002/07/11 12:42:43 guus Exp $
*/
#include "config.h"
int subnet_compare_mac(subnet_t *a, subnet_t *b)
{
+ int result;
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)
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)
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)
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)
{
int i, l;
subnet_t *subnet;
- unsigned short int x[8];
+ uint16_t x[8];
cp
subnet = new_subnet();
cp
&l) == 5)
{
subnet->type = SUBNET_IPV4;
- subnet->net.ipv4.masklength = l;
+ subnet->net.ipv4.prefixlength = l;
for(i = 0; i < 4; i++)
subnet->net.ipv4.address.x[i] = x[i];
return subnet;
&l) == 9)
{
subnet->type = SUBNET_IPV6;
- subnet->net.ipv6.masklength = l;
+ subnet->net.ipv6.prefixlength = l;
for(i = 0; i < 8; i++)
subnet->net.ipv6.address.x[i] = htons(x[i]);
return subnet;
&x[0], &x[1], &x[2], &x[3]) == 4)
{
subnet->type = SUBNET_IPV4;
- subnet->net.ipv4.masklength = 32;
+ subnet->net.ipv4.prefixlength = 32;
for(i = 0; i < 4; i++)
subnet->net.ipv4.address.x[i] = x[i];
return subnet;
&x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7]) == 8)
{
subnet->type = SUBNET_IPV6;
- subnet->net.ipv6.masklength = 128;
+ subnet->net.ipv6.prefixlength = 128;
for(i = 0; i < 8; i++)
- subnet->net.ipv6.address.x[i] = htons(x[i]);
+ subnet->net.ipv6.address.x[i] = htons(x[i]);
return subnet;
}
subnet->net.ipv4.address.x[1],
subnet->net.ipv4.address.x[2],
subnet->net.ipv4.address.x[3],
- subnet->net.ipv4.masklength);
+ subnet->net.ipv4.prefixlength);
break;
case SUBNET_IPV6:
asprintf(&netstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
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);
+ subnet->net.ipv6.prefixlength);
break;
default:
- syslog(LOG_ERR, _("net2str() was called with unknown subnet type %d, exitting!"), subnet->type);
+ syslog(LOG_ERR, _("net2str() was called with unknown subnet type %d, exiting!"), subnet->type);
cp_trace();
exit(0);
}
cp
subnet.type = SUBNET_MAC;
memcpy(&subnet.net.mac.address, address, sizeof(mac_t));
+ subnet.owner = NULL;
p = (subnet_t *)avl_search(subnet_tree, &subnet);
cp
cp
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
{
if(p)
{
if(p->type != SUBNET_IPV4)
- return NULL;
+ {
+ p = NULL;
+ break;
+ }
- if (!maskcmp((char *)address, (char *)&p->net.ipv4.address, p->net.ipv4.masklength, sizeof(ipv4_t)))
+ if (!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength, sizeof(ipv4_t)))
break;
else
{
/* Otherwise, see if there is a bigger enclosing subnet */
- subnet.net.ipv4.masklength = p->net.ipv4.masklength - 1;
- maskcpy((char *)&subnet.net.ipv4.address, (char *)&p->net.ipv4.address, subnet.net.ipv4.masklength, sizeof(ipv4_t));
+ subnet.net.ipv4.prefixlength = p->net.ipv4.prefixlength - 1;
+ maskcpy(&subnet.net.ipv4.address, &p->net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof(ipv4_t));
}
}
- } while (p);
-
- return p;
+ } while (p);
+cp
+ return p;
}
subnet_t *lookup_subnet_ipv6(ipv6_t *address)
cp
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
{
if(p->type != SUBNET_IPV6)
return NULL;
- if (!maskcmp((char *)address, (char *)&p->net.ipv6.address, p->net.ipv6.masklength, sizeof(ipv6_t)))
+ if (!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength, sizeof(ipv6_t)))
break;
else
{
/* Otherwise, see if there is a bigger enclosing subnet */
- subnet.net.ipv6.masklength = p->net.ipv6.masklength - 1;
- maskcpy((char *)&subnet.net.ipv6.address, (char *)&p->net.ipv6.address, subnet.net.ipv6.masklength, sizeof(ipv6_t));
+ subnet.net.ipv6.prefixlength = p->net.ipv6.prefixlength - 1;
+ maskcpy(&subnet.net.ipv6.address, &p->net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof(ipv6_t));
}
}
} while (p);
-
+cp
return p;
}