--- gvpe/src/vpn_tcp.C 2005/03/23 20:07:56 1.13 +++ gvpe/src/vpn_tcp.C 2008/08/07 17:54:27 1.26 @@ -1,32 +1,42 @@ /* vpn_tcp.C -- handle the tcp part of the protocol. - Copyright (C) 2003-2005 Marc Lehmann + Copyright (C) 2003-2008 Marc Lehmann 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. - - 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 gvpe; if not, write to the Free Software - Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 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 3 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, see . + + Additional permission under GNU GPL version 3 section 7 + + If you modify this Program, or any covered work, by linking or + combining it with the OpenSSL project's OpenSSL library (or a modified + version of that library), containing parts covered by the terms of the + OpenSSL or SSLeay licenses, the licensors of this Program grant you + additional permission to convey the resulting work. Corresponding + Source for a non-source form of such a combination shall include the + source code for the parts of OpenSSL used as well as that of the + covered work. */ #include "config.h" #if ENABLE_TCP -// tcp processing is extremely ugly, since the vpe protocol is simply +// tcp processing is extremely ugly, since the gvpe protocol is simply // designed for unreliable datagram networks. tcp is implemented by // multiplexing packets over tcp. errors are completely ignored, as we -// rely on the higher level protocol to time out and reconnect. +// rely on the higher level layers to time out and reconnect. #include @@ -59,16 +69,22 @@ } }; -struct tcp_si_map : public map { - void cleaner_cb (time_watcher &w); time_watcher cleaner; +struct tcp_si_map : public map +{ + inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; tcp_si_map () - : cleaner(this, &tcp_si_map::cleaner_cb) - { } + { + ev_default_loop (0); + cleaner.set (this); + cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2); + } } tcp_si; -struct tcp_connection : io_watcher { +struct tcp_connection : ev::io +{ + int tos; tstamp last_activity; const sockinfo si; vpn &v; @@ -86,7 +102,7 @@ int proxy_req_len; #endif - void tcpv4_ev (io_watcher &w, short revents); + inline void tcpv4_ev (ev::io &w, int revents); bool send_packet (vpn_packet *pkt, int tos); bool write_packet (); @@ -102,26 +118,25 @@ ~tcp_connection (); }; -void tcp_si_map::cleaner_cb (time_watcher &w) +void tcp_si_map::cleaner_cb (ev::timer &w, int revents) { - w.start (NOW + 600); - - tstamp to = NOW - ::conf.keepalive - 30 - 60; + tstamp to = ev_now () - ::conf.keepalive - 30 - 60; for (iterator i = begin (); i != end(); ) if (i->second->last_activity >= to) ++i; else { + delete i->second; erase (i); i = begin (); } } void -vpn::tcpv4_ev (io_watcher &w, short revents) +vpn::tcpv4_ev (ev::io &w, int revents) { - if (revents & EVENT_READ) + if (revents & EV_READ) { struct sockaddr_in sa; socklen_t sa_len = sizeof (sa); @@ -131,12 +146,13 @@ 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); } @@ -199,16 +215,16 @@ } void -tcp_connection::tcpv4_ev (io_watcher &w, short revents) +tcp_connection::tcpv4_ev (ev::io &w, int revents) { - last_activity = NOW; + last_activity = ev_now (); - if (revents & EVENT_WRITE) + if (revents & EV_WRITE) { if (state == CONNECTING) { state = ESTABLISHED; - set (EVENT_READ); + set (EV_READ); #if ENABLE_HTTP_PROXY if (::conf.proxy_host && ::conf.proxy_port) { @@ -232,17 +248,17 @@ { delete w_pkt; w_pkt = 0; - set (EVENT_READ); + set (EV_READ); } } else - set (EVENT_READ); + set (EV_READ); } else - set (EVENT_READ); + set (EV_READ); } - if (revents & EVENT_READ) + if (revents & EV_READ) { if (state == ESTABLISHED) for (;;) @@ -346,7 +362,7 @@ bool tcp_connection::send_packet (vpn_packet *pkt, int tos) { - last_activity = NOW; + last_activity = ev_now (); if (state == IDLE) { @@ -390,8 +406,11 @@ 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, EVENT_WRITE); + start (fd, EV_WRITE); } else close (fd); @@ -406,7 +425,11 @@ // 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); + if (tos != this->tos) + { + this->tos = tos; + setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); + } #endif w_pkt = pkt; @@ -420,7 +443,7 @@ w_pkt = new vpn_packet; w_pkt->set (*pkt); - set (EVENT_READ | EVENT_WRITE); + set (EV_READ | EV_WRITE); } } } @@ -430,10 +453,13 @@ void tcp_connection::error () { + stop (); + if (fd >= 0) { close (fd); - fd = -1; + tos = -1; + fd = -1; } delete r_pkt; r_pkt = 0; @@ -442,19 +468,18 @@ free (proxy_req); proxy_req = 0; #endif - stop (); state = active ? IDLE : ERROR; } tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) -: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) +: v(v_), si(si_) { - if (!tcp_si.cleaner.active) - tcp_si.cleaner.start (0); + set (this); - last_activity = NOW; + last_activity = ev_now (); r_pkt = 0; w_pkt = 0; + tos = -1; fd = fd_; #if ENABLE_HTTP_PROXY proxy_req = 0; @@ -469,7 +494,7 @@ { active = false; state = ESTABLISHED; - start (fd, EVENT_READ); + start (fd, EV_READ); } }