--- gvpe/src/vpn_tcp.C	2003/04/07 01:28:56	1.5
+++ gvpe/src/vpn_tcp.C	2005/07/09 02:43:19	1.15
@@ -1,7 +1,10 @@
 /*
     vpn_tcp.C -- handle the tcp part of the protocol.
+    Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
  
-    This program is free software; you can redistribute it and/or modify
+    This file is part of GVPE.
+
+    GVPE is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
@@ -12,8 +15,8 @@
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    along with gvpe; if not, write to the Free Software
+    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "config.h"
@@ -29,19 +32,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"
 
@@ -63,10 +63,9 @@
   void cleaner_cb (time_watcher &w); time_watcher cleaner;
 
   tcp_si_map ()
-    : cleaner(this, &tcp_si_map::cleaner_cb)
-    {
-      cleaner.start (0);
-    }
+  : cleaner(this, &tcp_si_map::cleaner_cb)
+  { }
+
 } tcp_si;
 
 struct tcp_connection : io_watcher {
@@ -95,9 +94,9 @@
   void error (); // abort conenction && cleanup
 
   operator tcp_si_map::value_type()
-    {
-      return tcp_si_map::value_type (&si, this);
-    }
+  {
+    return tcp_si_map::value_type (&si, this);
+  }
 
   tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
   ~tcp_connection ();
@@ -105,7 +104,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 +121,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);
@@ -136,6 +136,7 @@
           slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
 
           fcntl (fd, F_SETFL, O_NONBLOCK);
+          fcntl (fd, F_SETFD, FD_CLOEXEC);
 
           tcp_connection *i = new tcp_connection (fd, si, *this);
           tcp_si.insert (*i);
@@ -171,9 +172,10 @@
       u16 plen = htons (w_pkt->len);
 
       iovec vec[2];
-      vec[0].iov_base = ((u8 *)&plen) + w_ofs;
+      //TODO: char* is the right type? hardly...
+      vec[0].iov_base = (char *)((u8 *)&plen) + w_ofs;
       vec[0].iov_len = 2 - w_ofs;
-      vec[1].iov_base = &((*w_pkt)[0]);
+      vec[1].iov_base = (char *)&((*w_pkt)[0]);
       vec[1].iov_len = w_len - 2;
 
       len = writev (fd, vec, 2);
@@ -202,23 +204,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
@@ -231,17 +233,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 (;;)
@@ -285,6 +287,7 @@
             else if (len < 0 && (errno == EINTR || errno == EAGAIN))
               break;
 
+            // len == 0 <-> EOF
             error ();
             break;
           }
@@ -322,7 +325,7 @@
 
           if (i < 12)
             {
-              slog (L_ERR, _("%s: unable to do proxy-forwarding, short response"),
+              slog (L_ERR, _("(%s): unable to do proxy-forwarding, short response"),
                     (const char *)si);
               error ();
             }
@@ -330,7 +333,7 @@
                    || r[5] != '1' // http-major
                    || r[9] != '2') // response
             {
-              slog (L_ERR, _("%s: malformed or unexpected proxy response (%.12s)"),
+              slog (L_ERR, _("(%s): malformed or unexpected proxy response (%.12s)"),
                     (const char *)si, r);
               error ();
             }
@@ -389,7 +392,7 @@
               || errno == EINPROGRESS)
             {
               state = CONNECTING;
-              start (fd, POLLOUT);
+              start (fd, EVENT_WRITE);
             }
           else
             close (fd);
@@ -403,7 +406,9 @@
         {
           // how this maps to the underlying tcp packets we don't know
           // and we don't care. at least we tried ;)
+#if defined(SOL_IP) && defined(IP_TOS)
           setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
+#endif
 
           w_pkt = pkt;
           w_ofs = 0;
@@ -416,7 +421,7 @@
               w_pkt = new vpn_packet;
               w_pkt->set (*pkt);
 
-              set (POLLIN | POLLOUT);
+              set (EVENT_READ | EVENT_WRITE);
             }
         }
     }
@@ -445,6 +450,9 @@
 tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
 : v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev)
 {
+  if (!tcp_si.cleaner.active)
+    tcp_si.cleaner.start (0);
+
   last_activity = NOW;
   r_pkt = 0;
   w_pkt = 0;
@@ -462,7 +470,7 @@
     {
       active = false;
       state = ESTABLISHED;
-      start (fd, POLLIN);
+      start (fd, EVENT_READ);
     }
 }