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

Merged with guus/1.1

Browse source
This commit is contained in:
thorkill 2015-11-24 17:01:11 +01:00
commit 2ec9f1124d
13 changed files with 323 additions and 7 deletions
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) {
logger(DEBUG_CONNECTIONS, LOG_INFO, "Already connected to %s", outgoing->name);
n->connection->outgoing = outgoing;
return;
if(!n->connection->outgoing) {
n->connection->outgoing = outgoing;
return;
} else {
goto remove;
}
}
if (!outgoing->config_tree) {
@ -620,11 +623,16 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
outgoing->aip = outgoing->ai = get_known_addresses(n);
if(!outgoing->ai) {
logger(DEBUG_ALWAYS, LOG_DEBUG, "No address known for %s", outgoing->name);
return;
goto remove;
}
}
do_outgoing_connection(outgoing);
return;
remove:
list_delete(outgoing_list, outgoing);
free(outgoing);
}
/*