X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=ada811200eefdb838493a1856ac2b0d05ccf6213;hp=5fdc045ae453dfe1d2697246630a8dc620d76c65;hb=c98db1b861d62430e23f26b0da18e7b3ec875767;hpb=c2b9c06062d36bde859b630b99a08c7b7428e721 diff --git a/src/subnet.c b/src/subnet.c index 5fdc045a..ada81120 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-2002 Guus Sliepen , + 2000-2002 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,7 +17,7 @@ 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" @@ -50,8 +50,14 @@ avl_tree_t *subnet_tree; 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) @@ -63,7 +69,12 @@ cp 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) @@ -75,7 +86,12 @@ cp 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) @@ -139,7 +155,7 @@ cp 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) @@ -176,7 +192,7 @@ subnet_t *str2net(char *subnetstr) { int i, l; subnet_t *subnet; - unsigned short int x[8]; + uint16_t x[8]; cp subnet = new_subnet(); cp @@ -185,7 +201,7 @@ 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; @@ -196,7 +212,7 @@ cp &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; @@ -206,7 +222,7 @@ cp &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; @@ -216,9 +232,9 @@ cp &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; } @@ -256,7 +272,7 @@ cp 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", @@ -268,10 +284,10 @@ cp 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); } @@ -293,6 +309,7 @@ subnet_t *lookup_subnet_mac(mac_t *address) 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 @@ -305,7 +322,8 @@ subnet_t *lookup_subnet_ipv4(ipv4_t *address) 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 { @@ -318,21 +336,24 @@ cp 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) @@ -341,7 +362,8 @@ 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 { @@ -357,18 +379,18 @@ cp 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; }