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.48 2003/07/24 12:08:16 guus Exp $
+ $Id: subnet.c,v 1.1.2.52 2003/12/12 19:52:25 guus Exp $
*/
#include "system.h"
return strcmp(a->owner->name, b->owner->name);
}
-static int subnet_compare(const subnet_t *a, const 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(const 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(const 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]),
subnet_t *lookup_subnet_mac(const mac_t *address)
{
- subnet_t subnet = {
- .type = SUBNET_MAC,
- .net.mac.address = *address,
- .owner = NULL
- };
- subnet_t *p;
+ subnet_t *p, subnet = {0};
cp();
- p = (subnet_t *) avl_search(subnet_tree, &subnet);
+ subnet.type = SUBNET_MAC;
+ subnet.net.mac.address = *address;
+ subnet.owner = NULL;
+
+ p = avl_search(subnet_tree, &subnet);
return p;
}
subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
{
- subnet_t subnet = {
- .type = SUBNET_IPV4,
- .net.ipv4.address = *address,
- .net.ipv4.prefixlength = 32,
- .owner = NULL
- };
- subnet_t *p;
+ subnet_t *p, subnet = {0};
cp();
+ subnet.type = SUBNET_IPV4;
+ 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 */
subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
{
- subnet_t subnet = {
- .type = SUBNET_IPV6,
- .net.ipv6.address = *address,
- .net.ipv6.prefixlength = 128,
- .owner = NULL
- };
- subnet_t *p;
+ subnet_t *p, subnet = {0};
cp();
+ subnet.type = SUBNET_IPV6;
+ 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."));