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.12 by pcg, Thu Mar 3 16:54:34 2005 UTC vs.
Revision 1.17 by pcg, Sat Nov 10 05:14:23 2007 UTC

… …
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 15 GNU General Public License for more details.
16 16
17 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
18 along with gvpe; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
19 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
20*/ 20*/
21 21
22#include "config.h" 22#include "config.h"
23 23
24#if ENABLE_TCP 24#if ENABLE_TCP
… …
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 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
64 64
65 tcp_si_map () 65 tcp_si_map ()
66 : cleaner(this, &tcp_si_map::cleaner_cb) 66 : cleaner(this, &tcp_si_map::cleaner_cb)
67 { 67 {
68 cleaner.start (0); 68 cleaner.start (300, 300);
69 } 69 }
70
70} tcp_si; 71} tcp_si;
71 72
72struct tcp_connection : io_watcher { 73struct tcp_connection : ev::io {
73 tstamp last_activity; 74 tstamp last_activity;
74 const sockinfo si; 75 const sockinfo si;
75 vpn &v; 76 vpn &v;
76 bool active; // this connection has been actively established 77 bool active; // this connection has been actively established
77 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; 78 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
… …
85#if ENABLE_HTTP_PROXY 86#if ENABLE_HTTP_PROXY
86 char *proxy_req; 87 char *proxy_req;
87 int proxy_req_len; 88 int proxy_req_len;
88#endif 89#endif
89 90
90 void tcpv4_ev (io_watcher &w, short revents); 91 void tcpv4_ev (ev::io &w, int revents);
91 92
92 bool send_packet (vpn_packet *pkt, int tos); 93 bool send_packet (vpn_packet *pkt, int tos);
93 bool write_packet (); 94 bool write_packet ();
94 95
95 void error (); // abort conenction && cleanup 96 void error (); // abort conenction && cleanup
96 97
97 operator tcp_si_map::value_type() 98 operator tcp_si_map::value_type()
98 { 99 {
99 return tcp_si_map::value_type (&si, this); 100 return tcp_si_map::value_type (&si, this);
100 } 101 }
101 102
102 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 103 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
103 ~tcp_connection (); 104 ~tcp_connection ();
104}; 105};
105 106
106void tcp_si_map::cleaner_cb (time_watcher &w) 107void tcp_si_map::cleaner_cb (ev::timer &w, int revents)
107{ 108{
108 w.start (NOW + 600);
109
110 tstamp to = NOW - ::conf.keepalive - 30 - 60; 109 tstamp to = ev::ev_now () - ::conf.keepalive - 30 - 60;
111 110
112 for (iterator i = begin (); i != end(); ) 111 for (iterator i = begin (); i != end(); )
113 if (i->second->last_activity >= to) 112 if (i->second->last_activity >= to)
114 ++i; 113 ++i;
115 else 114 else
… …
118 i = begin (); 117 i = begin ();
119 } 118 }
120} 119}
121 120
122void 121void
123vpn::tcpv4_ev (io_watcher &w, short revents) 122vpn::tcpv4_ev (ev::io &w, int revents)
124{ 123{
125 if (revents & EVENT_READ) 124 if (revents & EV_READ)
126 { 125 {
127 struct sockaddr_in sa; 126 struct sockaddr_in sa;
128 socklen_t sa_len = sizeof (sa); 127 socklen_t sa_len = sizeof (sa);
129 int len; 128 int len;
130 129
131 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); 130 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len);
132 131
133 if (fd >= 0) 132 if (fd >= 0)
134 { 133 {
134 fcntl (fd, F_SETFL, O_NONBLOCK);
135 fcntl (fd, F_SETFD, FD_CLOEXEC);
136
135 sockinfo si(sa, PROT_TCPv4); 137 sockinfo si(sa, PROT_TCPv4);
136 138
137 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D 139 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
138
139 fcntl (fd, F_SETFL, O_NONBLOCK);
140 140
141 tcp_connection *i = new tcp_connection (fd, si, *this); 141 tcp_connection *i = new tcp_connection (fd, si, *this);
142 tcp_si.insert (*i); 142 tcp_si.insert (*i);
143 } 143 }
144 } 144 }
… …
198 return false; 198 return false;
199 } 199 }
200} 200}
201 201
202void 202void
203tcp_connection::tcpv4_ev (io_watcher &w, short revents) 203tcp_connection::tcpv4_ev (ev::io &w, int revents)
204{ 204{
205 last_activity = NOW; 205 last_activity = ev::ev_now ();
206 206
207 if (revents & EVENT_WRITE) 207 if (revents & EV_WRITE)
208 { 208 {
209 if (state == CONNECTING) 209 if (state == CONNECTING)
210 { 210 {
211 state = ESTABLISHED; 211 state = ESTABLISHED;
212 set (EVENT_READ); 212 set (EV_READ);
213#if ENABLE_HTTP_PROXY 213#if ENABLE_HTTP_PROXY
214 if (::conf.proxy_host && ::conf.proxy_port) 214 if (::conf.proxy_host && ::conf.proxy_port)
215 { 215 {
216 state = CONNECTING_PROXY; 216 state = CONNECTING_PROXY;
217 217
… …
231 { 231 {
232 if (write_packet ()) 232 if (write_packet ())
233 { 233 {
234 delete w_pkt; w_pkt = 0; 234 delete w_pkt; w_pkt = 0;
235 235
236 set (EVENT_READ); 236 set (EV_READ);
237 } 237 }
238 } 238 }
239 else 239 else
240 set (EVENT_READ); 240 set (EV_READ);
241 } 241 }
242 else 242 else
243 set (EVENT_READ); 243 set (EV_READ);
244 } 244 }
245 245
246 if (revents & EVENT_READ) 246 if (revents & EV_READ)
247 { 247 {
248 if (state == ESTABLISHED) 248 if (state == ESTABLISHED)
249 for (;;) 249 for (;;)
250 { 250 {
251 if (!r_pkt) 251 if (!r_pkt)
… …
345} 345}
346 346
347bool 347bool
348tcp_connection::send_packet (vpn_packet *pkt, int tos) 348tcp_connection::send_packet (vpn_packet *pkt, int tos)
349{ 349{
350 last_activity = NOW; 350 last_activity = ev::ev_now ();
351 351
352 if (state == IDLE) 352 if (state == IDLE)
353 { 353 {
354 // woaw, the first lost packet ;) 354 // woaw, the first lost packet ;)
355 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 355 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
… …
389 fcntl (fd, F_SETFL, O_NONBLOCK); 389 fcntl (fd, F_SETFL, O_NONBLOCK);
390 390
391 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0 391 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
392 || errno == EINPROGRESS) 392 || errno == EINPROGRESS)
393 { 393 {
394 fcntl (fd, F_SETFL, O_NONBLOCK);
395 fcntl (fd, F_SETFD, FD_CLOEXEC);
396
394 state = CONNECTING; 397 state = CONNECTING;
395 start (fd, EVENT_WRITE); 398 start (fd, EV_WRITE);
396 } 399 }
397 else 400 else
398 close (fd); 401 close (fd);
399 } 402 }
400 } 403 }
… …
419 else 422 else
420 { 423 {
421 w_pkt = new vpn_packet; 424 w_pkt = new vpn_packet;
422 w_pkt->set (*pkt); 425 w_pkt->set (*pkt);
423 426
424 set (EVENT_READ | EVENT_WRITE); 427 set (EV_READ | EV_WRITE);
425 } 428 }
426 } 429 }
427 } 430 }
428 431
429 return state != ERROR; 432 return state != ERROR;
… …
446 stop (); 449 stop ();
447 state = active ? IDLE : ERROR; 450 state = active ? IDLE : ERROR;
448} 451}
449 452
450tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 453tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
451: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 454: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev)
452{ 455{
453 last_activity = NOW; 456 if (!tcp_si.cleaner.active)
457 tcp_si.cleaner.start (0);
458
459 last_activity = ev::ev_now ();
454 r_pkt = 0; 460 r_pkt = 0;
455 w_pkt = 0; 461 w_pkt = 0;
456 fd = fd_; 462 fd = fd_;
457#if ENABLE_HTTP_PROXY 463#if ENABLE_HTTP_PROXY
458 proxy_req = 0; 464 proxy_req = 0;
… …
465 } 471 }
466 else 472 else
467 { 473 {
468 active = false; 474 active = false;
469 state = ESTABLISHED; 475 state = ESTABLISHED;
470 start (fd, EVENT_READ); 476 start (fd, EV_READ);
471 } 477 }
472} 478}
473 479
474tcp_connection::~tcp_connection () 480tcp_connection::~tcp_connection ()
475{ 481{

Diff Legend

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