--- gvpe/src/vpn_tcp.C 2005/03/23 20:07:56 1.13 +++ gvpe/src/vpn_tcp.C 2007/11/10 19:43:37 1.18 @@ -1,6 +1,6 @@ /* vpn_tcp.C -- handle the tcp part of the protocol. - Copyright (C) 2003-2005 Marc Lehmann + Copyright (C) 2003-2007 Marc Lehmann This file is part of GVPE. @@ -16,7 +16,7 @@ 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 + Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "config.h" @@ -60,15 +60,17 @@ }; struct tcp_si_map : public map { - void cleaner_cb (time_watcher &w); time_watcher cleaner; + void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; tcp_si_map () : cleaner(this, &tcp_si_map::cleaner_cb) - { } + { + cleaner.start (300, 300); + } } tcp_si; -struct tcp_connection : io_watcher { +struct tcp_connection : ev::io { tstamp last_activity; const sockinfo si; vpn &v; @@ -86,7 +88,7 @@ int proxy_req_len; #endif - void tcpv4_ev (io_watcher &w, short revents); + void tcpv4_ev (ev::io &w, int revents); bool send_packet (vpn_packet *pkt, int tos); bool write_packet (); @@ -102,11 +104,9 @@ ~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::ev_now () - ::conf.keepalive - 30 - 60; for (iterator i = begin (); i != end(); ) if (i->second->last_activity >= to) @@ -119,9 +119,9 @@ } 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 +131,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 +200,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::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 +233,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 +347,7 @@ bool tcp_connection::send_packet (vpn_packet *pkt, int tos) { - last_activity = NOW; + last_activity = ev::ev_now (); if (state == IDLE) { @@ -390,8 +391,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); @@ -420,7 +424,7 @@ w_pkt = new vpn_packet; w_pkt->set (*pkt); - set (EVENT_READ | EVENT_WRITE); + set (EV_READ | EV_WRITE); } } } @@ -430,6 +434,8 @@ void tcp_connection::error () { + stop (); + if (fd >= 0) { close (fd); @@ -442,17 +448,16 @@ 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_), ev::io(this, &tcp_connection::tcpv4_ev) { if (!tcp_si.cleaner.active) tcp_si.cleaner.start (0); - last_activity = NOW; + last_activity = ev::ev_now (); r_pkt = 0; w_pkt = 0; fd = fd_; @@ -469,7 +474,7 @@ { active = false; state = ESTABLISHED; - start (fd, EVENT_READ); + start (fd, EV_READ); } }