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];
}
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;
// 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;
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];
}
// 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;
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];
}
// 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;
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, '#');
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)
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);
}
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);
}