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.11 by pcg, Sat Jan 17 01:18:36 2004 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-2004 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.start (NOW + 600);
107
108 tstamp to = NOW - ::conf.keepalive - 30 - 60; 109 tstamp to = ev::ev_now () - ::conf.keepalive - 30 - 60;
109 110
110 for (iterator i = begin (); i != end(); ) 111 for (iterator i = begin (); i != end(); )
111 if (i->second->last_activity >= to) 112 if (i->second->last_activity >= to)
112 ++i; 113 ++i;
113 else 114 else
… …
116 i = begin (); 117 i = begin ();
117 } 118 }
118} 119}
119 120
120void 121void
121vpn::tcpv4_ev (io_watcher &w, short revents) 122vpn::tcpv4_ev (ev::io &w, int revents)
122{ 123{
123 if (revents & EVENT_READ) 124 if (revents & EV_READ)
124 { 125 {
125 struct sockaddr_in sa; 126 struct sockaddr_in sa;
126 socklen_t sa_len = sizeof (sa); 127 socklen_t sa_len = sizeof (sa);
127 int len; 128 int len;
128 129
129 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); 130 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len);
130 131
131 if (fd >= 0) 132 if (fd >= 0)
132 { 133 {
134 fcntl (fd, F_SETFL, O_NONBLOCK);
135 fcntl (fd, F_SETFD, FD_CLOEXEC);
136
133 sockinfo si(sa, PROT_TCPv4); 137 sockinfo si(sa, PROT_TCPv4);
134 138
135 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D 139 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
136
137 fcntl (fd, F_SETFL, O_NONBLOCK);
138 140
139 tcp_connection *i = new tcp_connection (fd, si, *this); 141 tcp_connection *i = new tcp_connection (fd, si, *this);
140 tcp_si.insert (*i); 142 tcp_si.insert (*i);
141 } 143 }
142 } 144 }
… …
196 return false; 198 return false;
197 } 199 }
198} 200}
199 201
200void 202void
201tcp_connection::tcpv4_ev (io_watcher &w, short revents) 203tcp_connection::tcpv4_ev (ev::io &w, int revents)
202{ 204{
203 last_activity = NOW; 205 last_activity = ev::ev_now ();
204 206
205 if (revents & EVENT_WRITE) 207 if (revents & EV_WRITE)
206 { 208 {
207 if (state == CONNECTING) 209 if (state == CONNECTING)
208 { 210 {
209 state = ESTABLISHED; 211 state = ESTABLISHED;
210 set (EVENT_READ); 212 set (EV_READ);
211#if ENABLE_HTTP_PROXY 213#if ENABLE_HTTP_PROXY
212 if (::conf.proxy_host && ::conf.proxy_port) 214 if (::conf.proxy_host && ::conf.proxy_port)
213 { 215 {
214 state = CONNECTING_PROXY; 216 state = CONNECTING_PROXY;
215 217
… …
229 { 231 {
230 if (write_packet ()) 232 if (write_packet ())
231 { 233 {
232 delete w_pkt; w_pkt = 0; 234 delete w_pkt; w_pkt = 0;
233 235
234 set (EVENT_READ); 236 set (EV_READ);
235 } 237 }
236 } 238 }
237 else 239 else
238 set (EVENT_READ); 240 set (EV_READ);
239 } 241 }
240 else 242 else
241 set (EVENT_READ); 243 set (EV_READ);
242 } 244 }
243 245
244 if (revents & EVENT_READ) 246 if (revents & EV_READ)
245 { 247 {
246 if (state == ESTABLISHED) 248 if (state == ESTABLISHED)
247 for (;;) 249 for (;;)
248 { 250 {
249 if (!r_pkt) 251 if (!r_pkt)
… …
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, EVENT_WRITE); 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 (EVENT_READ | EVENT_WRITE); 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, EVENT_READ); 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