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.17 by pcg, Sat Nov 10 05:14:23 2007 UTC vs.
Revision 1.26 by pcg, Thu Aug 7 17:54:27 2008 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-2005 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 }
70 82
71} tcp_si; 83} tcp_si;
72 84
73struct tcp_connection : ev::io { 85struct tcp_connection : ev::io
86{
87 int tos;
74 tstamp last_activity; 88 tstamp last_activity;
75 const sockinfo si; 89 const sockinfo si;
76 vpn &v; 90 vpn &v;
77 bool active; // this connection has been actively established 91 bool active; // this connection has been actively established
78 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; 92 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
… …
86#if ENABLE_HTTP_PROXY 100#if ENABLE_HTTP_PROXY
87 char *proxy_req; 101 char *proxy_req;
88 int proxy_req_len; 102 int proxy_req_len;
89#endif 103#endif
90 104
91 void tcpv4_ev (ev::io &w, int revents); 105 inline void tcpv4_ev (ev::io &w, int revents);
92 106
93 bool send_packet (vpn_packet *pkt, int tos); 107 bool send_packet (vpn_packet *pkt, int tos);
94 bool write_packet (); 108 bool write_packet ();
95 109
96 void error (); // abort conenction && cleanup 110 void error (); // abort conenction && cleanup
… …
104 ~tcp_connection (); 118 ~tcp_connection ();
105}; 119};
106 120
107void tcp_si_map::cleaner_cb (ev::timer &w, int revents) 121void tcp_si_map::cleaner_cb (ev::timer &w, int revents)
108{ 122{
109 tstamp to = ev::ev_now () - ::conf.keepalive - 30 - 60; 123 tstamp to = ev_now () - ::conf.keepalive - 30 - 60;
110 124
111 for (iterator i = begin (); i != end(); ) 125 for (iterator i = begin (); i != end(); )
112 if (i->second->last_activity >= to) 126 if (i->second->last_activity >= to)
113 ++i; 127 ++i;
114 else 128 else
115 { 129 {
130 delete i->second;
116 erase (i); 131 erase (i);
117 i = begin (); 132 i = begin ();
118 } 133 }
119} 134}
120 135
… …
200} 215}
201 216
202void 217void
203tcp_connection::tcpv4_ev (ev::io &w, int revents) 218tcp_connection::tcpv4_ev (ev::io &w, int revents)
204{ 219{
205 last_activity = ev::ev_now (); 220 last_activity = ev_now ();
206 221
207 if (revents & EV_WRITE) 222 if (revents & EV_WRITE)
208 { 223 {
209 if (state == CONNECTING) 224 if (state == CONNECTING)
210 { 225 {
… …
345} 360}
346 361
347bool 362bool
348tcp_connection::send_packet (vpn_packet *pkt, int tos) 363tcp_connection::send_packet (vpn_packet *pkt, int tos)
349{ 364{
350 last_activity = ev::ev_now (); 365 last_activity = ev_now ();
351 366
352 if (state == IDLE) 367 if (state == IDLE)
353 { 368 {
354 // woaw, the first lost packet ;) 369 // woaw, the first lost packet ;)
355 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 370 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
… …
408 if (!w_pkt) 423 if (!w_pkt)
409 { 424 {
410 // how this maps to the underlying tcp packets we don't know 425 // how this maps to the underlying tcp packets we don't know
411 // and we don't care. at least we tried ;) 426 // and we don't care. at least we tried ;)
412#if defined(SOL_IP) && defined(IP_TOS) 427#if defined(SOL_IP) && defined(IP_TOS)
428 if (tos != this->tos)
429 {
430 this->tos = tos;
413 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); 431 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
432 }
414#endif 433#endif
415 434
416 w_pkt = pkt; 435 w_pkt = pkt;
417 w_ofs = 0; 436 w_ofs = 0;
418 w_len = pkt->len + 2; // length + size header 437 w_len = pkt->len + 2; // length + size header
… …
432 return state != ERROR; 451 return state != ERROR;
433} 452}
434 453
435void tcp_connection::error () 454void tcp_connection::error ()
436{ 455{
456 stop ();
457
437 if (fd >= 0) 458 if (fd >= 0)
438 { 459 {
439 close (fd); 460 close (fd);
461 tos = -1;
440 fd = -1; 462 fd = -1;
441 } 463 }
442 464
443 delete r_pkt; r_pkt = 0; 465 delete r_pkt; r_pkt = 0;
444 delete w_pkt; w_pkt = 0; 466 delete w_pkt; w_pkt = 0;
445#if ENABLE_HTTP_PROXY 467#if ENABLE_HTTP_PROXY
446 free (proxy_req); proxy_req = 0; 468 free (proxy_req); proxy_req = 0;
447#endif 469#endif
448 470
449 stop ();
450 state = active ? IDLE : ERROR; 471 state = active ? IDLE : ERROR;
451} 472}
452 473
453tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 474tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
454: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev) 475: v(v_), si(si_)
455{ 476{
456 if (!tcp_si.cleaner.active) 477 set<tcp_connection, &tcp_connection::tcpv4_ev> (this);
457 tcp_si.cleaner.start (0);
458 478
459 last_activity = ev::ev_now (); 479 last_activity = ev_now ();
460 r_pkt = 0; 480 r_pkt = 0;
461 w_pkt = 0; 481 w_pkt = 0;
482 tos = -1;
462 fd = fd_; 483 fd = fd_;
463#if ENABLE_HTTP_PROXY 484#if ENABLE_HTTP_PROXY
464 proxy_req = 0; 485 proxy_req = 0;
465#endif 486#endif
466 487

Diff Legend

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