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

Diff Legend

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