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

Diff Legend

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