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.18 by pcg, Sat Nov 10 19:43:37 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
25 35
26// tcp processing is extremely ugly, since the vpe protocol is simply 36// tcp processing is extremely ugly, since the gvpe protocol is simply
27// designed for unreliable datagram networks. tcp is implemented by 37// designed for unreliable datagram networks. tcp is implemented by
28// multiplexing packets over tcp. errors are completely ignored, as we 38// multiplexing packets over tcp. errors are completely ignored, as we
29// rely on the higher level protocol to time out and reconnect. 39// rely on the higher level layers to time out and reconnect.
30 40
31#include <cstring> 41#include <cstring>
32 42
33#include <sys/types.h> 43#include <sys/types.h>
34#include <sys/socket.h> 44#include <sys/socket.h>
… …
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 {
68 cleaner.start (300, 300); 78 ev_default_loop (0);
79 cleaner.set<tcp_si_map, &tcp_si_map::cleaner_cb> (this);
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{
88 int tos;
74 tstamp last_activity; 89 tstamp last_activity;
75 const sockinfo si; 90 const sockinfo si;
76 vpn &v; 91 vpn &v;
77 bool active; // this connection has been actively established 92 bool active; // this connection has been actively established
78 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; 93 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
… …
86#if ENABLE_HTTP_PROXY 101#if ENABLE_HTTP_PROXY
87 char *proxy_req; 102 char *proxy_req;
88 int proxy_req_len; 103 int proxy_req_len;
89#endif 104#endif
90 105
91 void tcpv4_ev (ev::io &w, int revents); 106 inline void tcpv4_ev (ev::io &w, int revents);
92 107
93 bool send_packet (vpn_packet *pkt, int tos); 108 bool send_packet (vpn_packet *pkt, int tos);
94 bool write_packet (); 109 bool write_packet ();
95 110
96 void error (); // abort conenction && cleanup 111 void error (); // abort conenction && cleanup
… …
102 117
103 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 118 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
104 ~tcp_connection (); 119 ~tcp_connection ();
105}; 120};
106 121
122void
107void tcp_si_map::cleaner_cb (ev::timer &w, int revents) 123tcp_si_map::cleaner_cb (ev::timer &w, int revents)
108{ 124{
109 tstamp to = ev::ev_now () - ::conf.keepalive - 30 - 60; 125 tstamp to = ev_now () - ::conf.keepalive - 30 - 60;
110 126
111 for (iterator i = begin (); i != end(); ) 127 for (iterator i = begin (); i != end(); )
112 if (i->second->last_activity >= to) 128 if (i->second->last_activity >= to)
113 ++i; 129 ++i;
114 else 130 else
115 { 131 {
132 delete i->second;
116 erase (i); 133 erase (i);
117 i = begin (); 134 i = begin ();
118 } 135 }
119} 136}
120 137
… …
200} 217}
201 218
202void 219void
203tcp_connection::tcpv4_ev (ev::io &w, int revents) 220tcp_connection::tcpv4_ev (ev::io &w, int revents)
204{ 221{
205 last_activity = ev::ev_now (); 222 last_activity = ev_now ();
206 223
207 if (revents & EV_WRITE) 224 if (revents & EV_WRITE)
208 { 225 {
209 if (state == CONNECTING) 226 if (state == CONNECTING)
210 { 227 {
… …
345} 362}
346 363
347bool 364bool
348tcp_connection::send_packet (vpn_packet *pkt, int tos) 365tcp_connection::send_packet (vpn_packet *pkt, int tos)
349{ 366{
350 last_activity = ev::ev_now (); 367 last_activity = ev_now ();
351 368
352 if (state == IDLE) 369 if (state == IDLE)
353 { 370 {
354 // woaw, the first lost packet ;) 371 // woaw, the first lost packet ;)
355 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 372 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
… …
408 if (!w_pkt) 425 if (!w_pkt)
409 { 426 {
410 // how this maps to the underlying tcp packets we don't know 427 // how this maps to the underlying tcp packets we don't know
411 // and we don't care. at least we tried ;) 428 // and we don't care. at least we tried ;)
412#if defined(SOL_IP) && defined(IP_TOS) 429#if defined(SOL_IP) && defined(IP_TOS)
430 if (tos != this->tos)
431 {
432 this->tos = tos;
413 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); 433 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
434 }
414#endif 435#endif
415 436
416 w_pkt = pkt; 437 w_pkt = pkt;
417 w_ofs = 0; 438 w_ofs = 0;
418 w_len = pkt->len + 2; // length + size header 439 w_len = pkt->len + 2; // length + size header
… …
430 } 451 }
431 452
432 return state != ERROR; 453 return state != ERROR;
433} 454}
434 455
456void
435void tcp_connection::error () 457tcp_connection::error ()
436{ 458{
437 stop (); 459 stop ();
438 460
439 if (fd >= 0) 461 if (fd >= 0)
440 { 462 {
441 close (fd); 463 close (fd);
464 tos = -1;
442 fd = -1; 465 fd = -1;
443 } 466 }
444 467
445 delete r_pkt; r_pkt = 0; 468 delete r_pkt; r_pkt = 0;
446 delete w_pkt; w_pkt = 0; 469 delete w_pkt; w_pkt = 0;
447#if ENABLE_HTTP_PROXY 470#if ENABLE_HTTP_PROXY
… …
450 473
451 state = active ? IDLE : ERROR; 474 state = active ? IDLE : ERROR;
452} 475}
453 476
454tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 477tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
455: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev) 478: v(v_), si(si_)
456{ 479{
457 if (!tcp_si.cleaner.active) 480 set<tcp_connection, &tcp_connection::tcpv4_ev> (this);
458 tcp_si.cleaner.start (0);
459 481
460 last_activity = ev::ev_now (); 482 last_activity = ev_now ();
461 r_pkt = 0; 483 r_pkt = 0;
462 w_pkt = 0; 484 w_pkt = 0;
485 tos = -1;
463 fd = fd_; 486 fd = fd_;
464#if ENABLE_HTTP_PROXY 487#if ENABLE_HTTP_PROXY
465 proxy_req = 0; 488 proxy_req = 0;
466#endif 489#endif
467 490

Diff Legend

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