… | |
… | |
59 | } |
59 | } |
60 | }; |
60 | }; |
61 | |
61 | |
62 | struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> |
62 | struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> |
63 | { |
63 | { |
64 | void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; |
64 | inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; |
65 | |
65 | |
66 | tcp_si_map () |
66 | tcp_si_map () |
67 | : cleaner(this, &tcp_si_map::cleaner_cb) |
|
|
68 | { |
67 | { |
|
|
68 | ev_default_loop (0); |
|
|
69 | cleaner.set<tcp_si_map, &tcp_si_map::cleaner_cb> (this); |
69 | cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2); |
70 | cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2); |
70 | } |
71 | } |
71 | |
72 | |
72 | } tcp_si; |
73 | } tcp_si; |
73 | |
74 | |
… | |
… | |
89 | #if ENABLE_HTTP_PROXY |
90 | #if ENABLE_HTTP_PROXY |
90 | char *proxy_req; |
91 | char *proxy_req; |
91 | int proxy_req_len; |
92 | int proxy_req_len; |
92 | #endif |
93 | #endif |
93 | |
94 | |
94 | void tcpv4_ev (ev::io &w, int revents); |
95 | inline void tcpv4_ev (ev::io &w, int revents); |
95 | |
96 | |
96 | bool send_packet (vpn_packet *pkt, int tos); |
97 | bool send_packet (vpn_packet *pkt, int tos); |
97 | bool write_packet (); |
98 | bool write_packet (); |
98 | |
99 | |
99 | void error (); // abort conenction && cleanup |
100 | void error (); // abort conenction && cleanup |
… | |
… | |
459 | |
460 | |
460 | state = active ? IDLE : ERROR; |
461 | state = active ? IDLE : ERROR; |
461 | } |
462 | } |
462 | |
463 | |
463 | tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) |
464 | tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) |
464 | : v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev) |
465 | : v(v_), si(si_) |
465 | { |
466 | { |
|
|
467 | set<tcp_connection, &tcp_connection::tcpv4_ev> (this); |
|
|
468 | |
466 | last_activity = ev_now (); |
469 | last_activity = ev_now (); |
467 | r_pkt = 0; |
470 | r_pkt = 0; |
468 | w_pkt = 0; |
471 | w_pkt = 0; |
469 | tos = -1; |
472 | tos = -1; |
470 | fd = fd_; |
473 | fd = fd_; |