X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=36d1627ed3425d115371345b15f316c8291326b1;hp=4541594d605304aa634b304f31a060ac5ebc15e8;hb=fcbe29bc4cc67530581a36cf1a3a1445c741b8e5;hpb=de223b51b94c58d1674f1ef56e9d485ff48d366d diff --git a/src/subnet.c b/src/subnet.c index 4541594d..36d1627e 100644 --- a/src/subnet.c +++ b/src/subnet.c @@ -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.48 2003/07/24 12:08:16 guus Exp $ + $Id: subnet.c,v 1.1.2.49 2003/07/30 11:50:45 guus Exp $ */ #include "system.h" @@ -305,15 +305,14 @@ subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) 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(); + subnet.type = SUBNET_MAC; + subnet.net.mac.address = *address; + subnet.owner = NULL; + p = (subnet_t *) avl_search(subnet_tree, &subnet); return p; @@ -321,16 +320,15 @@ subnet_t *lookup_subnet_mac(const mac_t *address) 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 */ @@ -360,16 +358,15 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address) 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 */