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.11 by pcg, Sat Jan 17 01:18:36 2004 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-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
6 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
7 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
8 (at your option) any later version. 10 option) any later version.
9 11
10 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
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13 GNU General Public License for more details. 15 Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
17 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.
18*/ 30*/
19 31
20#include "config.h" 32#include "config.h"
21 33
22#if ENABLE_TCP 34#if ENABLE_TCP
23 35
24// tcp processing is extremely ugly, since the vpe protocol is simply 36// tcp processing is extremely ugly, since the gvpe protocol is simply
25// designed for unreliable datagram networks. tcp is implemented by 37// designed for unreliable datagram networks. tcp is implemented by
26// multiplexing packets over tcp. errors are completely ignored, as we 38// multiplexing packets over tcp. errors are completely ignored, as we
27// rely on the higher level protocol to time out and reconnect. 39// rely on the higher level layers to time out and reconnect.
28 40
29#include <cstring> 41#include <cstring>
30 42
31#include <sys/types.h> 43#include <sys/types.h>
32#include <sys/socket.h> 44#include <sys/socket.h>
… …
55 { 67 {
56 return *a < *b; 68 return *a < *b;
57 } 69 }
58}; 70};
59 71
60struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> { 72struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo>
61 void cleaner_cb (time_watcher &w); time_watcher cleaner; 73{
74 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
62 75
63 tcp_si_map () 76 tcp_si_map ()
64 : cleaner(this, &tcp_si_map::cleaner_cb)
65 { 77 {
66 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);
67 } 81 }
68} tcp_si; 82};
69 83
84static tcp_si_map tcp_si;
85
70struct tcp_connection : io_watcher { 86struct tcp_connection : ev::io
87{
88 int tos;
71 tstamp last_activity; 89 tstamp last_activity;
72 const sockinfo si; 90 const sockinfo si;
73 vpn &v; 91 vpn &v;
74 bool active; // this connection has been actively established 92 bool active; // this connection has been actively established
75 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; 93 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
… …
83#if ENABLE_HTTP_PROXY 101#if ENABLE_HTTP_PROXY
84 char *proxy_req; 102 char *proxy_req;
85 int proxy_req_len; 103 int proxy_req_len;
86#endif 104#endif
87 105
88 void tcpv4_ev (io_watcher &w, short revents); 106 inline void tcpv4_ev (ev::io &w, int revents);
89 107
90 bool send_packet (vpn_packet *pkt, int tos); 108 bool send_packet (vpn_packet *pkt, int tos);
91 bool write_packet (); 109 bool write_packet ();
92 110
93 void error (); // abort conenction && cleanup 111 void error (); // abort conenction && cleanup
94 112
95 operator tcp_si_map::value_type() 113 operator tcp_si_map::value_type()
96 { 114 {
97 return tcp_si_map::value_type (&si, this); 115 return tcp_si_map::value_type (&si, this);
98 } 116 }
99 117
100 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 118 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
101 ~tcp_connection (); 119 ~tcp_connection ();
102}; 120};
103 121
104void tcp_si_map::cleaner_cb (time_watcher &w) 122void
123tcp_si_map::cleaner_cb (ev::timer &w, int revents)
105{ 124{
106 w.start (NOW + 600);
107
108 tstamp to = NOW - ::conf.keepalive - 30 - 60; 125 tstamp to = ev_now () - ::conf.keepalive - 30 - 60;
109 126
110 for (iterator i = begin (); i != end(); ) 127 for (iterator i = begin (); i != end(); )
111 if (i->second->last_activity >= to) 128 if (i->second->last_activity >= to)
112 ++i; 129 ++i;
113 else 130 else
114 { 131 {
132 delete i->second;
115 erase (i); 133 erase (i);
116 i = begin (); 134 i = begin ();
117 } 135 }
118} 136}
119 137
120void 138void
121vpn::tcpv4_ev (io_watcher &w, short revents) 139vpn::tcpv4_ev (ev::io &w, int revents)
122{ 140{
123 if (revents & EVENT_READ) 141 if (revents & EV_READ)
124 { 142 {
125 struct sockaddr_in sa; 143 struct sockaddr_in sa;
126 socklen_t sa_len = sizeof (sa); 144 socklen_t sa_len = sizeof (sa);
127 int len; 145 int len;
128 146
129 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); 147 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len);
130 148
131 if (fd >= 0) 149 if (fd >= 0)
132 { 150 {
151 fcntl (fd, F_SETFL, O_NONBLOCK);
152 fcntl (fd, F_SETFD, FD_CLOEXEC);
153
133 sockinfo si(sa, PROT_TCPv4); 154 sockinfo si(sa, PROT_TCPv4);
134 155
135 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D 156 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
136
137 fcntl (fd, F_SETFL, O_NONBLOCK);
138 157
139 tcp_connection *i = new tcp_connection (fd, si, *this); 158 tcp_connection *i = new tcp_connection (fd, si, *this);
140 tcp_si.insert (*i); 159 tcp_si.insert (*i);
141 } 160 }
142 } 161 }
… …
196 return false; 215 return false;
197 } 216 }
198} 217}
199 218
200void 219void
201tcp_connection::tcpv4_ev (io_watcher &w, short revents) 220tcp_connection::tcpv4_ev (ev::io &w, int revents)
202{ 221{
203 last_activity = NOW; 222 last_activity = ev_now ();
204 223
205 if (revents & EVENT_WRITE) 224 if (revents & EV_WRITE)
206 { 225 {
207 if (state == CONNECTING) 226 if (state == CONNECTING)
208 { 227 {
209 state = ESTABLISHED; 228 state = ESTABLISHED;
210 set (EVENT_READ); 229 set (EV_READ);
211#if ENABLE_HTTP_PROXY 230#if ENABLE_HTTP_PROXY
212 if (::conf.proxy_host && ::conf.proxy_port) 231 if (::conf.proxy_host && ::conf.proxy_port)
213 { 232 {
214 state = CONNECTING_PROXY; 233 state = CONNECTING_PROXY;
215 234
… …
229 { 248 {
230 if (write_packet ()) 249 if (write_packet ())
231 { 250 {
232 delete w_pkt; w_pkt = 0; 251 delete w_pkt; w_pkt = 0;
233 252
234 set (EVENT_READ); 253 set (EV_READ);
235 } 254 }
236 } 255 }
237 else 256 else
238 set (EVENT_READ); 257 set (EV_READ);
239 } 258 }
240 else 259 else
241 set (EVENT_READ); 260 set (EV_READ);
242 } 261 }
243 262
244 if (revents & EVENT_READ) 263 if (revents & EV_READ)
245 { 264 {
246 if (state == ESTABLISHED) 265 if (state == ESTABLISHED)
247 for (;;) 266 for (;;)
248 { 267 {
249 if (!r_pkt) 268 if (!r_pkt)
… …
343} 362}
344 363
345bool 364bool
346tcp_connection::send_packet (vpn_packet *pkt, int tos) 365tcp_connection::send_packet (vpn_packet *pkt, int tos)
347{ 366{
348 last_activity = NOW; 367 last_activity = ev_now ();
349 368
350 if (state == IDLE) 369 if (state == IDLE)
351 { 370 {
352 // woaw, the first lost packet ;) 371 // woaw, the first lost packet ;)
353 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 372 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
… …
387 fcntl (fd, F_SETFL, O_NONBLOCK); 406 fcntl (fd, F_SETFL, O_NONBLOCK);
388 407
389 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0 408 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
390 || errno == EINPROGRESS) 409 || errno == EINPROGRESS)
391 { 410 {
411 fcntl (fd, F_SETFL, O_NONBLOCK);
412 fcntl (fd, F_SETFD, FD_CLOEXEC);
413
392 state = CONNECTING; 414 state = CONNECTING;
393 start (fd, EVENT_WRITE); 415 start (fd, EV_WRITE);
394 } 416 }
395 else 417 else
396 close (fd); 418 close (fd);
397 } 419 }
398 } 420 }
… …
403 if (!w_pkt) 425 if (!w_pkt)
404 { 426 {
405 // 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
406 // and we don't care. at least we tried ;) 428 // and we don't care. at least we tried ;)
407#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;
408 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); 433 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
434 }
409#endif 435#endif
410 436
411 w_pkt = pkt; 437 w_pkt = pkt;
412 w_ofs = 0; 438 w_ofs = 0;
413 w_len = pkt->len + 2; // length + size header 439 w_len = pkt->len + 2; // length + size header
… …
417 else 443 else
418 { 444 {
419 w_pkt = new vpn_packet; 445 w_pkt = new vpn_packet;
420 w_pkt->set (*pkt); 446 w_pkt->set (*pkt);
421 447
422 set (EVENT_READ | EVENT_WRITE); 448 set (EV_READ | EV_WRITE);
423 } 449 }
424 } 450 }
425 } 451 }
426 452
427 return state != ERROR; 453 return state != ERROR;
428} 454}
429 455
456void
430void tcp_connection::error () 457tcp_connection::error ()
431{ 458{
459 stop ();
460
432 if (fd >= 0) 461 if (fd >= 0)
433 { 462 {
434 close (fd); 463 close (fd);
464 tos = -1;
435 fd = -1; 465 fd = -1;
436 } 466 }
437 467
438 delete r_pkt; r_pkt = 0; 468 delete r_pkt; r_pkt = 0;
439 delete w_pkt; w_pkt = 0; 469 delete w_pkt; w_pkt = 0;
440#if ENABLE_HTTP_PROXY 470#if ENABLE_HTTP_PROXY
441 free (proxy_req); proxy_req = 0; 471 free (proxy_req); proxy_req = 0;
442#endif 472#endif
443 473
444 stop ();
445 state = active ? IDLE : ERROR; 474 state = active ? IDLE : ERROR;
446} 475}
447 476
448tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 477tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
449: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 478: v(v_), si(si_)
450{ 479{
480 set<tcp_connection, &tcp_connection::tcpv4_ev> (this);
481
451 last_activity = NOW; 482 last_activity = ev_now ();
452 r_pkt = 0; 483 r_pkt = 0;
453 w_pkt = 0; 484 w_pkt = 0;
485 tos = -1;
454 fd = fd_; 486 fd = fd_;
455#if ENABLE_HTTP_PROXY 487#if ENABLE_HTTP_PROXY
456 proxy_req = 0; 488 proxy_req = 0;
457#endif 489#endif
458 490
… …
463 } 495 }
464 else 496 else
465 { 497 {
466 active = false; 498 active = false;
467 state = ESTABLISHED; 499 state = ESTABLISHED;
468 start (fd, EVENT_READ); 500 start (fd, EV_READ);
469 } 501 }
470} 502}
471 503
472tcp_connection::~tcp_connection () 504tcp_connection::~tcp_connection ()
473{ 505{

Diff Legend

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