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.20 by pcg, Sat Dec 1 23:35:31 2007 UTC vs.
Revision 1.25 by pcg, Wed Dec 12 00:17:13 2007 UTC

… …
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{
63 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; 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);
68 cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2); 70 cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2);
69 } 71 }
70 72
71} tcp_si; 73} tcp_si;
72 74
73struct tcp_connection : ev::io { 75struct tcp_connection : ev::io
76{
77 int tos;
74 tstamp last_activity; 78 tstamp last_activity;
75 const sockinfo si; 79 const sockinfo si;
76 vpn &v; 80 vpn &v;
77 bool active; // this connection has been actively established 81 bool active; // this connection has been actively established
78 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; 82 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
… …
86#if ENABLE_HTTP_PROXY 90#if ENABLE_HTTP_PROXY
87 char *proxy_req; 91 char *proxy_req;
88 int proxy_req_len; 92 int proxy_req_len;
89#endif 93#endif
90 94
91 void tcpv4_ev (ev::io &w, int revents); 95 inline void tcpv4_ev (ev::io &w, int revents);
92 96
93 bool send_packet (vpn_packet *pkt, int tos); 97 bool send_packet (vpn_packet *pkt, int tos);
94 bool write_packet (); 98 bool write_packet ();
95 99
96 void error (); // abort conenction && cleanup 100 void error (); // abort conenction && cleanup
… …
409 if (!w_pkt) 413 if (!w_pkt)
410 { 414 {
411 // 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
412 // and we don't care. at least we tried ;) 416 // and we don't care. at least we tried ;)
413#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;
414 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); 421 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
422 }
415#endif 423#endif
416 424
417 w_pkt = pkt; 425 w_pkt = pkt;
418 w_ofs = 0; 426 w_ofs = 0;
419 w_len = pkt->len + 2; // length + size header 427 w_len = pkt->len + 2; // length + size header
… …
438 stop (); 446 stop ();
439 447
440 if (fd >= 0) 448 if (fd >= 0)
441 { 449 {
442 close (fd); 450 close (fd);
451 tos = -1;
443 fd = -1; 452 fd = -1;
444 } 453 }
445 454
446 delete r_pkt; r_pkt = 0; 455 delete r_pkt; r_pkt = 0;
447 delete w_pkt; w_pkt = 0; 456 delete w_pkt; w_pkt = 0;
448#if ENABLE_HTTP_PROXY 457#if ENABLE_HTTP_PROXY
… …
451 460
452 state = active ? IDLE : ERROR; 461 state = active ? IDLE : ERROR;
453} 462}
454 463
455tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 464tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
456: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev) 465: v(v_), si(si_)
457{ 466{
467 set<tcp_connection, &tcp_connection::tcpv4_ev> (this);
468
458 last_activity = ev_now (); 469 last_activity = ev_now ();
459 r_pkt = 0; 470 r_pkt = 0;
460 w_pkt = 0; 471 w_pkt = 0;
472 tos = -1;
461 fd = fd_; 473 fd = fd_;
462#if ENABLE_HTTP_PROXY 474#if ENABLE_HTTP_PROXY
463 proxy_req = 0; 475 proxy_req = 0;
464#endif 476#endif
465 477

Diff Legend

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