From cbdba8cba32a2b31a8a5538fc9edee5fb263b816 Mon Sep 17 00:00:00 2001
From: angt <angt@users.noreply.github.com>
Date: Thu, 3 Dec 2015 18:49:18 +0100
Subject: [PATCH] Dont try to poll for write, use a timeout

---
 src/main.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main.c b/src/main.c
index 8dc227e..383c98c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -862,9 +862,8 @@ int main (int argc, char **argv)
             break;
         }
 
-        fd_set rfds, wfds;
+        fd_set rfds;
         FD_ZERO(&rfds);
-        FD_ZERO(&wfds);
 
         int stop_loop = 0;
 
@@ -886,16 +885,17 @@ int main (int argc, char **argv)
 
             FD_SET(sock.fd, &rfds);
 
-            if _0_(select(sock.fd+1, &rfds, &wfds, NULL, NULL)==-1) {
+            struct timeval timeout = {
+                .tv_usec = 1000,
+            };
+
+            if _0_(select(sock.fd+1, &rfds, NULL, NULL, &timeout)==-1) {
                 if (errno==EINTR)
                     continue;
                 perror("select");
                 return 1;
             }
 
-            FD_CLR(sock.fd, &wfds);
-            FD_CLR(tun.fd, &wfds);
-
          // TODO
          // struct timeval now;
          // gettimeofday(&now, NULL);
@@ -969,11 +969,8 @@ int main (int argc, char **argv)
                 if (r>0) {
                     sock.write.read += r;
                 } else {
-                    if (!r) {
+                    if (!r)
                         stop_loop |= (1<<2);
-                    } else {
-                        FD_SET(sock.fd, &wfds);
-                    }
                     break;
                 }
             }
@@ -1028,7 +1025,6 @@ int main (int argc, char **argv)
                     tun.write.read += r;
                 } else {
                     gt_close |= !r;
-                    FD_SET(tun.fd, &wfds);
                     break;
                 }
             }