Flush output buffers in the tap reader thread on Windows.

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index cb2a6df..0ee3655 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -349,6 +349,9 @@ static void do_outgoing_pipe(connection_t *c, char *command) {
 }
 
 static void handle_meta_write(connection_t *c) {
+       if(c->outbuf.len <= c->outbuf.offset)
+               return;
+
        ssize_t outlen = send(c->socket, c->outbuf.data + c->outbuf.offset, c->outbuf.len - c->outbuf.offset, 0);
        if(outlen <= 0) {
                if(!errno || errno == EPIPE) {
@@ -377,7 +380,7 @@ static void handle_meta_io(void *data, int flags) {
 
                int result;
                socklen_t len = sizeof result;
-               getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
+               getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
 
                if(!result)
                        finish_connecting(c);