ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/vpn_tcp.C
(Generate patch)

Comparing gvpe/src/vpn_tcp.C (file contents):
Revision 1.11 by pcg, Sat Jan 17 01:18:36 2004 UTC vs.
Revision 1.15 by pcg, Sat Jul 9 02:43:19 2005 UTC

1/* 1/*
2 vpn_tcp.C -- handle the tcp part of the protocol. 2 vpn_tcp.C -- handle the tcp part of the protocol.
3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your option) any later version.
9 11
10 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 15 GNU General Public License for more details.
14 16
15 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21 23
22#if ENABLE_TCP 24#if ENABLE_TCP
… …
59 61
60struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> { 62struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> {
61 void cleaner_cb (time_watcher &w); time_watcher cleaner; 63 void cleaner_cb (time_watcher &w); time_watcher cleaner;
62 64
63 tcp_si_map () 65 tcp_si_map ()
64 : cleaner(this, &tcp_si_map::cleaner_cb) 66 : cleaner(this, &tcp_si_map::cleaner_cb)
65 {
66 cleaner.start (0);
67 } 67 { }
68
68} tcp_si; 69} tcp_si;
69 70
70struct tcp_connection : io_watcher { 71struct tcp_connection : io_watcher {
71 tstamp last_activity; 72 tstamp last_activity;
72 const sockinfo si; 73 const sockinfo si;
… …
91 bool write_packet (); 92 bool write_packet ();
92 93
93 void error (); // abort conenction && cleanup 94 void error (); // abort conenction && cleanup
94 95
95 operator tcp_si_map::value_type() 96 operator tcp_si_map::value_type()
96 { 97 {
97 return tcp_si_map::value_type (&si, this); 98 return tcp_si_map::value_type (&si, this);
98 } 99 }
99 100
100 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 101 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
101 ~tcp_connection (); 102 ~tcp_connection ();
102}; 103};
103 104
… …
133 sockinfo si(sa, PROT_TCPv4); 134 sockinfo si(sa, PROT_TCPv4);
134 135
135 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D 136 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
136 137
137 fcntl (fd, F_SETFL, O_NONBLOCK); 138 fcntl (fd, F_SETFL, O_NONBLOCK);
139 fcntl (fd, F_SETFD, FD_CLOEXEC);
138 140
139 tcp_connection *i = new tcp_connection (fd, si, *this); 141 tcp_connection *i = new tcp_connection (fd, si, *this);
140 tcp_si.insert (*i); 142 tcp_si.insert (*i);
141 } 143 }
142 } 144 }
… …
446} 448}
447 449
448tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 450tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
449: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 451: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev)
450{ 452{
453 if (!tcp_si.cleaner.active)
454 tcp_si.cleaner.start (0);
455
451 last_activity = NOW; 456 last_activity = NOW;
452 r_pkt = 0; 457 r_pkt = 0;
453 w_pkt = 0; 458 w_pkt = 0;
454 fd = fd_; 459 fd = fd_;
455#if ENABLE_HTTP_PROXY 460#if ENABLE_HTTP_PROXY

Diff Legend

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