#include "system.h"
-#include "config.h"
#include "connection.h"
#include "device.h"
#include "edge.h"
#include "names.h"
#include "netutl.h"
#include "node.h"
-#include "process.h"
#include "protocol.h"
+#include "script.h"
#include "subnet.h"
#include "utils.h"
#include "xalloc.h"
&& (e->to->distance != n->distance + 1 || e->weight >= e->to->prevedge->weight))
continue;
+ // Only update nexthop if it doesn't increase the path length
+
+ if(!e->to->status.visited || (e->to->distance == n->distance + 1 && e->weight >= e->to->prevedge->weight))
+ e->to->nexthop = (n->nexthop == myself) ? e->to : n->nexthop;
+
e->to->status.visited = true;
e->to->status.indirect = indirect;
- e->to->nexthop = (n->nexthop == myself) ? e->to : n->nexthop;
e->to->prevedge = e;
e->to->via = indirect ? n->via : e->to;
e->to->options = e->options;
char *name;
char *address;
char *port;
- char *envp[7];
+ char *envp[8] = {NULL};
xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
xasprintf(&envp[1], "DEVICE=%s", device ? : "");
sockaddr2str(&n->address, &address, &port);
xasprintf(&envp[4], "REMOTEADDRESS=%s", address);
xasprintf(&envp[5], "REMOTEPORT=%s", port);
- envp[6] = NULL;
+ xasprintf(&envp[6], "NAME=%s", myself->name);
execute_script(n->status.reachable ? "host-up" : "host-down", envp);
free(address);
free(port);
- for(int i = 0; i < 6; i++)
+ for(int i = 0; i < 7; i++)
free(envp[i]);
subnet_update(n, NULL, n->status.reachable);