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.12 by pcg, Thu Mar 3 16:54:34 2005 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-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. 59 Temple Place, Suite 330, Boston, MA 02111-1307 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>
63 void cleaner_cb (time_watcher &w); time_watcher cleaner; 73{
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 (0); 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} tcp_si; 82};
71 83
84static tcp_si_map tcp_si;
85
72struct tcp_connection : io_watcher { 86struct tcp_connection : ev::io
87{
88 int tos;
73 tstamp last_activity; 89 tstamp last_activity;
74 const sockinfo si; 90 const sockinfo si;
75 vpn &v; 91 vpn &v;
76 bool active; // this connection has been actively established 92 bool active; // this connection has been actively established
77 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; 93 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
… …
85#if ENABLE_HTTP_PROXY 101#if ENABLE_HTTP_PROXY
86 char *proxy_req; 102 char *proxy_req;
87 int proxy_req_len; 103 int proxy_req_len;
88#endif 104#endif
89 105
90 void tcpv4_ev (io_watcher &w, short revents); 106 inline void tcpv4_ev (ev::io &w, int revents);
91 107
92 bool send_packet (vpn_packet *pkt, int tos); 108 bool send_packet (vpn_packet *pkt, int tos);
93 bool write_packet (); 109 bool write_packet ();
94 110
95 void error (); // abort conenction && cleanup 111 void error (); // abort conenction && cleanup
96 112
97 operator tcp_si_map::value_type() 113 operator tcp_si_map::value_type()
98 { 114 {
99 return tcp_si_map::value_type (&si, this); 115 return tcp_si_map::value_type (&si, this);
100 } 116 }
101 117
102 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 118 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
103 ~tcp_connection (); 119 ~tcp_connection ();
104}; 120};
105 121
106void tcp_si_map::cleaner_cb (time_watcher &w) 122void
123tcp_si_map::cleaner_cb (ev::timer &w, int revents)
107{ 124{
108 w.start (NOW + 600);
109
110 tstamp to = 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)
114 ++i; 129 ++i;
115 else 130 else
116 { 131 {
132 delete i->second;
117 erase (i); 133 erase (i);
118 i = begin (); 134 i = begin ();
119 } 135 }
120} 136}
121 137
122void 138void
123vpn::tcpv4_ev (io_watcher &w, short revents) 139vpn::tcpv4_ev (ev::io &w, int revents)
124{ 140{
125 if (revents & EVENT_READ) 141 if (revents & EV_READ)
126 { 142 {
127 struct sockaddr_in sa; 143 struct sockaddr_in sa;
128 socklen_t sa_len = sizeof (sa); 144 socklen_t sa_len = sizeof (sa);
129 int len; 145 int len;
130 146
131 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); 147 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len);
132 148
133 if (fd >= 0) 149 if (fd >= 0)
134 { 150 {
151 fcntl (fd, F_SETFL, O_NONBLOCK);
152 fcntl (fd, F_SETFD, FD_CLOEXEC);
153
135 sockinfo si(sa, PROT_TCPv4); 154 sockinfo si(sa, PROT_TCPv4);
136 155
137 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D 156 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
138
139 fcntl (fd, F_SETFL, O_NONBLOCK);
140 157
141 tcp_connection *i = new tcp_connection (fd, si, *this); 158 tcp_connection *i = new tcp_connection (fd, si, *this);
142 tcp_si.insert (*i); 159 tcp_si.insert (*i);
143 } 160 }
144 } 161 }
… …
198 return false; 215 return false;
199 } 216 }
200} 217}
201 218
202void 219void
203tcp_connection::tcpv4_ev (io_watcher &w, short revents) 220tcp_connection::tcpv4_ev (ev::io &w, int revents)
204{ 221{
205 last_activity = NOW; 222 last_activity = ev_now ();
206 223
207 if (revents & EVENT_WRITE) 224 if (revents & EV_WRITE)
208 { 225 {
209 if (state == CONNECTING) 226 if (state == CONNECTING)
210 { 227 {
211 state = ESTABLISHED; 228 state = ESTABLISHED;
212 set (EVENT_READ); 229 set (EV_READ);
213#if ENABLE_HTTP_PROXY 230#if ENABLE_HTTP_PROXY
214 if (::conf.proxy_host && ::conf.proxy_port) 231 if (::conf.proxy_host && ::conf.proxy_port)
215 { 232 {
216 state = CONNECTING_PROXY; 233 state = CONNECTING_PROXY;
217 234
… …
231 { 248 {
232 if (write_packet ()) 249 if (write_packet ())
233 { 250 {
234 delete w_pkt; w_pkt = 0; 251 delete w_pkt; w_pkt = 0;
235 252
236 set (EVENT_READ); 253 set (EV_READ);
237 } 254 }
238 } 255 }
239 else 256 else
240 set (EVENT_READ); 257 set (EV_READ);
241 } 258 }
242 else 259 else
243 set (EVENT_READ); 260 set (EV_READ);
244 } 261 }
245 262
246 if (revents & EVENT_READ) 263 if (revents & EV_READ)
247 { 264 {
248 if (state == ESTABLISHED) 265 if (state == ESTABLISHED)
249 for (;;) 266 for (;;)
250 { 267 {
251 if (!r_pkt) 268 if (!r_pkt)
… …
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 = 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);
… …
389 fcntl (fd, F_SETFL, O_NONBLOCK); 406 fcntl (fd, F_SETFL, O_NONBLOCK);
390 407
391 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0 408 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
392 || errno == EINPROGRESS) 409 || errno == EINPROGRESS)
393 { 410 {
411 fcntl (fd, F_SETFL, O_NONBLOCK);
412 fcntl (fd, F_SETFD, FD_CLOEXEC);
413
394 state = CONNECTING; 414 state = CONNECTING;
395 start (fd, EVENT_WRITE); 415 start (fd, EV_WRITE);
396 } 416 }
397 else 417 else
398 close (fd); 418 close (fd);
399 } 419 }
400 } 420 }
… …
405 if (!w_pkt) 425 if (!w_pkt)
406 { 426 {
407 // 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
408 // and we don't care. at least we tried ;) 428 // and we don't care. at least we tried ;)
409#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;
410 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); 433 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
434 }
411#endif 435#endif
412 436
413 w_pkt = pkt; 437 w_pkt = pkt;
414 w_ofs = 0; 438 w_ofs = 0;
415 w_len = pkt->len + 2; // length + size header 439 w_len = pkt->len + 2; // length + size header
… …
419 else 443 else
420 { 444 {
421 w_pkt = new vpn_packet; 445 w_pkt = new vpn_packet;
422 w_pkt->set (*pkt); 446 w_pkt->set (*pkt);
423 447
424 set (EVENT_READ | EVENT_WRITE); 448 set (EV_READ | EV_WRITE);
425 } 449 }
426 } 450 }
427 } 451 }
428 452
429 return state != ERROR; 453 return state != ERROR;
430} 454}
431 455
456void
432void tcp_connection::error () 457tcp_connection::error ()
433{ 458{
459 stop ();
460
434 if (fd >= 0) 461 if (fd >= 0)
435 { 462 {
436 close (fd); 463 close (fd);
464 tos = -1;
437 fd = -1; 465 fd = -1;
438 } 466 }
439 467
440 delete r_pkt; r_pkt = 0; 468 delete r_pkt; r_pkt = 0;
441 delete w_pkt; w_pkt = 0; 469 delete w_pkt; w_pkt = 0;
442#if ENABLE_HTTP_PROXY 470#if ENABLE_HTTP_PROXY
443 free (proxy_req); proxy_req = 0; 471 free (proxy_req); proxy_req = 0;
444#endif 472#endif
445 473
446 stop ();
447 state = active ? IDLE : ERROR; 474 state = active ? IDLE : ERROR;
448} 475}
449 476
450tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 477tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
451: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 478: v(v_), si(si_)
452{ 479{
480 set<tcp_connection, &tcp_connection::tcpv4_ev> (this);
481
453 last_activity = NOW; 482 last_activity = ev_now ();
454 r_pkt = 0; 483 r_pkt = 0;
455 w_pkt = 0; 484 w_pkt = 0;
485 tos = -1;
456 fd = fd_; 486 fd = fd_;
457#if ENABLE_HTTP_PROXY 487#if ENABLE_HTTP_PROXY
458 proxy_req = 0; 488 proxy_req = 0;
459#endif 489#endif
460 490
… …
465 } 495 }
466 else 496 else
467 { 497 {
468 active = false; 498 active = false;
469 state = ESTABLISHED; 499 state = ESTABLISHED;
470 start (fd, EVENT_READ); 500 start (fd, EV_READ);
471 } 501 }
472} 502}
473 503
474tcp_connection::~tcp_connection () 504tcp_connection::~tcp_connection ()
475{ 505{

Diff Legend

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