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

Check for writability when waiting for a socket to finish connecting.

Browse source 
We were checking only for readability, which is not a problem for normal
connections, since the server side of a connection will always send an ID
request. But when using a proxy, the proxy server doesn't send anything before
the client, so tinc would not see that its connection to the proxy had already
been established.
This commit is contained in:
Guus Sliepen 2013-02-06 15:12:53 +01:00
parent 1135669b3c
commit 053af97c9e
2 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/net.c
View file

@ -281,23 +281,6 @@ static void periodic_handler(void *data) {
} }
void handle_meta_connection_data(connection_t *c) { void handle_meta_connection_data(connection_t *c) {
int result;
socklen_t len = sizeof result;
if(c->status.connecting) {
c->status.connecting = false;
getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
if(!result)
finish_connecting(c);
else {
logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(result));
terminate_connection(c, false);
return;
}
}
if (!receive_meta(c)) { if (!receive_meta(c)) {
terminate_connection(c, c->status.active); terminate_connection(c, c->status.active);
return; return;

24
src/net_socket.c
View file

@ -373,10 +373,28 @@ static void handle_meta_write(connection_t *c) {
} }
static void handle_meta_io(void *data, int flags) { static void handle_meta_io(void *data, int flags) {
connection_t *c = data;
if(c->status.connecting) {
c->status.connecting = false;
int result;
socklen_t len = sizeof result;
getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
if(!result)
finish_connecting(c);
else {
logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(result));
terminate_connection(c, false);
return;
}
}
if(flags & IO_WRITE) if(flags & IO_WRITE)
handle_meta_write(data); handle_meta_write(c);
else else
handle_meta_connection_data(data); handle_meta_connection_data(c);
} }
bool do_outgoing_connection(outgoing_t *outgoing) { bool do_outgoing_connection(outgoing_t *outgoing) {
@ -493,7 +511,7 @@ begin:
connection_add(c); connection_add(c);
io_add(&c->io, handle_meta_io, c, c->socket, IO_READ); io_add(&c->io, handle_meta_io, c, c->socket, IO_READ|IO_WRITE);
return true; return true;
} }