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.10 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.17 by pcg, Sat Nov 10 05:14:23 2007 UTC

1/* 1/*
2 vpn_tcp.C -- handle the tcp part of the protocol. 2 vpn_tcp.C -- handle the tcp part of the protocol.
3 Copyright (C) 2003 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your option) any later version.
9 11
10 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 15 GNU General Public License for more details.
14 16
15 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21 23
22#if ENABLE_TCP 24#if ENABLE_TCP
… …
56 return *a < *b; 58 return *a < *b;
57 } 59 }
58}; 60};
59 61
60struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> { 62struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> {
61 void cleaner_cb (time_watcher &w); time_watcher cleaner; 63 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
62 64
63 tcp_si_map () 65 tcp_si_map ()
64 : cleaner(this, &tcp_si_map::cleaner_cb) 66 : cleaner(this, &tcp_si_map::cleaner_cb)
65 { 67 {
66 cleaner.start (0); 68 cleaner.start (300, 300);
67 } 69 }
70
68} tcp_si; 71} tcp_si;
69 72
70struct tcp_connection : io_watcher { 73struct tcp_connection : ev::io {
71 tstamp last_activity; 74 tstamp last_activity;
72 const sockinfo si; 75 const sockinfo si;
73 vpn &v; 76 vpn &v;
74 bool active; // this connection has been actively established 77 bool active; // this connection has been actively established
75 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; 78 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
… …
83#if ENABLE_HTTP_PROXY 86#if ENABLE_HTTP_PROXY
84 char *proxy_req; 87 char *proxy_req;
85 int proxy_req_len; 88 int proxy_req_len;
86#endif 89#endif
87 90
88 void tcpv4_ev (io_watcher &w, short revents); 91 void tcpv4_ev (ev::io &w, int revents);
89 92
90 bool send_packet (vpn_packet *pkt, int tos); 93 bool send_packet (vpn_packet *pkt, int tos);
91 bool write_packet (); 94 bool write_packet ();
92 95
93 void error (); // abort conenction && cleanup 96 void error (); // abort conenction && cleanup
94 97
95 operator tcp_si_map::value_type() 98 operator tcp_si_map::value_type()
96 { 99 {
97 return tcp_si_map::value_type (&si, this); 100 return tcp_si_map::value_type (&si, this);
98 } 101 }
99 102
100 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 103 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
101 ~tcp_connection (); 104 ~tcp_connection ();
102}; 105};
103 106
104void tcp_si_map::cleaner_cb (time_watcher &w) 107void tcp_si_map::cleaner_cb (ev::timer &w, int revents)
105{ 108{
106 w.at = NOW + 600;
107 tstamp to = NOW - ::conf.keepalive - 30 - 60; 109 tstamp to = ev::ev_now () - ::conf.keepalive - 30 - 60;
108 110
109 for (iterator i = begin (); i != end(); ) 111 for (iterator i = begin (); i != end(); )
110 if (i->second->last_activity >= to) 112 if (i->second->last_activity >= to)
111 ++i; 113 ++i;
112 else 114 else
… …
115 i = begin (); 117 i = begin ();
116 } 118 }
117} 119}
118 120
119void 121void
120vpn::tcpv4_ev (io_watcher &w, short revents) 122vpn::tcpv4_ev (ev::io &w, int revents)
121{ 123{
122 if (revents & (POLLIN | POLLERR)) 124 if (revents & EV_READ)
123 { 125 {
124 struct sockaddr_in sa; 126 struct sockaddr_in sa;
125 socklen_t sa_len = sizeof (sa); 127 socklen_t sa_len = sizeof (sa);
126 int len; 128 int len;
127 129
128 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); 130 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len);
129 131
130 if (fd >= 0) 132 if (fd >= 0)
131 { 133 {
134 fcntl (fd, F_SETFL, O_NONBLOCK);
135 fcntl (fd, F_SETFD, FD_CLOEXEC);
136
132 sockinfo si(sa, PROT_TCPv4); 137 sockinfo si(sa, PROT_TCPv4);
133 138
134 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D 139 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
135
136 fcntl (fd, F_SETFL, O_NONBLOCK);
137 140
138 tcp_connection *i = new tcp_connection (fd, si, *this); 141 tcp_connection *i = new tcp_connection (fd, si, *this);
139 tcp_si.insert (*i); 142 tcp_si.insert (*i);
140 } 143 }
141 } 144 }
… …
195 return false; 198 return false;
196 } 199 }
197} 200}
198 201
199void 202void
200tcp_connection::tcpv4_ev (io_watcher &w, short revents) 203tcp_connection::tcpv4_ev (ev::io &w, int revents)
201{ 204{
202 last_activity = NOW; 205 last_activity = ev::ev_now ();
203 206
204 if (revents & (POLLERR | POLLHUP)) 207 if (revents & EV_WRITE)
205 {
206 error ();
207 return;
208 }
209
210 if (revents & POLLOUT)
211 { 208 {
212 if (state == CONNECTING) 209 if (state == CONNECTING)
213 { 210 {
214 state = ESTABLISHED; 211 state = ESTABLISHED;
215 set (POLLIN); 212 set (EV_READ);
216#if ENABLE_HTTP_PROXY 213#if ENABLE_HTTP_PROXY
217 if (::conf.proxy_host && ::conf.proxy_port) 214 if (::conf.proxy_host && ::conf.proxy_port)
218 { 215 {
219 state = CONNECTING_PROXY; 216 state = CONNECTING_PROXY;
217
220 write (fd, proxy_req, proxy_req_len); 218 if (write (fd, proxy_req, proxy_req_len) == 0)
219 {
220 error ();
221 return;
222 }
223
221 free (proxy_req); proxy_req = 0; 224 free (proxy_req); proxy_req = 0;
222 } 225 }
223#endif 226#endif
224 } 227 }
225 else if (state == ESTABLISHED) 228 else if (state == ESTABLISHED)
… …
228 { 231 {
229 if (write_packet ()) 232 if (write_packet ())
230 { 233 {
231 delete w_pkt; w_pkt = 0; 234 delete w_pkt; w_pkt = 0;
232 235
233 set (POLLIN); 236 set (EV_READ);
234 } 237 }
235 } 238 }
236 else 239 else
237 set (POLLIN); 240 set (EV_READ);
238 } 241 }
239 else 242 else
240 set (POLLIN); 243 set (EV_READ);
241 } 244 }
242 245
243 if (revents & POLLIN) 246 if (revents & EV_READ)
244 { 247 {
245 if (state == ESTABLISHED) 248 if (state == ESTABLISHED)
246 for (;;) 249 for (;;)
247 { 250 {
248 if (!r_pkt) 251 if (!r_pkt)
… …
282 break; 285 break;
283 } 286 }
284 else if (len < 0 && (errno == EINTR || errno == EAGAIN)) 287 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
285 break; 288 break;
286 289
290 // len == 0 <-> EOF
287 error (); 291 error ();
288 break; 292 break;
289 } 293 }
290#if ENABLE_HTTP_PROXY 294#if ENABLE_HTTP_PROXY
291 else if (state == CONNECTING_PROXY) 295 else if (state == CONNECTING_PROXY)
… …
341} 345}
342 346
343bool 347bool
344tcp_connection::send_packet (vpn_packet *pkt, int tos) 348tcp_connection::send_packet (vpn_packet *pkt, int tos)
345{ 349{
346 last_activity = NOW; 350 last_activity = ev::ev_now ();
347 351
348 if (state == IDLE) 352 if (state == IDLE)
349 { 353 {
350 // woaw, the first lost packet ;) 354 // woaw, the first lost packet ;)
351 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 355 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
… …
385 fcntl (fd, F_SETFL, O_NONBLOCK); 389 fcntl (fd, F_SETFL, O_NONBLOCK);
386 390
387 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0 391 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
388 || errno == EINPROGRESS) 392 || errno == EINPROGRESS)
389 { 393 {
394 fcntl (fd, F_SETFL, O_NONBLOCK);
395 fcntl (fd, F_SETFD, FD_CLOEXEC);
396
390 state = CONNECTING; 397 state = CONNECTING;
391 start (fd, POLLOUT); 398 start (fd, EV_WRITE);
392 } 399 }
393 else 400 else
394 close (fd); 401 close (fd);
395 } 402 }
396 } 403 }
… …
415 else 422 else
416 { 423 {
417 w_pkt = new vpn_packet; 424 w_pkt = new vpn_packet;
418 w_pkt->set (*pkt); 425 w_pkt->set (*pkt);
419 426
420 set (POLLIN | POLLOUT); 427 set (EV_READ | EV_WRITE);
421 } 428 }
422 } 429 }
423 } 430 }
424 431
425 return state != ERROR; 432 return state != ERROR;
… …
442 stop (); 449 stop ();
443 state = active ? IDLE : ERROR; 450 state = active ? IDLE : ERROR;
444} 451}
445 452
446tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 453tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
447: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 454: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev)
448{ 455{
449 last_activity = NOW; 456 if (!tcp_si.cleaner.active)
457 tcp_si.cleaner.start (0);
458
459 last_activity = ev::ev_now ();
450 r_pkt = 0; 460 r_pkt = 0;
451 w_pkt = 0; 461 w_pkt = 0;
452 fd = fd_; 462 fd = fd_;
453#if ENABLE_HTTP_PROXY 463#if ENABLE_HTTP_PROXY
454 proxy_req = 0; 464 proxy_req = 0;
… …
461 } 471 }
462 else 472 else
463 { 473 {
464 active = false; 474 active = false;
465 state = ESTABLISHED; 475 state = ESTABLISHED;
466 start (fd, POLLIN); 476 start (fd, EV_READ);
467 } 477 }
468} 478}
469 479
470tcp_connection::~tcp_connection () 480tcp_connection::~tcp_connection ()
471{ 481{

Diff Legend

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