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.14 by pcg, Tue Apr 26 00:55:56 2005 UTC vs.
Revision 1.17 by pcg, Sat Nov 10 05:14:23 2007 UTC

… …
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 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
71struct tcp_connection : io_watcher { 73struct 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
105void tcp_si_map::cleaner_cb (time_watcher &w) 107void 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
121void 121void
122vpn::tcpv4_ev (io_watcher &w, short revents) 122vpn::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
130 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); 130 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len);
131 131
132 if (fd >= 0) 132 if (fd >= 0)
133 { 133 {
134 fcntl (fd, F_SETFL, O_NONBLOCK);
135 fcntl (fd, F_SETFD, FD_CLOEXEC);
136
134 sockinfo si(sa, PROT_TCPv4); 137 sockinfo si(sa, PROT_TCPv4);
135 138
136 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D 139 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
137
138 fcntl (fd, F_SETFL, O_NONBLOCK);
139 140
140 tcp_connection *i = new tcp_connection (fd, si, *this); 141 tcp_connection *i = new tcp_connection (fd, si, *this);
141 tcp_si.insert (*i); 142 tcp_si.insert (*i);
142 } 143 }
143 } 144 }
… …
197 return false; 198 return false;
198 } 199 }
199} 200}
200 201
201void 202void
202tcp_connection::tcpv4_ev (io_watcher &w, short revents) 203tcp_connection::tcpv4_ev (ev::io &w, int revents)
203{ 204{
204 last_activity = NOW; 205 last_activity = ev::ev_now ();
205 206
206 if (revents & EVENT_WRITE) 207 if (revents & EV_WRITE)
207 { 208 {
208 if (state == CONNECTING) 209 if (state == CONNECTING)
209 { 210 {
210 state = ESTABLISHED; 211 state = ESTABLISHED;
211 set (EVENT_READ); 212 set (EV_READ);
212#if ENABLE_HTTP_PROXY 213#if ENABLE_HTTP_PROXY
213 if (::conf.proxy_host && ::conf.proxy_port) 214 if (::conf.proxy_host && ::conf.proxy_port)
214 { 215 {
215 state = CONNECTING_PROXY; 216 state = CONNECTING_PROXY;
216 217
… …
230 { 231 {
231 if (write_packet ()) 232 if (write_packet ())
232 { 233 {
233 delete w_pkt; w_pkt = 0; 234 delete w_pkt; w_pkt = 0;
234 235
235 set (EVENT_READ); 236 set (EV_READ);
236 } 237 }
237 } 238 }
238 else 239 else
239 set (EVENT_READ); 240 set (EV_READ);
240 } 241 }
241 else 242 else
242 set (EVENT_READ); 243 set (EV_READ);
243 } 244 }
244 245
245 if (revents & EVENT_READ) 246 if (revents & EV_READ)
246 { 247 {
247 if (state == ESTABLISHED) 248 if (state == ESTABLISHED)
248 for (;;) 249 for (;;)
249 { 250 {
250 if (!r_pkt) 251 if (!r_pkt)
… …
344} 345}
345 346
346bool 347bool
347tcp_connection::send_packet (vpn_packet *pkt, int tos) 348tcp_connection::send_packet (vpn_packet *pkt, int tos)
348{ 349{
349 last_activity = NOW; 350 last_activity = ev::ev_now ();
350 351
351 if (state == IDLE) 352 if (state == IDLE)
352 { 353 {
353 // woaw, the first lost packet ;) 354 // woaw, the first lost packet ;)
354 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 355 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
… …
388 fcntl (fd, F_SETFL, O_NONBLOCK); 389 fcntl (fd, F_SETFL, O_NONBLOCK);
389 390
390 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0 391 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
391 || errno == EINPROGRESS) 392 || errno == EINPROGRESS)
392 { 393 {
394 fcntl (fd, F_SETFL, O_NONBLOCK);
395 fcntl (fd, F_SETFD, FD_CLOEXEC);
396
393 state = CONNECTING; 397 state = CONNECTING;
394 start (fd, EVENT_WRITE); 398 start (fd, EV_WRITE);
395 } 399 }
396 else 400 else
397 close (fd); 401 close (fd);
398 } 402 }
399 } 403 }
… …
418 else 422 else
419 { 423 {
420 w_pkt = new vpn_packet; 424 w_pkt = new vpn_packet;
421 w_pkt->set (*pkt); 425 w_pkt->set (*pkt);
422 426
423 set (EVENT_READ | EVENT_WRITE); 427 set (EV_READ | EV_WRITE);
424 } 428 }
425 } 429 }
426 } 430 }
427 431
428 return state != ERROR; 432 return state != ERROR;
… …
445 stop (); 449 stop ();
446 state = active ? IDLE : ERROR; 450 state = active ? IDLE : ERROR;
447} 451}
448 452
449tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 453tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
450: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 454: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev)
451{ 455{
452 if (!tcp_si.cleaner.active) 456 if (!tcp_si.cleaner.active)
453 tcp_si.cleaner.start (0); 457 tcp_si.cleaner.start (0);
454 458
455 last_activity = NOW; 459 last_activity = ev::ev_now ();
456 r_pkt = 0; 460 r_pkt = 0;
457 w_pkt = 0; 461 w_pkt = 0;
458 fd = fd_; 462 fd = fd_;
459#if ENABLE_HTTP_PROXY 463#if ENABLE_HTTP_PROXY
460 proxy_req = 0; 464 proxy_req = 0;
… …
467 } 471 }
468 else 472 else
469 { 473 {
470 active = false; 474 active = false;
471 state = ESTABLISHED; 475 state = ESTABLISHED;
472 start (fd, EVENT_READ); 476 start (fd, EV_READ);
473 } 477 }
474} 478}
475 479
476tcp_connection::~tcp_connection () 480tcp_connection::~tcp_connection ()
477{ 481{

Diff Legend

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