X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=aca1912b5be32b0a882af2fbf31b4d0c16275dbd;hp=ed5e1ac8946a476a13cf9a35646ef5363cd75755;hb=396ac4be802f8b75c5a2ab5925925427c61c1da3;hpb=0b9175e998c2180e5d73ef3d644a49d620c68cad diff --git a/src/subnet.c b/src/subnet.c index ed5e1ac8..aca1912b 100644 --- a/src/subnet.c +++ b/src/subnet.c @@ -1,7 +1,7 @@ /* subnet.c -- handle subnet lookups and lists - Copyright (C) 2000-2002 Guus Sliepen , - 2000-2002 Ivo Timmermans + Copyright (C) 2000-2004 Guus Sliepen , + 2000-2004 Ivo Timmermans 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,30 +17,19 @@ 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.44 2003/07/06 22:11:33 guus Exp $ + $Id$ */ -#include "config.h" - -#include -#include -#include -#include -#include -#include - -#include -#include -#include +#include "system.h" -#include "conf.h" +#include "avl_tree.h" +#include "logger.h" #include "net.h" +#include "netutl.h" #include "node.h" #include "subnet.h" -#include "netutl.h" -#include "logger.h" - -#include "system.h" +#include "utils.h" +#include "xalloc.h" /* lists type of subnet */ @@ -48,7 +37,7 @@ avl_tree_t *subnet_tree; /* Subnet comparison */ -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; @@ -60,7 +49,7 @@ int subnet_compare_mac(subnet_t *a, subnet_t *b) return strcmp(a->owner->name, b->owner->name); } -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; @@ -77,7 +66,7 @@ int subnet_compare_ipv4(subnet_t *a, subnet_t *b) return strcmp(a->owner->name, b->owner->name); } -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; @@ -94,7 +83,7 @@ int subnet_compare_ipv6(subnet_t *a, subnet_t *b) return strcmp(a->owner->name, b->owner->name); } -int subnet_compare(subnet_t *a, subnet_t *b) +int subnet_compare(const subnet_t *a, const subnet_t *b) { int result; @@ -111,7 +100,7 @@ int subnet_compare(subnet_t *a, subnet_t *b) case SUBNET_IPV6: return subnet_compare_ipv6(a, b); default: - logger(DEBUG_ALWAYS, LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, exitting!"), + logger(LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, exitting!"), a->type); cp_trace(); exit(0); @@ -156,7 +145,7 @@ subnet_t *new_subnet(void) { cp(); - return (subnet_t *) xmalloc_and_zero(sizeof(subnet_t)); + return xmalloc_and_zero(sizeof(subnet_t)); } void free_subnet(subnet_t *subnet) @@ -188,16 +177,13 @@ void subnet_del(node_t *n, 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; @@ -206,7 +192,7 @@ subnet_t *str2net(char *subnetstr) 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", @@ -218,7 +204,7 @@ subnet_t *str2net(char *subnetstr) 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) { @@ -228,7 +214,7 @@ subnet_t *str2net(char *subnetstr) 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", @@ -239,7 +225,7 @@ subnet_t *str2net(char *subnetstr) 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", @@ -249,23 +235,19 @@ subnet_t *str2net(char *subnetstr) 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], @@ -274,7 +256,7 @@ char *net2str(subnet_t *subnet) 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], @@ -282,7 +264,7 @@ char *net2str(subnet_t *subnet) 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]), @@ -295,55 +277,55 @@ char *net2str(subnet_t *subnet) break; default: - logger(DEBUG_ALWAYS, LOG_ERR, + logger(LOG_ERR, _("net2str() was called with unknown subnet type %d, exiting!"), subnet->type); cp_trace(); 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 */ @@ -367,21 +349,21 @@ subnet_t *lookup_subnet_ipv4(ipv4_t *address) 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 */ @@ -405,20 +387,20 @@ subnet_t *lookup_subnet_ipv6(ipv6_t *address) void dump_subnets(void) { - char *netstr; + char netstr[MAXNETSTR]; subnet_t *subnet; avl_node_t *node; cp(); - logger(DEBUG_ALWAYS, LOG_DEBUG, _("Subnet list:")); + logger(LOG_DEBUG, _("Subnet list:")); for(node = subnet_tree->head; node; node = node->next) { - subnet = (subnet_t *) node->data; - netstr = net2str(subnet); - logger(DEBUG_ALWAYS, LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name); - free(netstr); + subnet = node->data; + if(!net2str(netstr, sizeof netstr, subnet)) + continue; + logger(LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name); } - logger(DEBUG_ALWAYS, LOG_DEBUG, _("End of subnet list.")); + logger(LOG_DEBUG, _("End of subnet list.")); }