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

Diff Legend

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