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.3 by pcg, Sun Apr 6 20:01:53 2003 UTC vs.
Revision 1.22 by pcg, Sun Dec 2 00:45:42 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
48#if ENABLE_HTTP_PROXY
49# include "conf.h"
50#endif
47 51
48struct tcp_connection; 52struct tcp_connection;
49 53
50struct lt_sockinfo 54struct lt_sockinfo
51{ 55{
… …
53 { 57 {
54 return *a < *b; 58 return *a < *b;
55 } 59 }
56}; 60};
57 61
58struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> { 62struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo>
59 void cleaner_cb (time_watcher &w); time_watcher cleaner; 63{
64 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
60 65
61 tcp_si_map () 66 tcp_si_map ()
62 : cleaner(this, &tcp_si_map::cleaner_cb) 67 : cleaner(this, &tcp_si_map::cleaner_cb)
63 { 68 {
64 cleaner.start (0); 69 cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2);
65 } 70 }
71
66} tcp_si; 72} tcp_si;
67 73
68struct tcp_connection : io_watcher { 74struct tcp_connection : ev::io
75{
76 int tos;
69 tstamp last_activity; 77 tstamp last_activity;
70 const sockinfo si; 78 const sockinfo si;
71 vpn &v; 79 vpn &v;
72 bool active; // this connection has been actively established 80 bool active; // this connection has been actively established
73 enum { ERROR, IDLE, CONNECTING, ESTABLISHED } state; 81 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
74 82
75 vpn_packet *r_pkt; 83 vpn_packet *r_pkt;
76 u32 r_len, r_ofs; 84 u32 r_len, r_ofs;
77 85
78 vpn_packet *w_pkt; 86 vpn_packet *w_pkt;
79 u32 w_len, w_ofs; 87 u32 w_len, w_ofs;
80 88
89#if ENABLE_HTTP_PROXY
90 char *proxy_req;
91 int proxy_req_len;
92#endif
93
81 void tcpv4_ev (io_watcher &w, short revents); 94 void tcpv4_ev (ev::io &w, int revents);
82 95
83 bool send_packet (vpn_packet *pkt, int tos); 96 bool send_packet (vpn_packet *pkt, int tos);
84 bool write_packet (); 97 bool write_packet ();
85 98
86 void error (); // abort conenction && cleanup 99 void error (); // abort conenction && cleanup
87 100
88 operator tcp_si_map::value_type() 101 operator tcp_si_map::value_type()
89 { 102 {
90 return tcp_si_map::value_type (&si, this); 103 return tcp_si_map::value_type (&si, this);
91 } 104 }
92 105
93 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 106 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
94 ~tcp_connection (); 107 ~tcp_connection ();
95}; 108};
96 109
97void tcp_si_map::cleaner_cb (time_watcher &w) 110void tcp_si_map::cleaner_cb (ev::timer &w, int revents)
98{ 111{
99 w.at = NOW + 600;
100 tstamp to = NOW - ::conf.keepalive - 30 - 60; 112 tstamp to = ev_now () - ::conf.keepalive - 30 - 60;
101 113
102 for (iterator i = begin (); i != end(); ) 114 for (iterator i = begin (); i != end(); )
103 if (i->second->last_activity >= to) 115 if (i->second->last_activity >= to)
104 ++i; 116 ++i;
105 else 117 else
106 { 118 {
119 delete i->second;
107 erase (i); 120 erase (i);
108 i = begin (); 121 i = begin ();
109 } 122 }
110} 123}
111 124
112void 125void
113vpn::tcpv4_ev (io_watcher &w, short revents) 126vpn::tcpv4_ev (ev::io &w, int revents)
114{ 127{
115 if (revents & (POLLIN | POLLERR)) 128 if (revents & EV_READ)
116 { 129 {
117 struct sockaddr_in sa; 130 struct sockaddr_in sa;
118 socklen_t sa_len = sizeof (sa); 131 socklen_t sa_len = sizeof (sa);
119 int len; 132 int len;
120 133
121 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); 134 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len);
122 135
123 if (fd >= 0) 136 if (fd >= 0)
124 { 137 {
138 fcntl (fd, F_SETFL, O_NONBLOCK);
139 fcntl (fd, F_SETFD, FD_CLOEXEC);
140
125 sockinfo si(sa, PROT_TCPv4); 141 sockinfo si(sa, PROT_TCPv4);
126 142
127 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D 143 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
128
129 fcntl (fd, F_SETFL, O_NONBLOCK);
130 144
131 tcp_connection *i = new tcp_connection (fd, si, *this); 145 tcp_connection *i = new tcp_connection (fd, si, *this);
132 tcp_si.insert (*i); 146 tcp_si.insert (*i);
133 } 147 }
134 } 148 }
… …
150 i = info->second; 164 i = info->second;
151 165
152 return i->send_packet (pkt, tos); 166 return i->send_packet (pkt, tos);
153} 167}
154 168
155void tcp_connection::error ()
156{
157 if (fd >= 0)
158 {
159 close (fd);
160 fd = -1;
161 }
162
163 delete r_pkt; r_pkt = 0;
164 delete w_pkt; w_pkt = 0;
165
166 stop ();
167 state = active ? IDLE : ERROR;
168}
169
170bool 169bool
171tcp_connection::write_packet () 170tcp_connection::write_packet ()
172{ 171{
173 ssize_t len; 172 ssize_t len;
174 173
175 if (w_ofs < 2) 174 if (w_ofs < 2)
176 { 175 {
177 u16 plen = htons (w_pkt->len); 176 u16 plen = htons (w_pkt->len);
178 177
179 iovec vec[2]; 178 iovec vec[2];
179 //TODO: char* is the right type? hardly...
180 vec[0].iov_base = ((u8 *)&plen) + w_ofs; 180 vec[0].iov_base = (char *)((u8 *)&plen) + w_ofs;
181 vec[0].iov_len = 2 - w_ofs; 181 vec[0].iov_len = 2 - w_ofs;
182 vec[1].iov_base = &((*w_pkt)[0]); 182 vec[1].iov_base = (char *)&((*w_pkt)[0]);
183 vec[1].iov_len = w_len - 2; 183 vec[1].iov_len = w_len - 2;
184 184
185 len = writev (fd, vec, 2); 185 len = writev (fd, vec, 2);
186 } 186 }
187 else 187 else
… …
202 return false; 202 return false;
203 } 203 }
204} 204}
205 205
206void 206void
207tcp_connection::tcpv4_ev (io_watcher &w, short revents) 207tcp_connection::tcpv4_ev (ev::io &w, int revents)
208{ 208{
209 last_activity = NOW; 209 last_activity = ev_now ();
210 210
211 if (revents & (POLLERR | POLLHUP)) 211 if (revents & EV_WRITE)
212 {
213 error ();
214 return;
215 }
216
217 if (revents & POLLOUT)
218 { 212 {
219 if (state == CONNECTING) 213 if (state == CONNECTING)
220 { 214 {
221 state = ESTABLISHED; 215 state = ESTABLISHED;
222 set (POLLIN); 216 set (EV_READ);
217#if ENABLE_HTTP_PROXY
218 if (::conf.proxy_host && ::conf.proxy_port)
219 {
220 state = CONNECTING_PROXY;
221
222 if (write (fd, proxy_req, proxy_req_len) == 0)
223 {
224 error ();
225 return;
226 }
227
228 free (proxy_req); proxy_req = 0;
229 }
230#endif
223 } 231 }
224 else if (state == ESTABLISHED) 232 else if (state == ESTABLISHED)
225 { 233 {
226 if (w_pkt) 234 if (w_pkt)
227 { 235 {
228 if (write_packet ()) 236 if (write_packet ())
229 { 237 {
230 delete w_pkt; w_pkt = 0; 238 delete w_pkt; w_pkt = 0;
231 239
232 set (POLLIN); 240 set (EV_READ);
233 } 241 }
234 } 242 }
235 else 243 else
236 set (POLLIN); 244 set (EV_READ);
237 } 245 }
238 else 246 else
239 set (POLLIN); 247 set (EV_READ);
240 }
241
242 if (revents & POLLIN)
243 { 248 }
249
250 if (revents & EV_READ)
251 {
252 if (state == ESTABLISHED)
244 for (;;) 253 for (;;)
245 { 254 {
246 if (!r_pkt) 255 if (!r_pkt)
247 { 256 {
248 r_pkt = new vpn_packet; 257 r_pkt = new vpn_packet;
249 r_ofs = 0; 258 r_ofs = 0;
250 r_len = 2; // header 259 r_len = 2; // header
251 } 260 }
252 261
253 ssize_t len = read (fd, &((*r_pkt)[r_ofs < 2 ? r_ofs : r_ofs - 2]), r_len); 262 ssize_t len = read (fd, &((*r_pkt)[r_ofs < 2 ? r_ofs : r_ofs - 2]), r_len);
254 263
255 if (len > 0) 264 if (len > 0)
256 { 265 {
257 r_len -= len; 266 r_len -= len;
258 r_ofs += len; 267 r_ofs += len;
259 268
260 if (r_len == 0) 269 if (r_len == 0)
270 {
271 if (r_ofs == 2)
272 {
273 r_len = ntohs (*(u16 *)&((*r_pkt)[0]));
274 r_pkt->len = r_len;
275
276 if (r_len > 0 && r_len < MAXSIZE)
277 continue;
278 }
279 else
280 {
281 v.recv_vpn_packet (r_pkt, si);
282 delete r_pkt;
283 r_pkt = 0;
284
285 continue;
286 }
287 }
288 else
289 break;
290 }
291 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
292 break;
293
294 // len == 0 <-> EOF
295 error ();
296 break;
297 }
298#if ENABLE_HTTP_PROXY
299 else if (state == CONNECTING_PROXY)
300 {
301 fcntl (fd, F_SETFL, 0);
302 char r[1024];
303 int i;
304 bool emptyline = false;
305
306 // we do a blocking read of the response, to hell with it
307 for (i = 0; i < 1023; i++)
308 {
309 int l = read (fd, &r[i], 1);
310
311 if (l <= 0)
261 { 312 {
262 if (r_ofs == 2) 313 error ();
263 { 314 return;
264 r_len = ntohs (*(u16 *)&((*r_pkt)[0]));
265 r_pkt->len = r_len;
266
267 if (r_len > 0 && r_len < MAXSIZE)
268 continue;
269 } 315 }
316
317 if (r[i] == '\012')
318 {
319 if (emptyline)
320 break;
270 else 321 else
271 {
272 v.recv_vpn_packet (r_pkt, si);
273 delete r_pkt;
274 r_pkt = 0;
275
276 continue; 322 emptyline = true;
277 } 323 }
324 else if (r[i] != '\015')
325 emptyline = false;
326 }
327
328 fcntl (fd, F_SETFL, O_NONBLOCK);
329
330 if (i < 12)
331 {
332 slog (L_ERR, _("(%s): unable to do proxy-forwarding, short response"),
333 (const char *)si);
334 error ();
335 }
336 else if (r[0] != 'H' || r[1] != 'T' || r[2] != 'T' || r[3] != 'P' || r[4] != '/'
337 || r[5] != '1' // http-major
338 || r[9] != '2') // response
339 {
340 slog (L_ERR, _("(%s): malformed or unexpected proxy response (%.12s)"),
341 (const char *)si, r);
342 error ();
343 }
344 else
345 state = ESTABLISHED;
346 }
347#endif
348 }
349}
350
351bool
352tcp_connection::send_packet (vpn_packet *pkt, int tos)
353{
354 last_activity = ev_now ();
355
356 if (state == IDLE)
357 {
358 // woaw, the first lost packet ;)
359 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
360
361 if (fd >= 0)
362 {
363 const sockinfo *csi = &si;
364
365#if ENABLE_HTTP_PROXY
366 sockinfo psi;
367
368 if (::conf.proxy_host && ::conf.proxy_port)
369 {
370 psi.set (::conf.proxy_host, ::conf.proxy_port, PROT_TCPv4);
371
372 if (psi.valid ())
373 {
374 csi = &psi;
375
376 proxy_req_len = asprintf (&proxy_req,
377 "CONNECT %s:%d HTTP/1.0\015\012"
378 "%s%s%s" // optional proxy-auth
379 "\015\012",
380 si.ntoa (),
381 ntohs (si.port),
382 ::conf.proxy_auth ? "Proxy-Authorization: Basic " : "",
383 ::conf.proxy_auth ? ::conf.proxy_auth : "",
384 ::conf.proxy_auth ? "\015\012" : "");
385
278 } 386 }
279 else 387 else
280 break; 388 slog (L_ERR, _("unable to resolve http proxy hostname '%s', trying direct"),
389 ::conf.proxy_host);
390 }
391#endif
281 } 392
282 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
283 break;
284
285 error ();
286 break;
287 }
288 }
289}
290
291bool
292tcp_connection::send_packet (vpn_packet *pkt, int tos)
293{
294 last_activity = NOW;
295
296 if (state == IDLE)
297 {
298 // woaw, the first lost packet ;)
299 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
300
301 if (fd >= 0)
302 {
303 fcntl (fd, F_SETFL, O_NONBLOCK); 393 fcntl (fd, F_SETFL, O_NONBLOCK);
304 394
305 if (connect (fd, si.sav4 (), si.salenv4 ()) >= 0 395 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
306 || errno == EINPROGRESS) 396 || errno == EINPROGRESS)
307 { 397 {
398 fcntl (fd, F_SETFL, O_NONBLOCK);
399 fcntl (fd, F_SETFD, FD_CLOEXEC);
400
308 state = CONNECTING; 401 state = CONNECTING;
309 start (fd, POLLOUT); 402 start (fd, EV_WRITE);
310 } 403 }
311 else 404 else
312 close (fd); 405 close (fd);
313 } 406 }
314 } 407 }
… …
318 // 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.
319 if (!w_pkt) 412 if (!w_pkt)
320 { 413 {
321 // 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
322 // 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;
323 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); 420 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
421 }
422#endif
324 423
325 w_pkt = pkt; 424 w_pkt = pkt;
326 w_ofs = 0; 425 w_ofs = 0;
327 w_len = pkt->len + 2; // length + size header 426 w_len = pkt->len + 2; // length + size header
328 427
… …
331 else 430 else
332 { 431 {
333 w_pkt = new vpn_packet; 432 w_pkt = new vpn_packet;
334 w_pkt->set (*pkt); 433 w_pkt->set (*pkt);
335 434
336 set (POLLIN | POLLOUT); 435 set (EV_READ | EV_WRITE);
337 } 436 }
338 } 437 }
339 } 438 }
340 439
341 return state != ERROR; 440 return state != ERROR;
342} 441}
343 442
443void tcp_connection::error ()
444{
445 stop ();
446
447 if (fd >= 0)
448 {
449 close (fd);
450 tos = -1;
451 fd = -1;
452 }
453
454 delete r_pkt; r_pkt = 0;
455 delete w_pkt; w_pkt = 0;
456#if ENABLE_HTTP_PROXY
457 free (proxy_req); proxy_req = 0;
458#endif
459
460 state = active ? IDLE : ERROR;
461}
462
344tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 463tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
345: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 464: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev)
346{ 465{
347 last_activity = NOW; 466 last_activity = ev_now ();
348 r_pkt = 0; 467 r_pkt = 0;
349 w_pkt = 0; 468 w_pkt = 0;
469 tos = -1;
350 fd = fd_; 470 fd = fd_;
471#if ENABLE_HTTP_PROXY
472 proxy_req = 0;
473#endif
351 474
352 if (fd < 0) 475 if (fd < 0)
353 { 476 {
354 active = true; 477 active = true;
355 state = IDLE; 478 state = IDLE;
356 } 479 }
357 else 480 else
358 { 481 {
359 active = false; 482 active = false;
360 state = ESTABLISHED; 483 state = ESTABLISHED;
361 start (fd, POLLIN); 484 start (fd, EV_READ);
362 } 485 }
363} 486}
364 487
365tcp_connection::~tcp_connection () 488tcp_connection::~tcp_connection ()
366{ 489{

Diff Legend

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