X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgraph.c;h=233cf5442a4e000e612a8a64f6b384de65ffeaf4;hb=f38b9f67f87c364c50fd21d48aa85f946675b4e2;hp=b7ace49756efe0c51df5f025e301362d6a3fd63e;hpb=1ffa0e102dc0d036241ee1ea2a13df42526c0872;p=meshlink

diff --git a/src/graph.c b/src/graph.c
index b7ace497..233cf544 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,7 +1,6 @@
 /*
     graph.c -- graph algorithms
-    Copyright (C) 2001-2013 Guus Sliepen <guus@tinc-vpn.org>,
-                  2001-2005 Ivo Timmermans
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -49,11 +48,9 @@
 #include "graph.h"
 #include "list.h"
 #include "logger.h"
-#include "names.h"
 #include "netutl.h"
 #include "node.h"
 #include "protocol.h"
-#include "script.h"
 #include "utils.h"
 #include "xalloc.h"
 #include "graph.h"
@@ -211,16 +208,11 @@ static void check_reachability(void) {
 					   n->name, n->hostname);
 			}
 
-			if(experimental && OPTION_VERSION(n->options) >= 2)
-				n->status.sptps = true;
-
 			/* TODO: only clear status.validkey if node is unreachable? */
 
 			n->status.validkey = false;
-			if(n->status.sptps) {
-				sptps_stop(&n->sptps);
-				n->status.waitingforkey = false;
-			}
+			sptps_stop(&n->sptps);
+			n->status.waitingforkey = false;
 			n->last_req_key = 0;
 
 			n->status.udp_confirmed = false;
@@ -230,41 +222,15 @@ static void check_reachability(void) {
 
 			timeout_del(&n->mtutimeout);
 
-			char *name;
-			char *address;
-			char *port;
-			char *envp[8] = {NULL};
-
-			xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
-			xasprintf(&envp[3], "NODE=%s", n->name);
-			sockaddr2str(&n->address, &address, &port);
-			xasprintf(&envp[4], "REMOTEADDRESS=%s", address);
-			xasprintf(&envp[5], "REMOTEPORT=%s", port);
-			xasprintf(&envp[6], "NAME=%s", myself->name);
-
-			execute_script(n->status.reachable ? "host-up" : "host-down", envp);
-
-			xasprintf(&name, n->status.reachable ? "hosts/%s-up" : "hosts/%s-down", n->name);
-			execute_script(name, envp);
-
-			free(name);
-			free(address);
-			free(port);
-
-			for(int i = 0; i < 7; i++)
-				free(envp[i]);
+			//TODO: callback to application to inform of this node going up/down
 
 			if(!n->status.reachable) {
 				update_node_udp(n, NULL);
 				memset(&n->status, 0, sizeof n->status);
 				n->options = 0;
 			} else if(n->connection) {
-				if(n->status.sptps) {
-					if(n->connection->outgoing)
-						send_req_key(n);
-				} else {
-					send_ans_key(n);
-				}
+				if(n->connection->outgoing)
+					send_req_key(n);
 			}
 		}
 	}