X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=43a7ad218f10bb60b5c5bf38a442e0424fe8d85a;hp=f8a34614963711ae8ab17028900b1099fac4e7a9;hb=985d19caf20058db3c764f0f6fbeafa8bcc59fcc;hpb=9f4390f5708fa31eb0afa3f5cf45eac80d7b458c diff --git a/src/subnet.c b/src/subnet.c index f8a34614..43a7ad21 100644 --- a/src/subnet.c +++ b/src/subnet.c @@ -1,6 +1,6 @@ /* subnet.c -- handle subnet lookups and lists - Copyright (C) 2000-2013 Guus Sliepen , + Copyright (C) 2000-2014 Guus Sliepen , 2000-2005 Ivo Timmermans This program is free software; you can redistribute it and/or modify @@ -351,7 +351,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) { switch (subnet->type) { case SUBNET_MAC: - snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx#%d", + snprintf(netstr, len, "%x:%x:%x:%x:%x:%x#%d", subnet->net.mac.address.x[0], subnet->net.mac.address.x[1], subnet->net.mac.address.x[2], @@ -362,7 +362,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) { break; case SUBNET_IPV4: - snprintf(netstr, len, "%hu.%hu.%hu.%hu/%d#%d", + snprintf(netstr, len, "%u.%u.%u.%u/%d#%d", subnet->net.ipv4.address.x[0], subnet->net.ipv4.address.x[1], subnet->net.ipv4.address.x[2], @@ -372,7 +372,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) { break; case SUBNET_IPV6: - snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d#%d", + snprintf(netstr, len, "%x:%x:%x:%x:%x:%x:%x:%x/%d#%d", ntohs(subnet->net.ipv6.address.x[0]), ntohs(subnet->net.ipv6.address.x[1]), ntohs(subnet->net.ipv6.address.x[2]), @@ -413,7 +413,7 @@ subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) { continue; if(owner && cache_mac_subnet[i] && cache_mac_subnet[i]->owner != owner) continue; - if(!memcmp(address, &cache_mac_address[i], sizeof *address)) + if(!memcmp(address, &cache_mac_address[i], sizeof(*address))) return cache_mac_subnet[i]; } @@ -425,7 +425,7 @@ subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) { if(!p || p->type != SUBNET_MAC) continue; - if(!memcmp(address, &p->net.mac.address, sizeof *address)) { + if(!memcmp(address, &p->net.mac.address, sizeof(*address))) { r = p; if(p->owner->status.reachable) break; @@ -435,7 +435,7 @@ subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) { // Cache the result cache_mac_slot = !cache_mac_slot; - memcpy(&cache_mac_address[cache_mac_slot], address, sizeof *address); + memcpy(&cache_mac_address[cache_mac_slot], address, sizeof(*address)); cache_mac_subnet[cache_mac_slot] = r; cache_mac_valid[cache_mac_slot] = true; @@ -452,7 +452,7 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address) { for(i = 0; i < 2; i++) { if(!cache_ipv4_valid[i]) continue; - if(!memcmp(address, &cache_ipv4_address[i], sizeof *address)) + if(!memcmp(address, &cache_ipv4_address[i], sizeof(*address))) return cache_ipv4_subnet[i]; } @@ -474,7 +474,7 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address) { // Cache the result cache_ipv4_slot = !cache_ipv4_slot; - memcpy(&cache_ipv4_address[cache_ipv4_slot], address, sizeof *address); + memcpy(&cache_ipv4_address[cache_ipv4_slot], address, sizeof(*address)); cache_ipv4_subnet[cache_ipv4_slot] = r; cache_ipv4_valid[cache_ipv4_slot] = true; @@ -491,7 +491,7 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address) { for(i = 0; i < 2; i++) { if(!cache_ipv6_valid[i]) continue; - if(!memcmp(address, &cache_ipv6_address[i], sizeof *address)) + if(!memcmp(address, &cache_ipv6_address[i], sizeof(*address))) return cache_ipv6_subnet[i]; } @@ -513,7 +513,7 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address) { // Cache the result cache_ipv6_slot = !cache_ipv6_slot; - memcpy(&cache_ipv6_address[cache_ipv6_slot], address, sizeof *address); + memcpy(&cache_ipv6_address[cache_ipv6_slot], address, sizeof(*address)); cache_ipv6_subnet[cache_ipv6_slot] = r; cache_ipv6_valid[cache_ipv6_slot] = true; @@ -534,24 +534,23 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) { xasprintf(&envp[1], "DEVICE=%s", device ? : ""); xasprintf(&envp[2], "INTERFACE=%s", iface ? : ""); xasprintf(&envp[3], "NODE=%s", owner->name); + xasprintf(&envp[4], "NAME=%s", myself->name); if(owner != myself) { sockaddr2str(&owner->address, &address, &port); - // 4 and 5 are reserved for SUBNET and WEIGHT - xasprintf(&envp[6], "REMOTEADDRESS=%s", address); - xasprintf(&envp[7], "REMOTEPORT=%s", port); + // 5 and 6 are reserved for SUBNET and WEIGHT + xasprintf(&envp[7], "REMOTEADDRESS=%s", address); + xasprintf(&envp[8], "REMOTEPORT=%s", port); free(port); free(address); } - xasprintf(&envp[8], "NAME=%s", myself->name); - name = up ? "subnet-up" : "subnet-down"; if(!subnet) { for(node = owner->subnet_tree->head; node; node = node->next) { subnet = node->data; - if(!net2str(netstr, sizeof netstr, subnet)) + if(!net2str(netstr, sizeof(netstr), subnet)) continue; // Strip the weight from the subnet, and put it in its own environment variable char *weight = strchr(netstr, '#'); @@ -561,17 +560,17 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) { weight = empty; // Prepare the SUBNET and WEIGHT variables - if(envp[4]) - free(envp[4]); if(envp[5]) free(envp[5]); - xasprintf(&envp[4], "SUBNET=%s", netstr); - xasprintf(&envp[5], "WEIGHT=%s", weight); + if(envp[6]) + free(envp[6]); + xasprintf(&envp[5], "SUBNET=%s", netstr); + xasprintf(&envp[6], "WEIGHT=%s", weight); execute_script(name, envp); } } else { - if(net2str(netstr, sizeof netstr, subnet)) { + if(net2str(netstr, sizeof(netstr), subnet)) { // Strip the weight from the subnet, and put it in its own environment variable char *weight = strchr(netstr, '#'); if(weight) @@ -580,8 +579,8 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) { weight = empty; // Prepare the SUBNET and WEIGHT variables - xasprintf(&envp[4], "SUBNET=%s", netstr); - xasprintf(&envp[5], "WEIGHT=%s", weight); + xasprintf(&envp[5], "SUBNET=%s", netstr); + xasprintf(&envp[6], "WEIGHT=%s", weight); execute_script(name, envp); } @@ -600,7 +599,7 @@ void dump_subnets(void) { for(node = subnet_tree->head; node; node = node->next) { subnet = node->data; - if(!net2str(netstr, sizeof netstr, subnet)) + if(!net2str(netstr, sizeof(netstr), subnet)) continue; logger(LOG_DEBUG, " %s owner %s", netstr, subnet->owner->name); }