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.21 by pcg, Sun Dec 2 00:39:06 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-2007 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
23 25
24// tcp processing is extremely ugly, since the vpe protocol is simply 26// tcp processing is extremely ugly, since the gvpe protocol is simply
25// designed for unreliable datagram networks. tcp is implemented by 27// designed for unreliable datagram networks. tcp is implemented by
26// multiplexing packets over tcp. errors are completely ignored, as we 28// multiplexing packets over tcp. errors are completely ignored, as we
27// rely on the higher level protocol to time out and reconnect. 29// rely on the higher level layers to time out and reconnect.
28 30
29#include <cstring> 31#include <cstring>
30 32
31#include <sys/types.h> 33#include <sys/types.h>
32#include <sys/socket.h> 34#include <sys/socket.h>
… …
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 (::conf.keepalive / 2, ::conf.keepalive / 2);
67 } 69 }
70
68} tcp_si; 71} tcp_si;
69 72
70struct tcp_connection : io_watcher { 73struct tcp_connection : ev::io {
74 int tos;
71 tstamp last_activity; 75 tstamp last_activity;
72 const sockinfo si; 76 const sockinfo si;
73 vpn &v; 77 vpn &v;
74 bool active; // this connection has been actively established 78 bool active; // this connection has been actively established
75 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; 79 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
… …
83#if ENABLE_HTTP_PROXY 87#if ENABLE_HTTP_PROXY
84 char *proxy_req; 88 char *proxy_req;
85 int proxy_req_len; 89 int proxy_req_len;
86#endif 90#endif
87 91
88 void tcpv4_ev (io_watcher &w, short revents); 92 void tcpv4_ev (ev::io &w, int revents);
89 93
90 bool send_packet (vpn_packet *pkt, int tos); 94 bool send_packet (vpn_packet *pkt, int tos);
91 bool write_packet (); 95 bool write_packet ();
92 96
93 void error (); // abort conenction && cleanup 97 void error (); // abort conenction && cleanup
94 98
95 operator tcp_si_map::value_type() 99 operator tcp_si_map::value_type()
96 { 100 {
97 return tcp_si_map::value_type (&si, this); 101 return tcp_si_map::value_type (&si, this);
98 } 102 }
99 103
100 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 104 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
101 ~tcp_connection (); 105 ~tcp_connection ();
102}; 106};
103 107
104void tcp_si_map::cleaner_cb (time_watcher &w) 108void tcp_si_map::cleaner_cb (ev::timer &w, int revents)
105{ 109{
106 w.at = NOW + 600;
107 tstamp to = NOW - ::conf.keepalive - 30 - 60; 110 tstamp to = ev_now () - ::conf.keepalive - 30 - 60;
108 111
109 for (iterator i = begin (); i != end(); ) 112 for (iterator i = begin (); i != end(); )
110 if (i->second->last_activity >= to) 113 if (i->second->last_activity >= to)
111 ++i; 114 ++i;
112 else 115 else
113 { 116 {
117 delete i->second;
114 erase (i); 118 erase (i);
115 i = begin (); 119 i = begin ();
116 } 120 }
117} 121}
118 122
119void 123void
120vpn::tcpv4_ev (io_watcher &w, short revents) 124vpn::tcpv4_ev (ev::io &w, int revents)
121{ 125{
122 if (revents & (POLLIN | POLLERR)) 126 if (revents & EV_READ)
123 { 127 {
124 struct sockaddr_in sa; 128 struct sockaddr_in sa;
125 socklen_t sa_len = sizeof (sa); 129 socklen_t sa_len = sizeof (sa);
126 int len; 130 int len;
127 131
128 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); 132 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len);
129 133
130 if (fd >= 0) 134 if (fd >= 0)
131 { 135 {
136 fcntl (fd, F_SETFL, O_NONBLOCK);
137 fcntl (fd, F_SETFD, FD_CLOEXEC);
138
132 sockinfo si(sa, PROT_TCPv4); 139 sockinfo si(sa, PROT_TCPv4);
133 140
134 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D 141 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
135
136 fcntl (fd, F_SETFL, O_NONBLOCK);
137 142
138 tcp_connection *i = new tcp_connection (fd, si, *this); 143 tcp_connection *i = new tcp_connection (fd, si, *this);
139 tcp_si.insert (*i); 144 tcp_si.insert (*i);
140 } 145 }
141 } 146 }
… …
195 return false; 200 return false;
196 } 201 }
197} 202}
198 203
199void 204void
200tcp_connection::tcpv4_ev (io_watcher &w, short revents) 205tcp_connection::tcpv4_ev (ev::io &w, int revents)
201{ 206{
202 last_activity = NOW; 207 last_activity = ev_now ();
203 208
204 if (revents & (POLLERR | POLLHUP)) 209 if (revents & EV_WRITE)
205 {
206 error ();
207 return;
208 }
209
210 if (revents & POLLOUT)
211 { 210 {
212 if (state == CONNECTING) 211 if (state == CONNECTING)
213 { 212 {
214 state = ESTABLISHED; 213 state = ESTABLISHED;
215 set (POLLIN); 214 set (EV_READ);
216#if ENABLE_HTTP_PROXY 215#if ENABLE_HTTP_PROXY
217 if (::conf.proxy_host && ::conf.proxy_port) 216 if (::conf.proxy_host && ::conf.proxy_port)
218 { 217 {
219 state = CONNECTING_PROXY; 218 state = CONNECTING_PROXY;
219
220 write (fd, proxy_req, proxy_req_len); 220 if (write (fd, proxy_req, proxy_req_len) == 0)
221 {
222 error ();
223 return;
224 }
225
221 free (proxy_req); proxy_req = 0; 226 free (proxy_req); proxy_req = 0;
222 } 227 }
223#endif 228#endif
224 } 229 }
225 else if (state == ESTABLISHED) 230 else if (state == ESTABLISHED)
… …
228 { 233 {
229 if (write_packet ()) 234 if (write_packet ())
230 { 235 {
231 delete w_pkt; w_pkt = 0; 236 delete w_pkt; w_pkt = 0;
232 237
233 set (POLLIN); 238 set (EV_READ);
234 } 239 }
235 } 240 }
236 else 241 else
237 set (POLLIN); 242 set (EV_READ);
238 } 243 }
239 else 244 else
240 set (POLLIN); 245 set (EV_READ);
241 } 246 }
242 247
243 if (revents & POLLIN) 248 if (revents & EV_READ)
244 { 249 {
245 if (state == ESTABLISHED) 250 if (state == ESTABLISHED)
246 for (;;) 251 for (;;)
247 { 252 {
248 if (!r_pkt) 253 if (!r_pkt)
… …
282 break; 287 break;
283 } 288 }
284 else if (len < 0 && (errno == EINTR || errno == EAGAIN)) 289 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
285 break; 290 break;
286 291
292 // len == 0 <-> EOF
287 error (); 293 error ();
288 break; 294 break;
289 } 295 }
290#if ENABLE_HTTP_PROXY 296#if ENABLE_HTTP_PROXY
291 else if (state == CONNECTING_PROXY) 297 else if (state == CONNECTING_PROXY)
… …
341} 347}
342 348
343bool 349bool
344tcp_connection::send_packet (vpn_packet *pkt, int tos) 350tcp_connection::send_packet (vpn_packet *pkt, int tos)
345{ 351{
346 last_activity = NOW; 352 last_activity = ev_now ();
347 353
348 if (state == IDLE) 354 if (state == IDLE)
349 { 355 {
350 // woaw, the first lost packet ;) 356 // woaw, the first lost packet ;)
351 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 357 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
… …
385 fcntl (fd, F_SETFL, O_NONBLOCK); 391 fcntl (fd, F_SETFL, O_NONBLOCK);
386 392
387 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0 393 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
388 || errno == EINPROGRESS) 394 || errno == EINPROGRESS)
389 { 395 {
396 fcntl (fd, F_SETFL, O_NONBLOCK);
397 fcntl (fd, F_SETFD, FD_CLOEXEC);
398
390 state = CONNECTING; 399 state = CONNECTING;
391 start (fd, POLLOUT); 400 start (fd, EV_WRITE);
392 } 401 }
393 else 402 else
394 close (fd); 403 close (fd);
395 } 404 }
396 } 405 }
… …
401 if (!w_pkt) 410 if (!w_pkt)
402 { 411 {
403 // how this maps to the underlying tcp packets we don't know 412 // how this maps to the underlying tcp packets we don't know
404 // and we don't care. at least we tried ;) 413 // and we don't care. at least we tried ;)
405#if defined(SOL_IP) && defined(IP_TOS) 414#if defined(SOL_IP) && defined(IP_TOS)
415 if (tos != this->tos)
416 {
417 this->tos = tos;
406 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); 418 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
419 }
407#endif 420#endif
408 421
409 w_pkt = pkt; 422 w_pkt = pkt;
410 w_ofs = 0; 423 w_ofs = 0;
411 w_len = pkt->len + 2; // length + size header 424 w_len = pkt->len + 2; // length + size header
… …
415 else 428 else
416 { 429 {
417 w_pkt = new vpn_packet; 430 w_pkt = new vpn_packet;
418 w_pkt->set (*pkt); 431 w_pkt->set (*pkt);
419 432
420 set (POLLIN | POLLOUT); 433 set (EV_READ | EV_WRITE);
421 } 434 }
422 } 435 }
423 } 436 }
424 437
425 return state != ERROR; 438 return state != ERROR;
426} 439}
427 440
428void tcp_connection::error () 441void tcp_connection::error ()
429{ 442{
443 stop ();
444
430 if (fd >= 0) 445 if (fd >= 0)
431 { 446 {
432 close (fd); 447 close (fd);
448 tos = -1;
433 fd = -1; 449 fd = -1;
434 } 450 }
435 451
436 delete r_pkt; r_pkt = 0; 452 delete r_pkt; r_pkt = 0;
437 delete w_pkt; w_pkt = 0; 453 delete w_pkt; w_pkt = 0;
438#if ENABLE_HTTP_PROXY 454#if ENABLE_HTTP_PROXY
439 free (proxy_req); proxy_req = 0; 455 free (proxy_req); proxy_req = 0;
440#endif 456#endif
441 457
442 stop ();
443 state = active ? IDLE : ERROR; 458 state = active ? IDLE : ERROR;
444} 459}
445 460
446tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 461tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
447: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 462: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev)
448{ 463{
449 last_activity = NOW; 464 last_activity = ev_now ();
450 r_pkt = 0; 465 r_pkt = 0;
451 w_pkt = 0; 466 w_pkt = 0;
467 tos = -1;
452 fd = fd_; 468 fd = fd_;
453#if ENABLE_HTTP_PROXY 469#if ENABLE_HTTP_PROXY
454 proxy_req = 0; 470 proxy_req = 0;
455#endif 471#endif
456 472
… …
461 } 477 }
462 else 478 else
463 { 479 {
464 active = false; 480 active = false;
465 state = ESTABLISHED; 481 state = ESTABLISHED;
466 start (fd, POLLIN); 482 start (fd, EV_READ);
467 } 483 }
468} 484}
469 485
470tcp_connection::~tcp_connection () 486tcp_connection::~tcp_connection ()
471{ 487{

Diff Legend

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