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.20 by pcg, Sat Dec 1 23:35:31 2007 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-2007 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
8 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
… …
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 15 GNU General 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
18 along with gvpe; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20*/ 20*/
21 21
22#include "config.h" 22#include "config.h"
23 23
24#if ENABLE_TCP 24#if ENABLE_TCP
25 25
26// tcp processing is extremely ugly, since the vpe protocol is simply 26// tcp processing is extremely ugly, since the gvpe protocol is simply
27// designed for unreliable datagram networks. tcp is implemented by 27// designed for unreliable datagram networks. tcp is implemented by
28// multiplexing packets over tcp. errors are completely ignored, as we 28// multiplexing packets over tcp. errors are completely ignored, as we
29// rely on the higher level protocol to time out and reconnect. 29// rely on the higher level layers to time out and reconnect.
30 30
31#include <cstring> 31#include <cstring>
32 32
33#include <sys/types.h> 33#include <sys/types.h>
34#include <sys/socket.h> 34#include <sys/socket.h>
… …
58 return *a < *b; 58 return *a < *b;
59 } 59 }
60}; 60};
61 61
62struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> { 62struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> {
63 void cleaner_cb (time_watcher &w); time_watcher cleaner; 63 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
64 64
65 tcp_si_map () 65 tcp_si_map ()
66 : cleaner(this, &tcp_si_map::cleaner_cb) 66 : cleaner(this, &tcp_si_map::cleaner_cb)
67 { } 67 {
68 cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2);
69 }
68 70
69} tcp_si; 71} tcp_si;
70 72
71struct tcp_connection : io_watcher { 73struct tcp_connection : ev::io {
72 tstamp last_activity; 74 tstamp last_activity;
73 const sockinfo si; 75 const sockinfo si;
74 vpn &v; 76 vpn &v;
75 bool active; // this connection has been actively established 77 bool active; // this connection has been actively established
76 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; 78 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
… …
84#if ENABLE_HTTP_PROXY 86#if ENABLE_HTTP_PROXY
85 char *proxy_req; 87 char *proxy_req;
86 int proxy_req_len; 88 int proxy_req_len;
87#endif 89#endif
88 90
89 void tcpv4_ev (io_watcher &w, short revents); 91 void tcpv4_ev (ev::io &w, int revents);
90 92
91 bool send_packet (vpn_packet *pkt, int tos); 93 bool send_packet (vpn_packet *pkt, int tos);
92 bool write_packet (); 94 bool write_packet ();
93 95
94 void error (); // abort conenction && cleanup 96 void error (); // abort conenction && cleanup
… …
100 102
101 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 103 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
102 ~tcp_connection (); 104 ~tcp_connection ();
103}; 105};
104 106
105void tcp_si_map::cleaner_cb (time_watcher &w) 107void tcp_si_map::cleaner_cb (ev::timer &w, int revents)
106{ 108{
107 w.start (NOW + 600);
108
109 tstamp to = NOW - ::conf.keepalive - 30 - 60; 109 tstamp to = ev_now () - ::conf.keepalive - 30 - 60;
110 110
111 for (iterator i = begin (); i != end(); ) 111 for (iterator i = begin (); i != end(); )
112 if (i->second->last_activity >= to) 112 if (i->second->last_activity >= to)
113 ++i; 113 ++i;
114 else 114 else
115 { 115 {
116 delete i->second;
116 erase (i); 117 erase (i);
117 i = begin (); 118 i = begin ();
118 } 119 }
119} 120}
120 121
121void 122void
122vpn::tcpv4_ev (io_watcher &w, short revents) 123vpn::tcpv4_ev (ev::io &w, int revents)
123{ 124{
124 if (revents & EVENT_READ) 125 if (revents & EV_READ)
125 { 126 {
126 struct sockaddr_in sa; 127 struct sockaddr_in sa;
127 socklen_t sa_len = sizeof (sa); 128 socklen_t sa_len = sizeof (sa);
128 int len; 129 int len;
129 130
130 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); 131 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len);
131 132
132 if (fd >= 0) 133 if (fd >= 0)
133 { 134 {
135 fcntl (fd, F_SETFL, O_NONBLOCK);
136 fcntl (fd, F_SETFD, FD_CLOEXEC);
137
134 sockinfo si(sa, PROT_TCPv4); 138 sockinfo si(sa, PROT_TCPv4);
135 139
136 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D 140 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
137
138 fcntl (fd, F_SETFL, O_NONBLOCK);
139 141
140 tcp_connection *i = new tcp_connection (fd, si, *this); 142 tcp_connection *i = new tcp_connection (fd, si, *this);
141 tcp_si.insert (*i); 143 tcp_si.insert (*i);
142 } 144 }
143 } 145 }
… …
197 return false; 199 return false;
198 } 200 }
199} 201}
200 202
201void 203void
202tcp_connection::tcpv4_ev (io_watcher &w, short revents) 204tcp_connection::tcpv4_ev (ev::io &w, int revents)
203{ 205{
204 last_activity = NOW; 206 last_activity = ev_now ();
205 207
206 if (revents & EVENT_WRITE) 208 if (revents & EV_WRITE)
207 { 209 {
208 if (state == CONNECTING) 210 if (state == CONNECTING)
209 { 211 {
210 state = ESTABLISHED; 212 state = ESTABLISHED;
211 set (EVENT_READ); 213 set (EV_READ);
212#if ENABLE_HTTP_PROXY 214#if ENABLE_HTTP_PROXY
213 if (::conf.proxy_host && ::conf.proxy_port) 215 if (::conf.proxy_host && ::conf.proxy_port)
214 { 216 {
215 state = CONNECTING_PROXY; 217 state = CONNECTING_PROXY;
216 218
… …
230 { 232 {
231 if (write_packet ()) 233 if (write_packet ())
232 { 234 {
233 delete w_pkt; w_pkt = 0; 235 delete w_pkt; w_pkt = 0;
234 236
235 set (EVENT_READ); 237 set (EV_READ);
236 } 238 }
237 } 239 }
238 else 240 else
239 set (EVENT_READ); 241 set (EV_READ);
240 } 242 }
241 else 243 else
242 set (EVENT_READ); 244 set (EV_READ);
243 } 245 }
244 246
245 if (revents & EVENT_READ) 247 if (revents & EV_READ)
246 { 248 {
247 if (state == ESTABLISHED) 249 if (state == ESTABLISHED)
248 for (;;) 250 for (;;)
249 { 251 {
250 if (!r_pkt) 252 if (!r_pkt)
… …
344} 346}
345 347
346bool 348bool
347tcp_connection::send_packet (vpn_packet *pkt, int tos) 349tcp_connection::send_packet (vpn_packet *pkt, int tos)
348{ 350{
349 last_activity = NOW; 351 last_activity = ev_now ();
350 352
351 if (state == IDLE) 353 if (state == IDLE)
352 { 354 {
353 // woaw, the first lost packet ;) 355 // woaw, the first lost packet ;)
354 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 356 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
… …
388 fcntl (fd, F_SETFL, O_NONBLOCK); 390 fcntl (fd, F_SETFL, O_NONBLOCK);
389 391
390 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0 392 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
391 || errno == EINPROGRESS) 393 || errno == EINPROGRESS)
392 { 394 {
395 fcntl (fd, F_SETFL, O_NONBLOCK);
396 fcntl (fd, F_SETFD, FD_CLOEXEC);
397
393 state = CONNECTING; 398 state = CONNECTING;
394 start (fd, EVENT_WRITE); 399 start (fd, EV_WRITE);
395 } 400 }
396 else 401 else
397 close (fd); 402 close (fd);
398 } 403 }
399 } 404 }
… …
418 else 423 else
419 { 424 {
420 w_pkt = new vpn_packet; 425 w_pkt = new vpn_packet;
421 w_pkt->set (*pkt); 426 w_pkt->set (*pkt);
422 427
423 set (EVENT_READ | EVENT_WRITE); 428 set (EV_READ | EV_WRITE);
424 } 429 }
425 } 430 }
426 } 431 }
427 432
428 return state != ERROR; 433 return state != ERROR;
429} 434}
430 435
431void tcp_connection::error () 436void tcp_connection::error ()
432{ 437{
438 stop ();
439
433 if (fd >= 0) 440 if (fd >= 0)
434 { 441 {
435 close (fd); 442 close (fd);
436 fd = -1; 443 fd = -1;
437 } 444 }
… …
440 delete w_pkt; w_pkt = 0; 447 delete w_pkt; w_pkt = 0;
441#if ENABLE_HTTP_PROXY 448#if ENABLE_HTTP_PROXY
442 free (proxy_req); proxy_req = 0; 449 free (proxy_req); proxy_req = 0;
443#endif 450#endif
444 451
445 stop ();
446 state = active ? IDLE : ERROR; 452 state = active ? IDLE : ERROR;
447} 453}
448 454
449tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 455tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
450: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 456: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev)
451{ 457{
452 if (!tcp_si.cleaner.active)
453 tcp_si.cleaner.start (0);
454
455 last_activity = NOW; 458 last_activity = ev_now ();
456 r_pkt = 0; 459 r_pkt = 0;
457 w_pkt = 0; 460 w_pkt = 0;
458 fd = fd_; 461 fd = fd_;
459#if ENABLE_HTTP_PROXY 462#if ENABLE_HTTP_PROXY
460 proxy_req = 0; 463 proxy_req = 0;
… …
467 } 470 }
468 else 471 else
469 { 472 {
470 active = false; 473 active = false;
471 state = ESTABLISHED; 474 state = ESTABLISHED;
472 start (fd, EVENT_READ); 475 start (fd, EV_READ);
473 } 476 }
474} 477}
475 478
476tcp_connection::~tcp_connection () 479tcp_connection::~tcp_connection ()
477{ 480{

Diff Legend

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