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

Fix retrying outgoing connections.

Browse source
This commit is contained in:
Guus Sliepen 2007-05-19 13:34:32 +00:00
parent ce976717ea
commit bc0a24ec81
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/connection.h
View file

@ -41,7 +41,7 @@ typedef union connection_status_t {
int connecting:1; /* 1 if we are waiting for a non-blocking connect() to finish */ int connecting:1; /* 1 if we are waiting for a non-blocking connect() to finish */
int termreq:1; /* the termination of this connection was requested */ int termreq:1; /* the termination of this connection was requested */
int remove_unused:1; /* Set to 1 if you want this connection removed */ int remove_unused:1; /* Set to 1 if you want this connection removed */
int timeout:1; /* 1 if gotten timeout */ int timeout_unused:1; /* 1 if gotten timeout */
int encryptout:1; /* 1 if we can encrypt outgoing traffic */ int encryptout:1; /* 1 if we can encrypt outgoing traffic */
int decryptin:1; /* 1 if we have to decrypt incoming traffic */ int decryptin:1; /* 1 if we have to decrypt incoming traffic */
int mst:1; /* 1 if this connection is part of a minimum spanning tree */ int mst:1; /* 1 if this connection is part of a minimum spanning tree */

17
src/net.c
View file

@ -154,12 +154,10 @@ void terminate_connection(connection_t *c, bool report) {
/* Check if this was our outgoing connection */ /* Check if this was our outgoing connection */
if(c->outgoing) { if(c->outgoing)
retry_outgoing(c->outgoing); retry_outgoing(c->outgoing);
c->outgoing = NULL;
} else { connection_del(c);
connection_del(c);
}
} }
/* /*
@ -186,20 +184,20 @@ static void timeout_handler(int fd, short events, void *event) {
if(c->status.pinged) { if(c->status.pinged) {
ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING in %ld seconds"), ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING in %ld seconds"),
c->name, c->hostname, now - c->last_ping_time); c->name, c->hostname, now - c->last_ping_time);
c->status.timeout = true;
terminate_connection(c, true); terminate_connection(c, true);
continue; continue;
} else if(c->last_ping_time + pinginterval < now) { } else if(c->last_ping_time + pinginterval < now) {
send_ping(c); send_ping(c);
} }
} else { } else {
ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
c->name, c->hostname);
if(c->status.connecting) { if(c->status.connecting) {
ifdebug(CONNECTIONS)
logger(LOG_WARNING, _("Timeout while connecting to %s (%s)"), c->name, c->hostname);
c->status.connecting = false; c->status.connecting = false;
closesocket(c->socket); closesocket(c->socket);
do_outgoing_connection(c); do_outgoing_connection(c);
} else { } else {
ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"), c->name, c->hostname);
terminate_connection(c, false); terminate_connection(c, false);
continue; continue;
} }
@ -216,6 +214,8 @@ void handle_meta_connection_data(int fd, short events, void *data) {
socklen_t len = sizeof(result); socklen_t len = sizeof(result);
if(c->status.connecting) { if(c->status.connecting) {
c->status.connecting = false;
getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len); getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
if(!result) if(!result)
@ -224,7 +224,6 @@ void handle_meta_connection_data(int fd, short events, void *data) {
ifdebug(CONNECTIONS) logger(LOG_DEBUG, ifdebug(CONNECTIONS) logger(LOG_DEBUG,
_("Error while connecting to %s (%s): %s"), _("Error while connecting to %s (%s): %s"),
c->name, c->hostname, strerror(result)); c->name, c->hostname, strerror(result));
c->status.connecting = false;
closesocket(c->socket); closesocket(c->socket);
do_outgoing_connection(c); do_outgoing_connection(c);
return; return;

4
src/net_socket.c
View file

@ -231,7 +231,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
} }
static void retry_outgoing_handler(int fd, short events, void *data) { static void retry_outgoing_handler(int fd, short events, void *data) {
do_outgoing_connection(data); setup_outgoing_connection(data);
} }
void retry_outgoing(outgoing_t *outgoing) { void retry_outgoing(outgoing_t *outgoing) {
@ -275,6 +275,8 @@ begin:
ifdebug(CONNECTIONS) logger(LOG_ERR, _("Could not set up a meta connection to %s"), ifdebug(CONNECTIONS) logger(LOG_ERR, _("Could not set up a meta connection to %s"),
c->name); c->name);
retry_outgoing(c->outgoing); retry_outgoing(c->outgoing);
c->outgoing = NULL;
connection_del(c);
return; return;
} }