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

Diff Legend

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