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

Diff Legend

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