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

Diff Legend

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