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

Diff Legend

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