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.21 by pcg, Sun Dec 2 00:39:06 2007 UTC vs.
Revision 1.27 by root, Tue Feb 8 23:11:36 2011 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-2007 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 Public License for more details.
16 16
17 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 along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22#include "config.h" 32#include "config.h"
23 33
24#if ENABLE_TCP 34#if ENABLE_TCP
… …
57 { 67 {
58 return *a < *b; 68 return *a < *b;
59 } 69 }
60}; 70};
61 71
62struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> { 72struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo>
73{
63 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; 74 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
64 75
65 tcp_si_map () 76 tcp_si_map ()
66 : cleaner(this, &tcp_si_map::cleaner_cb)
67 { 77 {
78 ev_default_loop (0);
79 cleaner.set<tcp_si_map, &tcp_si_map::cleaner_cb> (this);
68 cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2); 80 cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2);
69 } 81 }
82};
70 83
71} tcp_si; 84static tcp_si_map tcp_si;
72 85
73struct tcp_connection : ev::io { 86struct tcp_connection : ev::io
87{
74 int tos; 88 int tos;
75 tstamp last_activity; 89 tstamp last_activity;
76 const sockinfo si; 90 const sockinfo si;
77 vpn &v; 91 vpn &v;
78 bool active; // this connection has been actively established 92 bool active; // this connection has been actively established
… …
87#if ENABLE_HTTP_PROXY 101#if ENABLE_HTTP_PROXY
88 char *proxy_req; 102 char *proxy_req;
89 int proxy_req_len; 103 int proxy_req_len;
90#endif 104#endif
91 105
92 void tcpv4_ev (ev::io &w, int revents); 106 inline void tcpv4_ev (ev::io &w, int revents);
93 107
94 bool send_packet (vpn_packet *pkt, int tos); 108 bool send_packet (vpn_packet *pkt, int tos);
95 bool write_packet (); 109 bool write_packet ();
96 110
97 void error (); // abort conenction && cleanup 111 void error (); // abort conenction && cleanup
… …
103 117
104 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 118 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
105 ~tcp_connection (); 119 ~tcp_connection ();
106}; 120};
107 121
122void
108void tcp_si_map::cleaner_cb (ev::timer &w, int revents) 123tcp_si_map::cleaner_cb (ev::timer &w, int revents)
109{ 124{
110 tstamp to = ev_now () - ::conf.keepalive - 30 - 60; 125 tstamp to = ev_now () - ::conf.keepalive - 30 - 60;
111 126
112 for (iterator i = begin (); i != end(); ) 127 for (iterator i = begin (); i != end(); )
113 if (i->second->last_activity >= to) 128 if (i->second->last_activity >= to)
… …
436 } 451 }
437 452
438 return state != ERROR; 453 return state != ERROR;
439} 454}
440 455
456void
441void tcp_connection::error () 457tcp_connection::error ()
442{ 458{
443 stop (); 459 stop ();
444 460
445 if (fd >= 0) 461 if (fd >= 0)
446 { 462 {
… …
457 473
458 state = active ? IDLE : ERROR; 474 state = active ? IDLE : ERROR;
459} 475}
460 476
461tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 477tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
462: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev) 478: v(v_), si(si_)
463{ 479{
480 set<tcp_connection, &tcp_connection::tcpv4_ev> (this);
481
464 last_activity = ev_now (); 482 last_activity = ev_now ();
465 r_pkt = 0; 483 r_pkt = 0;
466 w_pkt = 0; 484 w_pkt = 0;
467 tos = -1; 485 tos = -1;
468 fd = fd_; 486 fd = fd_;

Diff Legend

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