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.7 by pcg, Tue Oct 14 03:22:09 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-2005 Marc Lehmann <gvpe@schmorp.de>
3 4
5 This file is part of GVPE.
6
4 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
5 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
6 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 10 (at your option) any later version.
8 11
9 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,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 GNU General Public License for more details. 15 GNU General Public License for more details.
13 16
14 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
15 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
16 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
17*/ 20*/
18 21
19#include "config.h" 22#include "config.h"
20 23
21#if ENABLE_TCP 24#if ENABLE_TCP
… …
27 30
28#include <cstring> 31#include <cstring>
29 32
30#include <sys/types.h> 33#include <sys/types.h>
31#include <sys/socket.h> 34#include <sys/socket.h>
32#include <sys/poll.h>
33#include <sys/wait.h> 35#include <sys/wait.h>
34#include <netinet/in.h>
35#include <sys/uio.h> 36#include <sys/uio.h>
36#include <arpa/inet.h>
37#include <errno.h> 37#include <errno.h>
38#include <time.h> 38#include <time.h>
39#include <unistd.h> 39#include <unistd.h>
40#include <fcntl.h>
40 41
41#include <map> 42#include <map>
42#include <unistd.h> 43
43#include <fcntl.h> 44#include "netcompat.h"
44#include <sys/poll.h>
45 45
46#include "vpn.h" 46#include "vpn.h"
47 47
48#if ENABLE_HTTP_PROXY 48#if ENABLE_HTTP_PROXY
49# include "conf.h" 49# include "conf.h"
… …
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 (0); 68 cleaner.start (300, 300);
69 } 69 }
70
70} tcp_si; 71} tcp_si;
71 72
72struct tcp_connection : io_watcher { 73struct tcp_connection : ev::io {
73 tstamp last_activity; 74 tstamp last_activity;
74 const sockinfo si; 75 const sockinfo si;
75 vpn &v; 76 vpn &v;
76 bool active; // this connection has been actively established 77 bool active; // this connection has been actively established
77 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; 78 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
… …
85#if ENABLE_HTTP_PROXY 86#if ENABLE_HTTP_PROXY
86 char *proxy_req; 87 char *proxy_req;
87 int proxy_req_len; 88 int proxy_req_len;
88#endif 89#endif
89 90
90 void tcpv4_ev (io_watcher &w, short revents); 91 void tcpv4_ev (ev::io &w, int revents);
91 92
92 bool send_packet (vpn_packet *pkt, int tos); 93 bool send_packet (vpn_packet *pkt, int tos);
93 bool write_packet (); 94 bool write_packet ();
94 95
95 void error (); // abort conenction && cleanup 96 void error (); // abort conenction && cleanup
96 97
97 operator tcp_si_map::value_type() 98 operator tcp_si_map::value_type()
98 { 99 {
99 return tcp_si_map::value_type (&si, this); 100 return tcp_si_map::value_type (&si, this);
100 } 101 }
101 102
102 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 103 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
103 ~tcp_connection (); 104 ~tcp_connection ();
104}; 105};
105 106
106void tcp_si_map::cleaner_cb (time_watcher &w) 107void tcp_si_map::cleaner_cb (ev::timer &w, int revents)
107{ 108{
108 w.at = NOW + 600;
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 & (POLLIN | POLLERR)) 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 & (POLLERR | POLLHUP)) 207 if (revents & EV_WRITE)
207 {
208 error ();
209 return;
210 }
211
212 if (revents & POLLOUT)
213 { 208 {
214 if (state == CONNECTING) 209 if (state == CONNECTING)
215 { 210 {
216 state = ESTABLISHED; 211 state = ESTABLISHED;
217 set (POLLIN); 212 set (EV_READ);
218#if ENABLE_HTTP_PROXY 213#if ENABLE_HTTP_PROXY
219 if (::conf.proxy_host && ::conf.proxy_port) 214 if (::conf.proxy_host && ::conf.proxy_port)
220 { 215 {
221 state = CONNECTING_PROXY; 216 state = CONNECTING_PROXY;
217
222 write (fd, proxy_req, proxy_req_len); 218 if (write (fd, proxy_req, proxy_req_len) == 0)
219 {
220 error ();
221 return;
222 }
223
223 free (proxy_req); proxy_req = 0; 224 free (proxy_req); proxy_req = 0;
224 } 225 }
225#endif 226#endif
226 } 227 }
227 else if (state == ESTABLISHED) 228 else if (state == ESTABLISHED)
… …
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 (POLLIN); 236 set (EV_READ);
236 } 237 }
237 } 238 }
238 else 239 else
239 set (POLLIN); 240 set (EV_READ);
240 } 241 }
241 else 242 else
242 set (POLLIN); 243 set (EV_READ);
243 } 244 }
244 245
245 if (revents & POLLIN) 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)
… …
284 break; 285 break;
285 } 286 }
286 else if (len < 0 && (errno == EINTR || errno == EAGAIN)) 287 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
287 break; 288 break;
288 289
290 // len == 0 <-> EOF
289 error (); 291 error ();
290 break; 292 break;
291 } 293 }
292#if ENABLE_HTTP_PROXY 294#if ENABLE_HTTP_PROXY
293 else if (state == CONNECTING_PROXY) 295 else if (state == CONNECTING_PROXY)
… …
343} 345}
344 346
345bool 347bool
346tcp_connection::send_packet (vpn_packet *pkt, int tos) 348tcp_connection::send_packet (vpn_packet *pkt, int tos)
347{ 349{
348 last_activity = NOW; 350 last_activity = ev::ev_now ();
349 351
350 if (state == IDLE) 352 if (state == IDLE)
351 { 353 {
352 // woaw, the first lost packet ;) 354 // woaw, the first lost packet ;)
353 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 355 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
… …
387 fcntl (fd, F_SETFL, O_NONBLOCK); 389 fcntl (fd, F_SETFL, O_NONBLOCK);
388 390
389 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0 391 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
390 || errno == EINPROGRESS) 392 || errno == EINPROGRESS)
391 { 393 {
394 fcntl (fd, F_SETFL, O_NONBLOCK);
395 fcntl (fd, F_SETFD, FD_CLOEXEC);
396
392 state = CONNECTING; 397 state = CONNECTING;
393 start (fd, POLLOUT); 398 start (fd, EV_WRITE);
394 } 399 }
395 else 400 else
396 close (fd); 401 close (fd);
397 } 402 }
398 } 403 }
… …
417 else 422 else
418 { 423 {
419 w_pkt = new vpn_packet; 424 w_pkt = new vpn_packet;
420 w_pkt->set (*pkt); 425 w_pkt->set (*pkt);
421 426
422 set (POLLIN | POLLOUT); 427 set (EV_READ | EV_WRITE);
423 } 428 }
424 } 429 }
425 } 430 }
426 431
427 return state != ERROR; 432 return state != ERROR;
… …
444 stop (); 449 stop ();
445 state = active ? IDLE : ERROR; 450 state = active ? IDLE : ERROR;
446} 451}
447 452
448tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 453tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
449: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 454: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev)
450{ 455{
451 last_activity = NOW; 456 if (!tcp_si.cleaner.active)
457 tcp_si.cleaner.start (0);
458
459 last_activity = ev::ev_now ();
452 r_pkt = 0; 460 r_pkt = 0;
453 w_pkt = 0; 461 w_pkt = 0;
454 fd = fd_; 462 fd = fd_;
455#if ENABLE_HTTP_PROXY 463#if ENABLE_HTTP_PROXY
456 proxy_req = 0; 464 proxy_req = 0;
… …
463 } 471 }
464 else 472 else
465 { 473 {
466 active = false; 474 active = false;
467 state = ESTABLISHED; 475 state = ESTABLISHED;
468 start (fd, POLLIN); 476 start (fd, EV_READ);
469 } 477 }
470} 478}
471 479
472tcp_connection::~tcp_connection () 480tcp_connection::~tcp_connection ()
473{ 481{

Diff Legend

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