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.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{
74 int tos; 77 int tos;
75 tstamp last_activity; 78 tstamp last_activity;
76 const sockinfo si; 79 const sockinfo si;
77 vpn &v; 80 vpn &v;
78 bool active; // this connection has been actively established 81 bool active; // this connection has been actively established
87#if ENABLE_HTTP_PROXY 90#if ENABLE_HTTP_PROXY
88 char *proxy_req; 91 char *proxy_req;
89 int proxy_req_len; 92 int proxy_req_len;
90#endif 93#endif
91 94
92 void tcpv4_ev (ev::io &w, int revents); 95 inline void tcpv4_ev (ev::io &w, int revents);
93 96
94 bool send_packet (vpn_packet *pkt, int tos); 97 bool send_packet (vpn_packet *pkt, int tos);
95 bool write_packet (); 98 bool write_packet ();
96 99
97 void error (); // abort conenction && cleanup 100 void error (); // abort conenction && cleanup
457 460
458 state = active ? IDLE : ERROR; 461 state = active ? IDLE : ERROR;
459} 462}
460 463
461tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 464tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
462: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev) 465: v(v_), si(si_)
463{ 466{
467 set<tcp_connection, &tcp_connection::tcpv4_ev> (this);
468
464 last_activity = ev_now (); 469 last_activity = ev_now ();
465 r_pkt = 0; 470 r_pkt = 0;
466 w_pkt = 0; 471 w_pkt = 0;
467 tos = -1; 472 tos = -1;
468 fd = fd_; 473 fd = fd_;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines