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

Revert "Working on fix "stuck" outgoing connections."

Browse source 
This reverts commit 703ed7fff6.
This commit is contained in:
thorkill 2015-11-24 16:55:03 +01:00
parent 703ed7fff6
commit f58e8679e7
3 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/net.c
View file

@ -242,21 +242,11 @@ static void periodic_handler(void *data) {
logger(DEBUG_CONNECTIONS, LOG_INFO, "Autoconnecting to %s", n->name); logger(DEBUG_CONNECTIONS, LOG_INFO, "Autoconnecting to %s", n->name);
outgoing_t *outgoing = xzalloc(sizeof *outgoing); outgoing_t *outgoing = xzalloc(sizeof *outgoing);
outgoing->name = xstrdup(n->name); outgoing->name = xstrdup(n->name);
outgoing->is_alive = true;
list_insert_tail(outgoing_list, outgoing); list_insert_tail(outgoing_list, outgoing);
setup_outgoing_connection(outgoing); setup_outgoing_connection(outgoing);
} }
} else { } else {
logger(DEBUG_ALWAYS, LOG_INFO, "No more nodes available for autoconnect!"); logger(DEBUG_ALWAYS, LOG_INFO, "No more nodes available for autoconnect!");
for list_each(outgoing_t, outgoing, outgoing_list) {
/*
It looks like this connection "died" bacause of missing hostname->addr lookup.
Remove it and try again.
*/
if (!outgoing->is_alive) {
list_delete(outgoing_list, outgoing);
}
}
} }
splay_delete_tree(tmp_node_tree); splay_delete_tree(tmp_node_tree);
} else if(nc > 3) { } else if(nc > 3) {

1
src/net.h
View file

@ -123,7 +123,6 @@ typedef struct listen_socket_t {
typedef struct outgoing_t { typedef struct outgoing_t {
char *name; char *name;
bool keep_it; bool keep_it;
bool is_alive;
int timeout; int timeout;
splay_tree_t *config_tree; splay_tree_t *config_tree;
struct config_t *cfg; struct config_t *cfg;

2
src/net_socket.c
View file

@ -620,8 +620,6 @@ 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);
retry_outgoing(outgoing);
outgoing->is_alive = false;
return; return;
} }
} }