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

Diff Legend

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