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.10 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.25 by pcg, Wed Dec 12 00:17:13 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 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>
… …
55 { 57 {
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{
64 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
62 65
63 tcp_si_map () 66 tcp_si_map ()
64 : cleaner(this, &tcp_si_map::cleaner_cb)
65 { 67 {
66 cleaner.start (0); 68 ev_default_loop (0);
69 cleaner.set<tcp_si_map, &tcp_si_map::cleaner_cb> (this);
70 cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2);
67 } 71 }
72
68} tcp_si; 73} tcp_si;
69 74
70struct tcp_connection : io_watcher { 75struct tcp_connection : ev::io
76{
77 int tos;
71 tstamp last_activity; 78 tstamp last_activity;
72 const sockinfo si; 79 const sockinfo si;
73 vpn &v; 80 vpn &v;
74 bool active; // this connection has been actively established 81 bool active; // this connection has been actively established
75 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; 82 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
… …
83#if ENABLE_HTTP_PROXY 90#if ENABLE_HTTP_PROXY
84 char *proxy_req; 91 char *proxy_req;
85 int proxy_req_len; 92 int proxy_req_len;
86#endif 93#endif
87 94
88 void tcpv4_ev (io_watcher &w, short revents); 95 inline void tcpv4_ev (ev::io &w, int revents);
89 96
90 bool send_packet (vpn_packet *pkt, int tos); 97 bool send_packet (vpn_packet *pkt, int tos);
91 bool write_packet (); 98 bool write_packet ();
92 99
93 void error (); // abort conenction && cleanup 100 void error (); // abort conenction && cleanup
94 101
95 operator tcp_si_map::value_type() 102 operator tcp_si_map::value_type()
96 { 103 {
97 return tcp_si_map::value_type (&si, this); 104 return tcp_si_map::value_type (&si, this);
98 } 105 }
99 106
100 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 107 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
101 ~tcp_connection (); 108 ~tcp_connection ();
102}; 109};
103 110
104void tcp_si_map::cleaner_cb (time_watcher &w) 111void tcp_si_map::cleaner_cb (ev::timer &w, int revents)
105{ 112{
106 w.at = NOW + 600;
107 tstamp to = NOW - ::conf.keepalive - 30 - 60; 113 tstamp to = ev_now () - ::conf.keepalive - 30 - 60;
108 114
109 for (iterator i = begin (); i != end(); ) 115 for (iterator i = begin (); i != end(); )
110 if (i->second->last_activity >= to) 116 if (i->second->last_activity >= to)
111 ++i; 117 ++i;
112 else 118 else
113 { 119 {
120 delete i->second;
114 erase (i); 121 erase (i);
115 i = begin (); 122 i = begin ();
116 } 123 }
117} 124}
118 125
119void 126void
120vpn::tcpv4_ev (io_watcher &w, short revents) 127vpn::tcpv4_ev (ev::io &w, int revents)
121{ 128{
122 if (revents & (POLLIN | POLLERR)) 129 if (revents & EV_READ)
123 { 130 {
124 struct sockaddr_in sa; 131 struct sockaddr_in sa;
125 socklen_t sa_len = sizeof (sa); 132 socklen_t sa_len = sizeof (sa);
126 int len; 133 int len;
127 134
128 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); 135 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len);
129 136
130 if (fd >= 0) 137 if (fd >= 0)
131 { 138 {
139 fcntl (fd, F_SETFL, O_NONBLOCK);
140 fcntl (fd, F_SETFD, FD_CLOEXEC);
141
132 sockinfo si(sa, PROT_TCPv4); 142 sockinfo si(sa, PROT_TCPv4);
133 143
134 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D 144 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
135
136 fcntl (fd, F_SETFL, O_NONBLOCK);
137 145
138 tcp_connection *i = new tcp_connection (fd, si, *this); 146 tcp_connection *i = new tcp_connection (fd, si, *this);
139 tcp_si.insert (*i); 147 tcp_si.insert (*i);
140 } 148 }
141 } 149 }
… …
195 return false; 203 return false;
196 } 204 }
197} 205}
198 206
199void 207void
200tcp_connection::tcpv4_ev (io_watcher &w, short revents) 208tcp_connection::tcpv4_ev (ev::io &w, int revents)
201{ 209{
202 last_activity = NOW; 210 last_activity = ev_now ();
203 211
204 if (revents & (POLLERR | POLLHUP)) 212 if (revents & EV_WRITE)
205 {
206 error ();
207 return;
208 }
209
210 if (revents & POLLOUT)
211 { 213 {
212 if (state == CONNECTING) 214 if (state == CONNECTING)
213 { 215 {
214 state = ESTABLISHED; 216 state = ESTABLISHED;
215 set (POLLIN); 217 set (EV_READ);
216#if ENABLE_HTTP_PROXY 218#if ENABLE_HTTP_PROXY
217 if (::conf.proxy_host && ::conf.proxy_port) 219 if (::conf.proxy_host && ::conf.proxy_port)
218 { 220 {
219 state = CONNECTING_PROXY; 221 state = CONNECTING_PROXY;
222
220 write (fd, proxy_req, proxy_req_len); 223 if (write (fd, proxy_req, proxy_req_len) == 0)
224 {
225 error ();
226 return;
227 }
228
221 free (proxy_req); proxy_req = 0; 229 free (proxy_req); proxy_req = 0;
222 } 230 }
223#endif 231#endif
224 } 232 }
225 else if (state == ESTABLISHED) 233 else if (state == ESTABLISHED)
… …
228 { 236 {
229 if (write_packet ()) 237 if (write_packet ())
230 { 238 {
231 delete w_pkt; w_pkt = 0; 239 delete w_pkt; w_pkt = 0;
232 240
233 set (POLLIN); 241 set (EV_READ);
234 } 242 }
235 } 243 }
236 else 244 else
237 set (POLLIN); 245 set (EV_READ);
238 } 246 }
239 else 247 else
240 set (POLLIN); 248 set (EV_READ);
241 } 249 }
242 250
243 if (revents & POLLIN) 251 if (revents & EV_READ)
244 { 252 {
245 if (state == ESTABLISHED) 253 if (state == ESTABLISHED)
246 for (;;) 254 for (;;)
247 { 255 {
248 if (!r_pkt) 256 if (!r_pkt)
… …
282 break; 290 break;
283 } 291 }
284 else if (len < 0 && (errno == EINTR || errno == EAGAIN)) 292 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
285 break; 293 break;
286 294
295 // len == 0 <-> EOF
287 error (); 296 error ();
288 break; 297 break;
289 } 298 }
290#if ENABLE_HTTP_PROXY 299#if ENABLE_HTTP_PROXY
291 else if (state == CONNECTING_PROXY) 300 else if (state == CONNECTING_PROXY)
… …
341} 350}
342 351
343bool 352bool
344tcp_connection::send_packet (vpn_packet *pkt, int tos) 353tcp_connection::send_packet (vpn_packet *pkt, int tos)
345{ 354{
346 last_activity = NOW; 355 last_activity = ev_now ();
347 356
348 if (state == IDLE) 357 if (state == IDLE)
349 { 358 {
350 // woaw, the first lost packet ;) 359 // woaw, the first lost packet ;)
351 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 360 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
… …
385 fcntl (fd, F_SETFL, O_NONBLOCK); 394 fcntl (fd, F_SETFL, O_NONBLOCK);
386 395
387 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0 396 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
388 || errno == EINPROGRESS) 397 || errno == EINPROGRESS)
389 { 398 {
399 fcntl (fd, F_SETFL, O_NONBLOCK);
400 fcntl (fd, F_SETFD, FD_CLOEXEC);
401
390 state = CONNECTING; 402 state = CONNECTING;
391 start (fd, POLLOUT); 403 start (fd, EV_WRITE);
392 } 404 }
393 else 405 else
394 close (fd); 406 close (fd);
395 } 407 }
396 } 408 }
… …
401 if (!w_pkt) 413 if (!w_pkt)
402 { 414 {
403 // how this maps to the underlying tcp packets we don't know 415 // how this maps to the underlying tcp packets we don't know
404 // and we don't care. at least we tried ;) 416 // and we don't care. at least we tried ;)
405#if defined(SOL_IP) && defined(IP_TOS) 417#if defined(SOL_IP) && defined(IP_TOS)
418 if (tos != this->tos)
419 {
420 this->tos = tos;
406 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); 421 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
422 }
407#endif 423#endif
408 424
409 w_pkt = pkt; 425 w_pkt = pkt;
410 w_ofs = 0; 426 w_ofs = 0;
411 w_len = pkt->len + 2; // length + size header 427 w_len = pkt->len + 2; // length + size header
… …
415 else 431 else
416 { 432 {
417 w_pkt = new vpn_packet; 433 w_pkt = new vpn_packet;
418 w_pkt->set (*pkt); 434 w_pkt->set (*pkt);
419 435
420 set (POLLIN | POLLOUT); 436 set (EV_READ | EV_WRITE);
421 } 437 }
422 } 438 }
423 } 439 }
424 440
425 return state != ERROR; 441 return state != ERROR;
426} 442}
427 443
428void tcp_connection::error () 444void tcp_connection::error ()
429{ 445{
446 stop ();
447
430 if (fd >= 0) 448 if (fd >= 0)
431 { 449 {
432 close (fd); 450 close (fd);
451 tos = -1;
433 fd = -1; 452 fd = -1;
434 } 453 }
435 454
436 delete r_pkt; r_pkt = 0; 455 delete r_pkt; r_pkt = 0;
437 delete w_pkt; w_pkt = 0; 456 delete w_pkt; w_pkt = 0;
438#if ENABLE_HTTP_PROXY 457#if ENABLE_HTTP_PROXY
439 free (proxy_req); proxy_req = 0; 458 free (proxy_req); proxy_req = 0;
440#endif 459#endif
441 460
442 stop ();
443 state = active ? IDLE : ERROR; 461 state = active ? IDLE : ERROR;
444} 462}
445 463
446tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 464tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
447: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 465: v(v_), si(si_)
448{ 466{
467 set<tcp_connection, &tcp_connection::tcpv4_ev> (this);
468
449 last_activity = NOW; 469 last_activity = ev_now ();
450 r_pkt = 0; 470 r_pkt = 0;
451 w_pkt = 0; 471 w_pkt = 0;
472 tos = -1;
452 fd = fd_; 473 fd = fd_;
453#if ENABLE_HTTP_PROXY 474#if ENABLE_HTTP_PROXY
454 proxy_req = 0; 475 proxy_req = 0;
455#endif 476#endif
456 477
… …
461 } 482 }
462 else 483 else
463 { 484 {
464 active = false; 485 active = false;
465 state = ESTABLISHED; 486 state = ESTABLISHED;
466 start (fd, POLLIN); 487 start (fd, EV_READ);
467 } 488 }
468} 489}
469 490
470tcp_connection::~tcp_connection () 491tcp_connection::~tcp_connection ()
471{ 492{

Diff Legend

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