projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix support for tunemu on iOS devices.
[tinc]
/
src
/
graph.c
diff --git
a/src/graph.c
b/src/graph.c
index
b3a2c25
..
73db3b2
100644
(file)
--- a/
src/graph.c
+++ b/
src/graph.c
@@
-44,12
+44,12
@@
#include "system.h"
#include "system.h"
-#include "splay_tree.h"
#include "config.h"
#include "connection.h"
#include "device.h"
#include "edge.h"
#include "graph.h"
#include "config.h"
#include "connection.h"
#include "device.h"
#include "edge.h"
#include "graph.h"
+#include "list.h"
#include "logger.h"
#include "netutl.h"
#include "node.h"
#include "logger.h"
#include "netutl.h"
#include "node.h"
@@
-66,33
+66,21
@@
*/
static void mst_kruskal(void) {
*/
static void mst_kruskal(void) {
- splay_node_t *node, *next;
- edge_t *e;
- node_t *n;
- connection_t *c;
-
/* Clear MST status on connections */
/* Clear MST status on connections */
- for(node = connection_tree->head; node; node = node->next) {
- c = node->data;
+ for list_each(connection_t, c, connection_list)
c->status.mst = false;
c->status.mst = false;
- }
logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Running Kruskal's algorithm:");
/* Clear visited status on nodes */
logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Running Kruskal's algorithm:");
/* Clear visited status on nodes */
- for(node = node_tree->head; node; node = node->next) {
- n = node->data;
+ for splay_each(node_t, n, node_tree)
n->status.visited = false;
n->status.visited = false;
- }
/* Add safe edges */
/* Add safe edges */
- for(node = edge_weight_tree->head; node; node = next) {
- next = node->next;
- e = node->data;
-
+ for splay_each(edge_t, e, edge_weight_tree) {
if(!e->reverse || (e->from->status.visited && e->to->status.visited))
continue;
if(!e->reverse || (e->from->status.visited && e->to->status.visited))
continue;
@@
-115,19
+103,11
@@
static void mst_kruskal(void) {
*/
static void sssp_bfs(void) {
*/
static void sssp_bfs(void) {
- splay_node_t *node, *to;
- edge_t *e;
- node_t *n;
- list_t *todo_list;
- list_node_t *from, *todonext;
- bool indirect;
-
- todo_list = list_alloc(NULL);
+ list_t *todo_list = list_alloc(NULL);
/* Clear visited status on nodes */
/* Clear visited status on nodes */
- for(node = node_tree->head; node; node = node->next) {
- n = node->data;
+ for splay_each(node_t, n, node_tree) {
n->status.visited = false;
n->status.indirect = true;
n->distance = -1;
n->status.visited = false;
n->status.indirect = true;
n->distance = -1;
@@
-145,14
+125,13
@@
static void sssp_bfs(void) {
/* Loop while todo_list is filled */
/* Loop while todo_list is filled */
- for(from = todo_list->head; from; from = todonext) { /* "from" is the node from which we start */
- n = from->data;
+ for list_each(node_t, n, todo_list) { /* "n" is the node from which we start */
+ logger(DEBUG_SCARY_THINGS, LOG_DEBUG, " Examining edges from %s", n->name);
+
if(n->distance < 0)
abort();
if(n->distance < 0)
abort();
- for(to = n->edge_tree->head; to; to = to->next) { /* "to" is the edge connected to "from" */
- e = to->data;
-
+ for splay_each(edge_t, e, n->edge_tree) { /* "e" is the edge connected to "from" */
if(!e->reverse)
continue;
if(!e->reverse)
continue;
@@
-173,7
+152,7
@@
static void sssp_bfs(void) {
of nodes behind it.
*/
of nodes behind it.
*/
- indirect = n->status.indirect || e->options & OPTION_INDIRECT;
+
bool
indirect = n->status.indirect || e->options & OPTION_INDIRECT;
if(e->to->status.visited
&& (!e->to->status.indirect || indirect)
if(e->to->status.visited
&& (!e->to->status.indirect || indirect)
@@
-188,35
+167,26
@@
static void sssp_bfs(void) {
e->to->options = e->options;
e->to->distance = n->distance + 1;
e->to->options = e->options;
e->to->distance = n->distance + 1;
- if(
e->to->address.sa.sa_family == AF_UNSPEC && e->address.sa.sa_family != AF_UNKNOWN
)
+ if(
!e->to->status.reachable || (e->to->address.sa.sa_family == AF_UNSPEC && e->address.sa.sa_family != AF_UNKNOWN)
)
update_node_udp(e->to, &e->address);
list_insert_tail(todo_list, e->to);
}
update_node_udp(e->to, &e->address);
list_insert_tail(todo_list, e->to);
}
- todonext = from->next;
- list_delete_node(todo_list,
from
);
+ next = node->next; /* Because the list_insert_tail() above could have added something extra for us! */
+ list_delete_node(todo_list,
node
);
}
list_free(todo_list);
}
static void check_reachability(void) {
}
list_free(todo_list);
}
static void check_reachability(void) {
- splay_node_t *node, *next;
- node_t *n;
- char *name;
- char *address, *port;
- char *envp[7];
- int i;
-
/* Check reachability status. */
/* Check reachability status. */
- for(node = node_tree->head; node; node = next) {
- next = node->next;
- n = node->data;
-
+ for splay_each(node_t, n, node_tree) {
if(n->status.visited != n->status.reachable) {
n->status.reachable = !n->status.reachable;
if(n->status.visited != n->status.reachable) {
n->status.reachable = !n->status.reachable;
+ n->last_state_change = time(NULL);
if(n->status.reachable) {
logger(DEBUG_TRAFFIC, LOG_DEBUG, "Node %s (%s) became reachable",
if(n->status.reachable) {
logger(DEBUG_TRAFFIC, LOG_DEBUG, "Node %s (%s) became reachable",
@@
-226,17
+196,29
@@
static void check_reachability(void) {
n->name, n->hostname);
}
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;
/* 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;
+ }
n->last_req_key = 0;
n->last_req_key = 0;
+ n->status.udp_confirmed = false;
n->maxmtu = MTU;
n->minmtu = 0;
n->mtuprobes = 0;
n->maxmtu = MTU;
n->minmtu = 0;
n->mtuprobes = 0;
- if(timeout_initialized(&n->mtuevent))
- event_del(&n->mtuevent);
+ timeout_del(&n->mtutimeout);
+
+ char *name;
+ char *address;
+ char *port;
+ char *envp[7];
xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
xasprintf(&envp[1], "DEVICE=%s", device ? : "");
xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
xasprintf(&envp[1], "DEVICE=%s", device ? : "");
@@
-249,24
+231,30
@@
static void check_reachability(void) {
execute_script(n->status.reachable ? "host-up" : "host-down", envp);
execute_script(n->status.reachable ? "host-up" : "host-down", envp);
- xasprintf(&name,
- n->status.reachable ? "hosts/%s-up" : "hosts/%s-down",
- n->name);
+ xasprintf(&name, n->status.reachable ? "hosts/%s-up" : "hosts/%s-down", n->name);
execute_script(name, envp);
free(name);
free(address);
free(port);
execute_script(name, envp);
free(name);
free(address);
free(port);
- for(i = 0; i < 6; i++)
+ for(i
nt i
= 0; i < 6; i++)
free(envp[i]);
subnet_update(n, NULL, n->status.reachable);
free(envp[i]);
subnet_update(n, NULL, n->status.reachable);
- if(!n->status.reachable)
+ if(!n->status.reachable)
{
update_node_udp(n, NULL);
update_node_udp(n, NULL);
- else if(n->connection)
- send_ans_key(n);
+ 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);
+ }
+ }
}
}
}
}
}
}