j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Put Subnet weight in a separate environment variable.

Browse source 
Commit 5674bba5c5 introduced weighted Subnets,
but the weight was included in the SUBNET variable passed to subnet-up/down
scripts. This makes it harder to use in those scripts. The weight is now
stripped from the SUBNET variable and put in the WEIGHT variabel.
This commit is contained in:
Guus Sliepen 2009-09-12 13:34:11 +02:00
parent a60a0a1f13
commit 052ff8b2c5
1 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/subnet.c
View file

@ -476,9 +476,12 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
void subnet_update(node_t *owner, subnet_t *subnet, bool up) { void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
avl_node_t *node; avl_node_t *node;
int i; int i;
char *envp[8]; char *envp[9] = {0};
char netstr[MAXNETSTR + 7] = "SUBNET="; char netstr[MAXNETSTR];
char *name, *address, *port; char *name, *address, *port;
char empty[] = "";
// Prepare environment variables to be passed to the script
xasprintf(&envp[0], "NETNAME=%s", netname ? : ""); xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
xasprintf(&envp[1], "DEVICE=%s", device ? : ""); xasprintf(&envp[1], "DEVICE=%s", device ? : "");
@ -487,13 +490,9 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
if(owner != myself) { if(owner != myself) {
sockaddr2str(&owner->address, &address, &port); sockaddr2str(&owner->address, &address, &port);
xasprintf(&envp[4], "REMOTEADDRESS=%s", address); // 4 and 5 are reserved for SUBNET and WEIGHT
xasprintf(&envp[5], "REMOTEPORT=%s", port); xasprintf(&envp[6], "REMOTEADDRESS=%s", address);
envp[6] = netstr; xasprintf(&envp[7], "REMOTEPORT=%s", port);
envp[7] = NULL;
} else {
envp[4] = netstr;
envp[5] = NULL;
} }
name = up ? "subnet-up" : "subnet-down"; name = up ? "subnet-up" : "subnet-down";
@ -501,22 +500,44 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
if(!subnet) { if(!subnet) {
for(node = owner->subnet_tree->head; node; node = node->next) { for(node = owner->subnet_tree->head; node; node = node->next) {
subnet = node->data; subnet = node->data;
if(!net2str(netstr + 7, sizeof netstr - 7, subnet)) if(!net2str(netstr, sizeof netstr, subnet))
continue; continue;
// Strip the weight from the subnet, and put it in its own environment variable
char *weight = strchr(netstr + 7, '#');
if(weight)
*weight++ = 0;
else
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);
execute_script(name, envp); execute_script(name, envp);
} }
} else { } else {
if(net2str(netstr + 7, sizeof netstr - 7, subnet)) if(net2str(netstr + 7, sizeof netstr - 7, subnet)) {
// Strip the weight from the subnet, and put it in its own environment variable
char *weight = strchr(netstr + 7, '#');
if(weight)
*weight++ = 0;
else
weight = empty;
// Prepare the SUBNET and WEIGHT variables
xasprintf(&envp[4], "SUBNET=%s", netstr);
xasprintf(&envp[5], "WEIGHT=%s", weight);
execute_script(name, envp); execute_script(name, envp);
}
} }
for(i = 0; i < (owner != myself ? 6 : 4); i++) for(i = 0; envp[i] && i < 9; i++)
free(envp[i]); free(envp[i]);
if(owner != myself) {
free(address);
free(port);
}
} }
void dump_subnets(void) void dump_subnets(void)