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.21 by pcg, Sun Dec 2 00:39:06 2007 UTC vs.
Revision 1.23 by pcg, Tue Dec 4 17:17:20 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 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);
68 cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2); 69 cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2);
69 } 70 }
70 71
71} tcp_si; 72} tcp_si;
72 73
73struct tcp_connection : ev::io { 74struct tcp_connection : ev::io
75{
74 int tos; 76 int tos;
75 tstamp last_activity; 77 tstamp last_activity;
76 const sockinfo si; 78 const sockinfo si;
77 vpn &v; 79 vpn &v;
78 bool active; // this connection has been actively established 80 bool active; // this connection has been actively established
457 459
458 state = active ? IDLE : ERROR; 460 state = active ? IDLE : ERROR;
459} 461}
460 462
461tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 463tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
462: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev) 464: v(v_), si(si_)
463{ 465{
466 set<tcp_connection, &tcp_connection::tcpv4_ev> (this);
467
464 last_activity = ev_now (); 468 last_activity = ev_now ();
465 r_pkt = 0; 469 r_pkt = 0;
466 w_pkt = 0; 470 w_pkt = 0;
467 tos = -1; 471 tos = -1;
468 fd = fd_; 472 fd = fd_;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines