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

Fixed a segfault when all nodes available for autoconnect has been exhausted

Browse source 
In cases when tinc has all available nodes in outgoing connections and
can not establish those connection due to network outage periodic_handler()
would crash since tmp_node_tree->count is 0.

This commit adds also new flag node->status.has_cfg_address to prevent
update_udp_address() from removing this flag.

Fixed node_status_t->unused - 13 + 19 = 32
This commit is contained in:
thorkill 2015-07-23 20:45:37 +02:00
parent f12d4a3e6d
commit 618ddadeab
3 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/net.c
View file

@ -215,7 +215,7 @@ static void periodic_handler(void *data) {
for splay_each(node_t, n, node_tree) {
if(!n->status.has_known_address || n->connection)
if ((!n->status.has_known_address && !n->status.has_cfg_address) || n->connection)
continue;
bool found = false;
@ -230,6 +230,7 @@ static void periodic_handler(void *data) {
splay_insert(tmp_node_tree, n);
}
if (tmp_node_tree->count) {
int r = rand() % tmp_node_tree->count;
int i = 0;
@ -238,13 +239,15 @@ static void periodic_handler(void *data) {
if(i++ != r)
continue;
logger(DEBUG_CONNECTIONS, LOG_INFO, "Autoconnecting to %s", n->name);
outgoing_t *outgoing = xzalloc(sizeof *outgoing);
outgoing->name = xstrdup(n->name);
list_insert_tail(outgoing_list, outgoing);
setup_outgoing_connection(outgoing);
}
} else {
logger(DEBUG_ALWAYS, LOG_INFO, "No more nodes available for autoconnect!");
}
splay_delete_tree(tmp_node_tree);
} else if(nc > 3) {
/* Too many active connections, try to remove one.

4
src/net_setup.c
View file

@ -394,8 +394,10 @@ void load_all_nodes(void) {
}
}
if (lookup_config(config_tree, "Address"))
if (lookup_config(config_tree, "Address")) {
n->status.has_known_address = true;
n->status.has_cfg_address = true;
}
exit_configuration(&config_tree);
}

5
src/node.h
View file

@ -40,8 +40,9 @@ typedef struct node_status_t {
unsigned int send_locally:1; /* 1 if the next UDP packet should be sent on the local network */
unsigned int udppacket:1; /* 1 if the most recently received packet was UDP */
unsigned int validkey_in; /* 1 if we have sent a valid key to him */
unsigned int has_known_address; /* 1 if this node has Address in node's config */
unsigned int unused:21;
unsigned int has_known_address; /* 1 if this node has UDP Address */
unsigned int has_cfg_address; /* 1 if this node has Address in node's config */
unsigned int unused:19;
} node_status_t;
typedef struct node_t {