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.5 by pcg, Mon Apr 7 01:28:56 2003 UTC vs.
Revision 1.24 by pcg, Thu Dec 6 00:35:29 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-2007 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
22 25
23// tcp processing is extremely ugly, since the vpe protocol is simply 26// tcp processing is extremely ugly, since the gvpe protocol is simply
24// designed for unreliable datagram networks. tcp is implemented by 27// designed for unreliable datagram networks. tcp is implemented by
25// multiplexing packets over tcp. errors are completely ignored, as we 28// multiplexing packets over tcp. errors are completely ignored, as we
26// rely on the higher level protocol to time out and reconnect. 29// rely on the higher level layers to time out and reconnect.
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"
… …
57 { 57 {
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{
64 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
64 65
65 tcp_si_map () 66 tcp_si_map ()
66 : cleaner(this, &tcp_si_map::cleaner_cb)
67 { 67 {
68 cleaner.start (0); 68 cleaner.set<tcp_si_map, &tcp_si_map::cleaner_cb> (this);
69 cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2);
69 } 70 }
71
70} tcp_si; 72} tcp_si;
71 73
72struct tcp_connection : io_watcher { 74struct tcp_connection : ev::io
75{
76 int tos;
73 tstamp last_activity; 77 tstamp last_activity;
74 const sockinfo si; 78 const sockinfo si;
75 vpn &v; 79 vpn &v;
76 bool active; // this connection has been actively established 80 bool active; // this connection has been actively established
77 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; 81 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
… …
85#if ENABLE_HTTP_PROXY 89#if ENABLE_HTTP_PROXY
86 char *proxy_req; 90 char *proxy_req;
87 int proxy_req_len; 91 int proxy_req_len;
88#endif 92#endif
89 93
90 void tcpv4_ev (io_watcher &w, short revents); 94 inline void tcpv4_ev (ev::io &w, int revents);
91 95
92 bool send_packet (vpn_packet *pkt, int tos); 96 bool send_packet (vpn_packet *pkt, int tos);
93 bool write_packet (); 97 bool write_packet ();
94 98
95 void error (); // abort conenction && cleanup 99 void error (); // abort conenction && cleanup
96 100
97 operator tcp_si_map::value_type() 101 operator tcp_si_map::value_type()
98 { 102 {
99 return tcp_si_map::value_type (&si, this); 103 return tcp_si_map::value_type (&si, this);
100 } 104 }
101 105
102 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 106 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
103 ~tcp_connection (); 107 ~tcp_connection ();
104}; 108};
105 109
106void tcp_si_map::cleaner_cb (time_watcher &w) 110void tcp_si_map::cleaner_cb (ev::timer &w, int revents)
107{ 111{
108 w.at = NOW + 600;
109 tstamp to = NOW - ::conf.keepalive - 30 - 60; 112 tstamp to = ev_now () - ::conf.keepalive - 30 - 60;
110 113
111 for (iterator i = begin (); i != end(); ) 114 for (iterator i = begin (); i != end(); )
112 if (i->second->last_activity >= to) 115 if (i->second->last_activity >= to)
113 ++i; 116 ++i;
114 else 117 else
115 { 118 {
119 delete i->second;
116 erase (i); 120 erase (i);
117 i = begin (); 121 i = begin ();
118 } 122 }
119} 123}
120 124
121void 125void
122vpn::tcpv4_ev (io_watcher &w, short revents) 126vpn::tcpv4_ev (ev::io &w, int revents)
123{ 127{
124 if (revents & (POLLIN | POLLERR)) 128 if (revents & EV_READ)
125 { 129 {
126 struct sockaddr_in sa; 130 struct sockaddr_in sa;
127 socklen_t sa_len = sizeof (sa); 131 socklen_t sa_len = sizeof (sa);
128 int len; 132 int len;
129 133
130 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); 134 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len);
131 135
132 if (fd >= 0) 136 if (fd >= 0)
133 { 137 {
138 fcntl (fd, F_SETFL, O_NONBLOCK);
139 fcntl (fd, F_SETFD, FD_CLOEXEC);
140
134 sockinfo si(sa, PROT_TCPv4); 141 sockinfo si(sa, PROT_TCPv4);
135 142
136 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D 143 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
137
138 fcntl (fd, F_SETFL, O_NONBLOCK);
139 144
140 tcp_connection *i = new tcp_connection (fd, si, *this); 145 tcp_connection *i = new tcp_connection (fd, si, *this);
141 tcp_si.insert (*i); 146 tcp_si.insert (*i);
142 } 147 }
143 } 148 }
… …
169 if (w_ofs < 2) 174 if (w_ofs < 2)
170 { 175 {
171 u16 plen = htons (w_pkt->len); 176 u16 plen = htons (w_pkt->len);
172 177
173 iovec vec[2]; 178 iovec vec[2];
179 //TODO: char* is the right type? hardly...
174 vec[0].iov_base = ((u8 *)&plen) + w_ofs; 180 vec[0].iov_base = (char *)((u8 *)&plen) + w_ofs;
175 vec[0].iov_len = 2 - w_ofs; 181 vec[0].iov_len = 2 - w_ofs;
176 vec[1].iov_base = &((*w_pkt)[0]); 182 vec[1].iov_base = (char *)&((*w_pkt)[0]);
177 vec[1].iov_len = w_len - 2; 183 vec[1].iov_len = w_len - 2;
178 184
179 len = writev (fd, vec, 2); 185 len = writev (fd, vec, 2);
180 } 186 }
181 else 187 else
… …
196 return false; 202 return false;
197 } 203 }
198} 204}
199 205
200void 206void
201tcp_connection::tcpv4_ev (io_watcher &w, short revents) 207tcp_connection::tcpv4_ev (ev::io &w, int revents)
202{ 208{
203 last_activity = NOW; 209 last_activity = ev_now ();
204 210
205 if (revents & (POLLERR | POLLHUP)) 211 if (revents & EV_WRITE)
206 {
207 error ();
208 return;
209 }
210
211 if (revents & POLLOUT)
212 { 212 {
213 if (state == CONNECTING) 213 if (state == CONNECTING)
214 { 214 {
215 state = ESTABLISHED; 215 state = ESTABLISHED;
216 set (POLLIN); 216 set (EV_READ);
217#if ENABLE_HTTP_PROXY 217#if ENABLE_HTTP_PROXY
218 if (::conf.proxy_host && ::conf.proxy_port) 218 if (::conf.proxy_host && ::conf.proxy_port)
219 { 219 {
220 state = CONNECTING_PROXY; 220 state = CONNECTING_PROXY;
221
221 write (fd, proxy_req, proxy_req_len); 222 if (write (fd, proxy_req, proxy_req_len) == 0)
223 {
224 error ();
225 return;
226 }
227
222 free (proxy_req); proxy_req = 0; 228 free (proxy_req); proxy_req = 0;
223 } 229 }
224#endif 230#endif
225 } 231 }
226 else if (state == ESTABLISHED) 232 else if (state == ESTABLISHED)
… …
229 { 235 {
230 if (write_packet ()) 236 if (write_packet ())
231 { 237 {
232 delete w_pkt; w_pkt = 0; 238 delete w_pkt; w_pkt = 0;
233 239
234 set (POLLIN); 240 set (EV_READ);
235 } 241 }
236 } 242 }
237 else 243 else
238 set (POLLIN); 244 set (EV_READ);
239 } 245 }
240 else 246 else
241 set (POLLIN); 247 set (EV_READ);
242 } 248 }
243 249
244 if (revents & POLLIN) 250 if (revents & EV_READ)
245 { 251 {
246 if (state == ESTABLISHED) 252 if (state == ESTABLISHED)
247 for (;;) 253 for (;;)
248 { 254 {
249 if (!r_pkt) 255 if (!r_pkt)
… …
283 break; 289 break;
284 } 290 }
285 else if (len < 0 && (errno == EINTR || errno == EAGAIN)) 291 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
286 break; 292 break;
287 293
294 // len == 0 <-> EOF
288 error (); 295 error ();
289 break; 296 break;
290 } 297 }
291#if ENABLE_HTTP_PROXY 298#if ENABLE_HTTP_PROXY
292 else if (state == CONNECTING_PROXY) 299 else if (state == CONNECTING_PROXY)
… …
320 327
321 fcntl (fd, F_SETFL, O_NONBLOCK); 328 fcntl (fd, F_SETFL, O_NONBLOCK);
322 329
323 if (i < 12) 330 if (i < 12)
324 { 331 {
325 slog (L_ERR, _("%s: unable to do proxy-forwarding, short response"), 332 slog (L_ERR, _("(%s): unable to do proxy-forwarding, short response"),
326 (const char *)si); 333 (const char *)si);
327 error (); 334 error ();
328 } 335 }
329 else if (r[0] != 'H' || r[1] != 'T' || r[2] != 'T' || r[3] != 'P' || r[4] != '/' 336 else if (r[0] != 'H' || r[1] != 'T' || r[2] != 'T' || r[3] != 'P' || r[4] != '/'
330 || r[5] != '1' // http-major 337 || r[5] != '1' // http-major
331 || r[9] != '2') // response 338 || r[9] != '2') // response
332 { 339 {
333 slog (L_ERR, _("%s: malformed or unexpected proxy response (%.12s)"), 340 slog (L_ERR, _("(%s): malformed or unexpected proxy response (%.12s)"),
334 (const char *)si, r); 341 (const char *)si, r);
335 error (); 342 error ();
336 } 343 }
337 else 344 else
338 state = ESTABLISHED; 345 state = ESTABLISHED;
… …
342} 349}
343 350
344bool 351bool
345tcp_connection::send_packet (vpn_packet *pkt, int tos) 352tcp_connection::send_packet (vpn_packet *pkt, int tos)
346{ 353{
347 last_activity = NOW; 354 last_activity = ev_now ();
348 355
349 if (state == IDLE) 356 if (state == IDLE)
350 { 357 {
351 // woaw, the first lost packet ;) 358 // woaw, the first lost packet ;)
352 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 359 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
… …
386 fcntl (fd, F_SETFL, O_NONBLOCK); 393 fcntl (fd, F_SETFL, O_NONBLOCK);
387 394
388 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0 395 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
389 || errno == EINPROGRESS) 396 || errno == EINPROGRESS)
390 { 397 {
398 fcntl (fd, F_SETFL, O_NONBLOCK);
399 fcntl (fd, F_SETFD, FD_CLOEXEC);
400
391 state = CONNECTING; 401 state = CONNECTING;
392 start (fd, POLLOUT); 402 start (fd, EV_WRITE);
393 } 403 }
394 else 404 else
395 close (fd); 405 close (fd);
396 } 406 }
397 } 407 }
… …
401 // right thing to do, not using tcp *is* the right thing to do. 411 // right thing to do, not using tcp *is* the right thing to do.
402 if (!w_pkt) 412 if (!w_pkt)
403 { 413 {
404 // how this maps to the underlying tcp packets we don't know 414 // how this maps to the underlying tcp packets we don't know
405 // and we don't care. at least we tried ;) 415 // and we don't care. at least we tried ;)
416#if defined(SOL_IP) && defined(IP_TOS)
417 if (tos != this->tos)
418 {
419 this->tos = tos;
406 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); 420 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
421 }
422#endif
407 423
408 w_pkt = pkt; 424 w_pkt = pkt;
409 w_ofs = 0; 425 w_ofs = 0;
410 w_len = pkt->len + 2; // length + size header 426 w_len = pkt->len + 2; // length + size header
411 427
… …
414 else 430 else
415 { 431 {
416 w_pkt = new vpn_packet; 432 w_pkt = new vpn_packet;
417 w_pkt->set (*pkt); 433 w_pkt->set (*pkt);
418 434
419 set (POLLIN | POLLOUT); 435 set (EV_READ | EV_WRITE);
420 } 436 }
421 } 437 }
422 } 438 }
423 439
424 return state != ERROR; 440 return state != ERROR;
425} 441}
426 442
427void tcp_connection::error () 443void tcp_connection::error ()
428{ 444{
445 stop ();
446
429 if (fd >= 0) 447 if (fd >= 0)
430 { 448 {
431 close (fd); 449 close (fd);
450 tos = -1;
432 fd = -1; 451 fd = -1;
433 } 452 }
434 453
435 delete r_pkt; r_pkt = 0; 454 delete r_pkt; r_pkt = 0;
436 delete w_pkt; w_pkt = 0; 455 delete w_pkt; w_pkt = 0;
437#if ENABLE_HTTP_PROXY 456#if ENABLE_HTTP_PROXY
438 free (proxy_req); proxy_req = 0; 457 free (proxy_req); proxy_req = 0;
439#endif 458#endif
440 459
441 stop ();
442 state = active ? IDLE : ERROR; 460 state = active ? IDLE : ERROR;
443} 461}
444 462
445tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 463tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
446: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 464: v(v_), si(si_)
447{ 465{
466 set<tcp_connection, &tcp_connection::tcpv4_ev> (this);
467
448 last_activity = NOW; 468 last_activity = ev_now ();
449 r_pkt = 0; 469 r_pkt = 0;
450 w_pkt = 0; 470 w_pkt = 0;
471 tos = -1;
451 fd = fd_; 472 fd = fd_;
452#if ENABLE_HTTP_PROXY 473#if ENABLE_HTTP_PROXY
453 proxy_req = 0; 474 proxy_req = 0;
454#endif 475#endif
455 476
… …
460 } 481 }
461 else 482 else
462 { 483 {
463 active = false; 484 active = false;
464 state = ESTABLISHED; 485 state = ESTABLISHED;
465 start (fd, POLLIN); 486 start (fd, EV_READ);
466 } 487 }
467} 488}
468 489
469tcp_connection::~tcp_connection () 490tcp_connection::~tcp_connection ()
470{ 491{

Diff Legend

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