--- gvpe/src/vpn_tcp.C	2003/10/14 03:22:09	1.7
+++ gvpe/src/vpn_tcp.C	2004/01/17 01:18:36	1.11
@@ -1,5 +1,6 @@
 /*
     vpn_tcp.C -- handle the tcp part of the protocol.
+    Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -29,19 +30,16 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/poll.h>
 #include <sys/wait.h>
-#include <netinet/in.h>
 #include <sys/uio.h>
-#include <arpa/inet.h>
 #include <errno.h>
 #include <time.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 #include <map>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/poll.h>
+
+#include "netcompat.h"
 
 #include "vpn.h"
 
@@ -105,7 +103,8 @@
 
 void tcp_si_map::cleaner_cb (time_watcher &w)
 {
-  w.at = NOW + 600;
+  w.start (NOW + 600);
+
   tstamp to = NOW - ::conf.keepalive - 30 - 60;
 
   for (iterator i = begin (); i != end(); )
@@ -121,7 +120,7 @@
 void
 vpn::tcpv4_ev (io_watcher &w, short revents)
 {
-  if (revents & (POLLIN | POLLERR))
+  if (revents & EVENT_READ)
     {
       struct sockaddr_in sa;
       socklen_t sa_len = sizeof (sa);
@@ -203,23 +202,23 @@
 {
   last_activity = NOW;
 
-  if (revents & (POLLERR | POLLHUP))
-    {
-      error ();
-      return;
-    }
-
-  if (revents & POLLOUT)
+  if (revents & EVENT_WRITE)
     {
       if (state == CONNECTING)
         {
           state = ESTABLISHED;
-          set (POLLIN);
+          set (EVENT_READ);
 #if ENABLE_HTTP_PROXY
           if (::conf.proxy_host && ::conf.proxy_port)
             {
               state = CONNECTING_PROXY;
-              write (fd, proxy_req, proxy_req_len);
+
+              if (write (fd, proxy_req, proxy_req_len) == 0)
+                {
+                  error ();
+                  return;
+                }
+
               free (proxy_req); proxy_req = 0;
             }
 #endif
@@ -232,17 +231,17 @@
                 {
                   delete w_pkt; w_pkt = 0;
 
-                  set (POLLIN);
+                  set (EVENT_READ);
                 }
             }
           else
-            set (POLLIN);
+            set (EVENT_READ);
         }
       else
-        set (POLLIN);
+        set (EVENT_READ);
     }
 
-  if (revents & POLLIN)
+  if (revents & EVENT_READ)
     {
       if (state == ESTABLISHED)
         for (;;)
@@ -286,6 +285,7 @@
             else if (len < 0 && (errno == EINTR || errno == EAGAIN))
               break;
 
+            // len == 0 <-> EOF
             error ();
             break;
           }
@@ -390,7 +390,7 @@
               || errno == EINPROGRESS)
             {
               state = CONNECTING;
-              start (fd, POLLOUT);
+              start (fd, EVENT_WRITE);
             }
           else
             close (fd);
@@ -419,7 +419,7 @@
               w_pkt = new vpn_packet;
               w_pkt->set (*pkt);
 
-              set (POLLIN | POLLOUT);
+              set (EVENT_READ | EVENT_WRITE);
             }
         }
     }
@@ -465,7 +465,7 @@
     {
       active = false;
       state = ESTABLISHED;
-      start (fd, POLLIN);
+      start (fd, EVENT_READ);
     }
 }