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

Diff Legend

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