… | |
… | |
58 | return *a < *b; |
58 | return *a < *b; |
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 | void cleaner_cb (time_watcher &w); time_watcher cleaner; |
63 | void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; |
64 | |
64 | |
65 | tcp_si_map () |
65 | tcp_si_map () |
66 | : cleaner(this, &tcp_si_map::cleaner_cb) |
66 | : cleaner(this, &tcp_si_map::cleaner_cb) |
67 | { } |
67 | { |
|
|
68 | cleaner.start (300, 300); |
|
|
69 | } |
68 | |
70 | |
69 | } tcp_si; |
71 | } tcp_si; |
70 | |
72 | |
71 | struct tcp_connection : io_watcher { |
73 | struct tcp_connection : ev::io { |
72 | tstamp last_activity; |
74 | tstamp last_activity; |
73 | const sockinfo si; |
75 | const sockinfo si; |
74 | vpn &v; |
76 | vpn &v; |
75 | bool active; // this connection has been actively established |
77 | bool active; // this connection has been actively established |
76 | enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; |
78 | enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; |
… | |
… | |
84 | #if ENABLE_HTTP_PROXY |
86 | #if ENABLE_HTTP_PROXY |
85 | char *proxy_req; |
87 | char *proxy_req; |
86 | int proxy_req_len; |
88 | int proxy_req_len; |
87 | #endif |
89 | #endif |
88 | |
90 | |
89 | void tcpv4_ev (io_watcher &w, short revents); |
91 | void tcpv4_ev (ev::io &w, int revents); |
90 | |
92 | |
91 | bool send_packet (vpn_packet *pkt, int tos); |
93 | bool send_packet (vpn_packet *pkt, int tos); |
92 | bool write_packet (); |
94 | bool write_packet (); |
93 | |
95 | |
94 | void error (); // abort conenction && cleanup |
96 | void error (); // abort conenction && cleanup |
… | |
… | |
100 | |
102 | |
101 | tcp_connection (int fd_, const sockinfo &si_, vpn &v_); |
103 | tcp_connection (int fd_, const sockinfo &si_, vpn &v_); |
102 | ~tcp_connection (); |
104 | ~tcp_connection (); |
103 | }; |
105 | }; |
104 | |
106 | |
105 | void tcp_si_map::cleaner_cb (time_watcher &w) |
107 | void tcp_si_map::cleaner_cb (ev::timer &w, int revents) |
106 | { |
108 | { |
107 | w.start (NOW + 600); |
|
|
108 | |
|
|
109 | tstamp to = NOW - ::conf.keepalive - 30 - 60; |
109 | tstamp to = ev::ev_now () - ::conf.keepalive - 30 - 60; |
110 | |
110 | |
111 | for (iterator i = begin (); i != end(); ) |
111 | for (iterator i = begin (); i != end(); ) |
112 | if (i->second->last_activity >= to) |
112 | if (i->second->last_activity >= to) |
113 | ++i; |
113 | ++i; |
114 | else |
114 | else |
… | |
… | |
117 | i = begin (); |
117 | i = begin (); |
118 | } |
118 | } |
119 | } |
119 | } |
120 | |
120 | |
121 | void |
121 | void |
122 | vpn::tcpv4_ev (io_watcher &w, short revents) |
122 | vpn::tcpv4_ev (ev::io &w, int revents) |
123 | { |
123 | { |
124 | if (revents & EVENT_READ) |
124 | if (revents & EV_READ) |
125 | { |
125 | { |
126 | struct sockaddr_in sa; |
126 | struct sockaddr_in sa; |
127 | socklen_t sa_len = sizeof (sa); |
127 | socklen_t sa_len = sizeof (sa); |
128 | int len; |
128 | int len; |
129 | |
129 | |
… | |
… | |
198 | return false; |
198 | return false; |
199 | } |
199 | } |
200 | } |
200 | } |
201 | |
201 | |
202 | void |
202 | void |
203 | tcp_connection::tcpv4_ev (io_watcher &w, short revents) |
203 | tcp_connection::tcpv4_ev (ev::io &w, int revents) |
204 | { |
204 | { |
205 | last_activity = NOW; |
205 | last_activity = ev::ev_now (); |
206 | |
206 | |
207 | if (revents & EVENT_WRITE) |
207 | if (revents & EV_WRITE) |
208 | { |
208 | { |
209 | if (state == CONNECTING) |
209 | if (state == CONNECTING) |
210 | { |
210 | { |
211 | state = ESTABLISHED; |
211 | state = ESTABLISHED; |
212 | set (EVENT_READ); |
212 | set (EV_READ); |
213 | #if ENABLE_HTTP_PROXY |
213 | #if ENABLE_HTTP_PROXY |
214 | if (::conf.proxy_host && ::conf.proxy_port) |
214 | if (::conf.proxy_host && ::conf.proxy_port) |
215 | { |
215 | { |
216 | state = CONNECTING_PROXY; |
216 | state = CONNECTING_PROXY; |
217 | |
217 | |
… | |
… | |
231 | { |
231 | { |
232 | if (write_packet ()) |
232 | if (write_packet ()) |
233 | { |
233 | { |
234 | delete w_pkt; w_pkt = 0; |
234 | delete w_pkt; w_pkt = 0; |
235 | |
235 | |
236 | set (EVENT_READ); |
236 | set (EV_READ); |
237 | } |
237 | } |
238 | } |
238 | } |
239 | else |
239 | else |
240 | set (EVENT_READ); |
240 | set (EV_READ); |
241 | } |
241 | } |
242 | else |
242 | else |
243 | set (EVENT_READ); |
243 | set (EV_READ); |
244 | } |
244 | } |
245 | |
245 | |
246 | if (revents & EVENT_READ) |
246 | if (revents & EV_READ) |
247 | { |
247 | { |
248 | if (state == ESTABLISHED) |
248 | if (state == ESTABLISHED) |
249 | for (;;) |
249 | for (;;) |
250 | { |
250 | { |
251 | if (!r_pkt) |
251 | if (!r_pkt) |
… | |
… | |
345 | } |
345 | } |
346 | |
346 | |
347 | bool |
347 | bool |
348 | tcp_connection::send_packet (vpn_packet *pkt, int tos) |
348 | tcp_connection::send_packet (vpn_packet *pkt, int tos) |
349 | { |
349 | { |
350 | last_activity = NOW; |
350 | last_activity = ev::ev_now (); |
351 | |
351 | |
352 | if (state == IDLE) |
352 | if (state == IDLE) |
353 | { |
353 | { |
354 | // woaw, the first lost packet ;) |
354 | // woaw, the first lost packet ;) |
355 | fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); |
355 | fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); |
… | |
… | |
393 | { |
393 | { |
394 | fcntl (fd, F_SETFL, O_NONBLOCK); |
394 | fcntl (fd, F_SETFL, O_NONBLOCK); |
395 | fcntl (fd, F_SETFD, FD_CLOEXEC); |
395 | fcntl (fd, F_SETFD, FD_CLOEXEC); |
396 | |
396 | |
397 | state = CONNECTING; |
397 | state = CONNECTING; |
398 | start (fd, EVENT_WRITE); |
398 | start (fd, EV_WRITE); |
399 | } |
399 | } |
400 | else |
400 | else |
401 | close (fd); |
401 | close (fd); |
402 | } |
402 | } |
403 | } |
403 | } |
… | |
… | |
422 | else |
422 | else |
423 | { |
423 | { |
424 | w_pkt = new vpn_packet; |
424 | w_pkt = new vpn_packet; |
425 | w_pkt->set (*pkt); |
425 | w_pkt->set (*pkt); |
426 | |
426 | |
427 | set (EVENT_READ | EVENT_WRITE); |
427 | set (EV_READ | EV_WRITE); |
428 | } |
428 | } |
429 | } |
429 | } |
430 | } |
430 | } |
431 | |
431 | |
432 | return state != ERROR; |
432 | return state != ERROR; |
… | |
… | |
449 | stop (); |
449 | stop (); |
450 | state = active ? IDLE : ERROR; |
450 | state = active ? IDLE : ERROR; |
451 | } |
451 | } |
452 | |
452 | |
453 | tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) |
453 | tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) |
454 | : v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) |
454 | : v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev) |
455 | { |
455 | { |
456 | if (!tcp_si.cleaner.active) |
456 | if (!tcp_si.cleaner.active) |
457 | tcp_si.cleaner.start (0); |
457 | tcp_si.cleaner.start (0); |
458 | |
458 | |
459 | last_activity = NOW; |
459 | last_activity = ev::ev_now (); |
460 | r_pkt = 0; |
460 | r_pkt = 0; |
461 | w_pkt = 0; |
461 | w_pkt = 0; |
462 | fd = fd_; |
462 | fd = fd_; |
463 | #if ENABLE_HTTP_PROXY |
463 | #if ENABLE_HTTP_PROXY |
464 | proxy_req = 0; |
464 | proxy_req = 0; |
… | |
… | |
471 | } |
471 | } |
472 | else |
472 | else |
473 | { |
473 | { |
474 | active = false; |
474 | active = false; |
475 | state = ESTABLISHED; |
475 | state = ESTABLISHED; |
476 | start (fd, EVENT_READ); |
476 | start (fd, EV_READ); |
477 | } |
477 | } |
478 | } |
478 | } |
479 | |
479 | |
480 | tcp_connection::~tcp_connection () |
480 | tcp_connection::~tcp_connection () |
481 | { |
481 | { |