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

Don't leave dead outgoing_t's in the outgoing_list.

Browse source 
If an outgoing connection cannot be made because no address is known for
it, it should be removed from the outgoing_list, otherwise it will
prevent it from being re-added later when we do know addresses for it.
This commit is contained in:
Guus Sliepen 2015-11-24 16:48:44 +01:00
parent c58eba587d
commit 9fdf4278f8
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/net_socket.c
View file

@ -604,9 +604,12 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
if(n && n->connection) { if(n && n->connection) {
logger(DEBUG_CONNECTIONS, LOG_INFO, "Already connected to %s", outgoing->name); logger(DEBUG_CONNECTIONS, LOG_INFO, "Already connected to %s", outgoing->name);
if(!n->connection->outgoing) {
n->connection->outgoing = outgoing; n->connection->outgoing = outgoing;
return; return;
} else {
goto remove;
}
} }
init_configuration(&outgoing->config_tree); init_configuration(&outgoing->config_tree);
@ -618,11 +621,16 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
outgoing->aip = outgoing->ai = get_known_addresses(n); outgoing->aip = outgoing->ai = get_known_addresses(n);
if(!outgoing->ai) { if(!outgoing->ai) {
logger(DEBUG_ALWAYS, LOG_DEBUG, "No address known for %s", outgoing->name); logger(DEBUG_ALWAYS, LOG_DEBUG, "No address known for %s", outgoing->name);
return; goto remove;
} }
} }
do_outgoing_connection(outgoing); do_outgoing_connection(outgoing);
return;
remove:
list_delete(outgoing_list, outgoing);
free(outgoing);
} }
/* /*