[ViewVC] Diff of: cvs/gvpe/src/vpn

Comparing gvpe/src/vpn_tcp.C (file contents):
Revision 1.9 by pcg, Wed Oct 15 00:41:59 2003 UTC vs.
Revision 1.16 by pcg, Sat Jul 9 02:49:06 2005 UTC

 /*
     vpn_tcp.C -- handle the tcp part of the protocol.
+    Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
+    This file is part of GVPE.
-    This program is free software; you can redistribute it and/or modify
+    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.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     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
+    along with gvpe; if not, write to the Free Software
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "config.h"
 #if ENABLE_TCP
 struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> {
   void cleaner_cb (time_watcher &w); time_watcher cleaner;
   tcp_si_map ()
-    : cleaner(this, &tcp_si_map::cleaner_cb)
+  : cleaner(this, &tcp_si_map::cleaner_cb)
-    {
-      cleaner.start (0);
-    }
+  { }
 } tcp_si;
 struct tcp_connection : io_watcher {
   tstamp last_activity;
   const sockinfo si;
   bool write_packet ();
   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 ();
 };
 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(); )
     if (i->second->last_activity >= to)
       ++i;
 }
 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);
       int len;
       int fd = accept (w.fd, (sockaddr *)&sa, &sa_len);
       if (fd >= 0)
         {
+          fcntl (fd, F_SETFL, O_NONBLOCK);
+          fcntl (fd, F_SETFD, FD_CLOEXEC);
           sockinfo si(sa, PROT_TCPv4);
           slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
-          fcntl (fd, F_SETFL, O_NONBLOCK);
           tcp_connection *i = new tcp_connection (fd, si, *this);
           tcp_si.insert (*i);
         }
     }
 void
 tcp_connection::tcpv4_ev (io_watcher &w, short revents)
 {
   last_activity = NOW;
-  if (revents & (POLLERR | POLLHUP))
+  if (revents & EVENT_WRITE)
-    {
-      error ();
-      return;
-    }
-  if (revents & POLLOUT)
     {
       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
         }
       else if (state == ESTABLISHED)
             {
               if (write_packet ())
                 {
                   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 (;;)
           {
             if (!r_pkt)
                   break;
               }
             else if (len < 0 && (errno == EINTR || errno == EAGAIN))
               break;
+            // len == 0 <-> EOF
             error ();
             break;
           }
 #if ENABLE_HTTP_PROXY
       else if (state == CONNECTING_PROXY)
           fcntl (fd, F_SETFL, O_NONBLOCK);
           if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
               || errno == EINPROGRESS)
             {
+              fcntl (fd, F_SETFL, O_NONBLOCK);
+              fcntl (fd, F_SETFD, FD_CLOEXEC);
               state = CONNECTING;
-              start (fd, POLLOUT);
+              start (fd, EVENT_WRITE);
             }
           else
             close (fd);
         }
     }
           else
             {
               w_pkt = new vpn_packet;
               w_pkt->set (*pkt);
-              set (POLLIN | POLLOUT);
+              set (EVENT_READ | EVENT_WRITE);
             }
         }
     }
   return state != ERROR;
 }
 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;
   fd = fd_;
 #if ENABLE_HTTP_PROXY
     }
   else
     {
       active = false;
       state = ESTABLISHED;
-      start (fd, POLLIN);
+      start (fd, EVENT_READ);
     }
 }
 tcp_connection::~tcp_connection ()
 {

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing gvpe/src/vpn_tcp.C (file contents): Revision 1.9 by pcg, Wed Oct 15 00:41:59 2003 UTC vs. Revision 1.16 by pcg, Sat Jul 9 02:49:06 2005 UTC

Diff Legend

Comparing gvpe/src/vpn_tcp.C (file contents):
Revision 1.9 by pcg, Wed Oct 15 00:41:59 2003 UTC vs.
Revision 1.16 by pcg, Sat Jul 9 02:49:06 2005 UTC