X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=8e50646261efd609aeaf4adafe46f7a9c7174c68;hp=9c225f2129bfbd0df31d571d6712d48830ecb3f1;hb=3a6200c1e39b61b249db3d1f9bcffa77351863bd;hpb=2228b16159a7aff64e6559ee1635716154e67fe6 diff --git a/src/subnet.c b/src/subnet.c index 9c225f21..8e506462 100644 --- a/src/subnet.c +++ b/src/subnet.c @@ -17,70 +17,287 @@ 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.1 2000/10/01 03:21:49 guus Exp $ + $Id: subnet.c,v 1.1.2.14 2000/11/20 22:13:13 guus Exp $ */ #include "config.h" -#include "subnet.h" + +#include +#include + +#include "conf.h" #include "net.h" +#include "connection.h" +#include "subnet.h" +#include "system.h" + +#include +#include +#include + +/* lists type of subnet */ + +rbltree_t *subnet_tree; + +void init_subnets(void) +{ +cp + subnet_tree = new_rbltree((rbl_compare_t)subnet_compare, (rbl_action_t)free_subnet); +cp +} + +/* Subnet comparison */ + +int subnet_compare_mac(subnet_t *a, subnet_t *b) +{ +cp + return memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t)); +} + +int subnet_compare_ipv4(subnet_t *a, subnet_t *b) +{ +cp + /* If the subnet of a falls within the range of subnet b, + then we consider a smaller then b. + Otherwise, the addresses alone (and not the subnet masks) will be compared. + */ + + if(a->net.ipv4.mask > b->net.ipv4.mask) + if((a->net.ipv4.address & b->net.ipv4.mask) == b->net.ipv4.address) + return -1; + + return a->net.ipv4.address - b->net.ipv4.address; +} + +int subnet_compare_ipv6(subnet_t *a, subnet_t *b) +{ +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; + + return memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t)); +} + +int subnet_compare(subnet_t *a, subnet_t *b) +{ + int x; +cp + x = a->type - b->type; + if(x) + return x; + + switch(a->type) + { + case SUBNET_MAC: + return subnet_compare_mac(a, b); + case SUBNET_IPV4: + return subnet_compare_ipv4(a, 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; + } +} /* Allocating and freeing space for subnets */ subnet_t *new_subnet(void) { cp -cp + return (subnet_t *)xmalloc(sizeof(subnet_t)); } void free_subnet(subnet_t *subnet) { cp -cp + free(subnet); } /* Linked list management */ -int subnet_add(conn_list_t *cl, subnet_t *subnet) +void subnet_add(connection_t *cl, subnet_t *subnet) { cp - subnet->next = cl->subnets->next; - subnet->prev = NULL; - subnet->next->prev = subnet - cl->subnets = subnet; + subnet->owner = cl; + rbl_insert(subnet_tree, subnet); + rbl_insert(cl->subnet_tree, subnet); cp - return 0; } -int subnet_del(conn_list_t *cl, subnet_t *subnet) +void subnet_del(subnet_t *subnet) { cp - if(subnet->prev) - { - subnet->prev->next = subnet->next; - } - else - { - subnet->owner->subnets = subnet->next; - } - - subnet->next->prev = subnet->prev; - free_subnet(subnet); + rbl_delete(subnet->owner->subnet_tree, subnet); + rbl_delete(subnet_tree, subnet); cp - return 0; } /* Ascii representation of subnets */ subnet_t *str2net(char *subnetstr) { + int type; + subnet_t *subnet; +cp + if(sscanf(subnetstr, "%d,", &type) != 1) + return NULL; cp + subnet = new_subnet(); cp + switch(type) + { + 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; + } +cp + return subnet; } char *net2str(subnet_t *subnet) { + char *netstr; cp + switch(subnet->type) + { + case SUBNET_MAC: + asprintf(&netstr, "%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]); + break; + case SUBNET_IPV4: + asprintf(&netstr, "%d,%lx/%lx", subnet->type, subnet->net.ipv4.address, subnet->net.ipv4.mask); + 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]); + break; + default: + asprintf(&netstr, _("unknown")); + } cp + return netstr; } /* Subnet lookup routines */ + +subnet_t *lookup_subnet_mac(mac_t address) +{ + subnet_t subnet; +cp + subnet.type = SUBNET_MAC; + subnet.net.mac.address = address; + return (subnet_t *)rbl_search_closest(subnet_tree, &subnet); +} + +subnet_t *lookup_subnet_ipv4(ipv4_t address) +{ + subnet_t subnet; +cp + subnet.type = SUBNET_IPV4; + subnet.net.ipv4.address = address; + subnet.net.ipv4.mask = 0xFFFFFFFF; + return (subnet_t *)rbl_search_closest(subnet_tree, &subnet); +} + +subnet_t *lookup_subnet_ipv6(ipv6_t address) +{ + subnet_t subnet; +cp + subnet.type = SUBNET_IPV6; + subnet.net.ipv6.address = address; + memset(&subnet.net.ipv6.mask, 0xFF, 16); + return (subnet_t *)rbl_search_closest(subnet_tree, &subnet); +} + +void dump_subnet_list(void) +{ + char *netstr; + subnet_t *subnet; + rbl_t *rbl; +cp + syslog(LOG_DEBUG, _("Subnet list:")); + RBL_FOREACH(subnet_tree, rbl) + { + subnet = (subnet_t *)rbl->data; + netstr = net2str(subnet); + syslog(LOG_DEBUG, " %s owner %s", netstr, subnet->owner->name); + free(netstr); + } + syslog(LOG_DEBUG, _("End of subnet list.")); +cp +}