projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check for writability when waiting for a socket to finish connecting.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
9799fea
..
e5ffc4f
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-134,7
+134,7
@@
static int build_fdset(fd_set *readset, fd_set *writeset) {
purge();
} else {
FD_SET(c->socket, readset);
purge();
} else {
FD_SET(c->socket, readset);
- if(c->outbuflen > 0)
+ if(c->outbuflen > 0
|| c->status.connecting
)
FD_SET(c->socket, writeset);
if(c->socket > max)
max = c->socket;
FD_SET(c->socket, writeset);
if(c->socket > max)
max = c->socket;
@@
-308,7
+308,7
@@
static void check_network_activity(fd_set * readset, fd_set * writeset) {
if(c->status.remove)
continue;
if(c->status.remove)
continue;
- if(FD_ISSET(c->socket,
read
set)) {
+ if(FD_ISSET(c->socket,
write
set)) {
if(c->status.connecting) {
c->status.connecting = false;
getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
if(c->status.connecting) {
c->status.connecting = false;
getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
@@
-325,14
+325,14
@@
static void check_network_activity(fd_set * readset, fd_set * writeset) {
}
}
}
}
- if(!
receive
_meta(c)) {
+ if(!
flush
_meta(c)) {
terminate_connection(c, c->status.active);
continue;
}
}
terminate_connection(c, c->status.active);
continue;
}
}
- if(FD_ISSET(c->socket,
write
set)) {
- if(!
flush
_meta(c)) {
+ if(FD_ISSET(c->socket,
read
set)) {
+ if(!
receive
_meta(c)) {
terminate_connection(c, c->status.active);
continue;
}
terminate_connection(c, c->status.active);
continue;
}