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.1 by pcg, Sat Apr 5 02:32:40 2003 UTC vs.
Revision 1.27 by root, Tue Feb 8 23:11:36 2011 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-2008 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 it
5 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
6 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
7 (at your option) any later version. 10 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, but
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 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 GNU General
12 GNU General Public License for more details. 15 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 along
15 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
16 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
17*/ 30*/
18 31
19#include "config.h" 32#include "config.h"
20 33
21#if ENABLE_TCP 34#if ENABLE_TCP
22 35
23// tcp processing is extremely ugly, since the vpe protocol is simply 36// tcp processing is extremely ugly, since the gvpe protocol is simply
24// designed for unreliable datagram networks. tcp is implemented by 37// designed for unreliable datagram networks. tcp is implemented by
25// multiplexing packets over tcp. errors are completely ignored, as we 38// multiplexing packets over tcp. errors are completely ignored, as we
26// rely on the higher level protocol to time out and reconnect. 39// rely on the higher level layers to time out and reconnect.
27 40
28#include <cstring> 41#include <cstring>
29 42
30#include <sys/types.h> 43#include <sys/types.h>
31#include <sys/socket.h> 44#include <sys/socket.h>
32#include <sys/poll.h>
33#include <sys/wait.h> 45#include <sys/wait.h>
34#include <netinet/in.h>
35#include <sys/uio.h> 46#include <sys/uio.h>
36#include <arpa/inet.h>
37#include <errno.h> 47#include <errno.h>
38#include <time.h> 48#include <time.h>
39#include <unistd.h> 49#include <unistd.h>
50#include <fcntl.h>
40 51
41#include <map> 52#include <map>
42#include <unistd.h> 53
43#include <fcntl.h> 54#include "netcompat.h"
44#include <sys/poll.h>
45 55
46#include "vpn.h" 56#include "vpn.h"
57
58#if ENABLE_HTTP_PROXY
59# include "conf.h"
60#endif
47 61
48struct tcp_connection; 62struct tcp_connection;
49 63
50struct lt_sockinfo 64struct lt_sockinfo
51{ 65{
… …
53 { 67 {
54 return *a < *b; 68 return *a < *b;
55 } 69 }
56}; 70};
57 71
58struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> { 72struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo>
59 void cleaner_cb (time_watcher &w); time_watcher cleaner; 73{
74 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
60 75
61 tcp_si_map () 76 tcp_si_map ()
62 : cleaner(this, &tcp_si_map::cleaner_cb)
63 { 77 {
64 cleaner.start (0); 78 ev_default_loop (0);
79 cleaner.set<tcp_si_map, &tcp_si_map::cleaner_cb> (this);
80 cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2);
65 } 81 }
66} tcp_si; 82};
67 83
84static tcp_si_map tcp_si;
85
68struct tcp_connection : io_watcher { 86struct tcp_connection : ev::io
87{
88 int tos;
69 tstamp last_activity; 89 tstamp last_activity;
70 const sockinfo si; 90 const sockinfo si;
71 vpn &v; 91 vpn &v;
72 bool active; // this connection has been actively established 92 bool active; // this connection has been actively established
73 enum { ERROR, IDLE, CONNECTING, ESTABLISHED } state; 93 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
74 94
75 vpn_packet *r_pkt; 95 vpn_packet *r_pkt;
76 u32 r_len, r_ofs; 96 u32 r_len, r_ofs;
77 97
78 void tcpv4_ev (io_watcher &w, short revents); 98 vpn_packet *w_pkt;
99 u32 w_len, w_ofs;
79 100
101#if ENABLE_HTTP_PROXY
102 char *proxy_req;
103 int proxy_req_len;
104#endif
105
106 inline void tcpv4_ev (ev::io &w, int revents);
107
80 void send_packet (vpn_packet *pkt, int tos); 108 bool send_packet (vpn_packet *pkt, int tos);
109 bool write_packet ();
81 110
82 void error (); // abort conenction && cleanup 111 void error (); // abort conenction && cleanup
83 112
84 operator tcp_si_map::value_type() 113 operator tcp_si_map::value_type()
85 { 114 {
86 return tcp_si_map::value_type (&si, this); 115 return tcp_si_map::value_type (&si, this);
87 } 116 }
88 117
89 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 118 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
90 ~tcp_connection (); 119 ~tcp_connection ();
91}; 120};
92 121
93void tcp_si_map::cleaner_cb (time_watcher &w) 122void
123tcp_si_map::cleaner_cb (ev::timer &w, int revents)
94{ 124{
95 w.at = NOW + 600;
96 tstamp to = NOW - ::conf.keepalive - 30 - 60; 125 tstamp to = ev_now () - ::conf.keepalive - 30 - 60;
97 126
98 for (iterator i = begin (); i != end(); ) 127 for (iterator i = begin (); i != end(); )
99 if (i->second->last_activity >= to) 128 if (i->second->last_activity >= to)
100 ++i; 129 ++i;
101 else 130 else
102 { 131 {
132 delete i->second;
103 erase (i); 133 erase (i);
104 i = begin (); 134 i = begin ();
105 } 135 }
106} 136}
107 137
108void 138void
109vpn::tcpv4_ev (io_watcher &w, short revents) 139vpn::tcpv4_ev (ev::io &w, int revents)
110{ 140{
111 if (revents & (POLLIN | POLLERR)) 141 if (revents & EV_READ)
112 { 142 {
113 struct sockaddr_in sa; 143 struct sockaddr_in sa;
114 socklen_t sa_len = sizeof (sa); 144 socklen_t sa_len = sizeof (sa);
115 int len; 145 int len;
116 146
117 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); 147 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len);
118 148
119 if (fd >= 0) 149 if (fd >= 0)
120 { 150 {
151 fcntl (fd, F_SETFL, O_NONBLOCK);
152 fcntl (fd, F_SETFD, FD_CLOEXEC);
153
121 sockinfo si(sa, PROT_TCPv4); 154 sockinfo si(sa, PROT_TCPv4);
122 155
123 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D 156 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
124
125 fcntl (fd, F_SETFL, O_NONBLOCK);
126 157
127 tcp_connection *i = new tcp_connection (fd, si, *this); 158 tcp_connection *i = new tcp_connection (fd, si, *this);
128 tcp_si.insert (*i); 159 tcp_si.insert (*i);
129 } 160 }
130 } 161 }
131} 162}
132 163
133void 164bool
134vpn::send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 165vpn::send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
135{ 166{
136 tcp_si_map::iterator info = tcp_si.find (&si); 167 tcp_si_map::iterator info = tcp_si.find (&si);
137 168
138 tcp_connection *i; 169 tcp_connection *i;
… …
143 tcp_si.insert (*i); 174 tcp_si.insert (*i);
144 } 175 }
145 else 176 else
146 i = info->second; 177 i = info->second;
147 178
148 i->send_packet (pkt, tos); 179 return i->send_packet (pkt, tos);
149} 180}
150 181
151void tcp_connection::error () 182bool
183tcp_connection::write_packet ()
152{ 184{
153 if (fd >= 0) 185 ssize_t len;
154 { 186
155 close (fd); 187 if (w_ofs < 2)
156 fd = -1;
157 } 188 {
189 u16 plen = htons (w_pkt->len);
158 190
159 delete r_pkt; 191 iovec vec[2];
160 r_pkt = 0; 192 //TODO: char* is the right type? hardly...
193 vec[0].iov_base = (char *)((u8 *)&plen) + w_ofs;
194 vec[0].iov_len = 2 - w_ofs;
195 vec[1].iov_base = (char *)&((*w_pkt)[0]);
196 vec[1].iov_len = w_len - 2;
161 197
162 stop (); 198 len = writev (fd, vec, 2);
163 state = active ? IDLE : ERROR; 199 }
200 else
201 len = write (fd, &((*w_pkt)[w_ofs - 2]), w_len);
202
203 if (len > 0)
204 {
205 w_ofs += len;
206 w_len -= len;
207
208 return w_len == 0;
209 }
210 else if (len < 0 && (errno == EAGAIN || errno == EINTR))
211 return false;
212 else
213 {
214 error ();
215 return false;
216 }
164} 217}
165 218
166void 219void
167tcp_connection::tcpv4_ev (io_watcher &w, short revents) 220tcp_connection::tcpv4_ev (ev::io &w, int revents)
168{ 221{
169 last_activity = NOW; 222 last_activity = ev_now ();
170 223
171 if (revents & (POLLERR | POLLHUP)) 224 if (revents & EV_WRITE)
172 error ();
173 else if (revents & POLLOUT && state == CONNECTING)
174 {
175 state = ESTABLISHED;
176 set (POLLIN);
177 } 225 {
178 226 if (state == CONNECTING)
179 else if (revents & POLLIN)
180 {
181 for (;;)
182 { 227 {
183 if (!r_pkt) 228 state = ESTABLISHED;
184 { 229 set (EV_READ);
185 r_pkt = new vpn_packet; 230#if ENABLE_HTTP_PROXY
186 r_ofs = 0; 231 if (::conf.proxy_host && ::conf.proxy_port)
187 r_len = 2; // header
188 } 232 {
233 state = CONNECTING_PROXY;
189 234
190 ssize_t len = read (fd, &((*r_pkt)[r_ofs < 2 ? r_ofs : r_ofs - 2]), r_len); 235 if (write (fd, proxy_req, proxy_req_len) == 0)
191
192 if (len > 0)
193 {
194 r_len -= len;
195 r_ofs += len;
196
197 if (r_len == 0)
198 { 236 {
237 error ();
238 return;
239 }
240
241 free (proxy_req); proxy_req = 0;
242 }
243#endif
244 }
245 else if (state == ESTABLISHED)
246 {
247 if (w_pkt)
248 {
249 if (write_packet ())
250 {
251 delete w_pkt; w_pkt = 0;
252
253 set (EV_READ);
254 }
255 }
256 else
257 set (EV_READ);
258 }
259 else
260 set (EV_READ);
261 }
262
263 if (revents & EV_READ)
264 {
265 if (state == ESTABLISHED)
266 for (;;)
267 {
268 if (!r_pkt)
269 {
270 r_pkt = new vpn_packet;
271 r_ofs = 0;
272 r_len = 2; // header
273 }
274
275 ssize_t len = read (fd, &((*r_pkt)[r_ofs < 2 ? r_ofs : r_ofs - 2]), r_len);
276
277 if (len > 0)
278 {
279 r_len -= len;
280 r_ofs += len;
281
282 if (r_len == 0)
283 {
199 if (r_ofs == 2) 284 if (r_ofs == 2)
200 { 285 {
201 r_len = ntohs (*(u16 *)&((*r_pkt)[0])); 286 r_len = ntohs (*(u16 *)&((*r_pkt)[0]));
202 r_pkt->len = r_len; 287 r_pkt->len = r_len;
203 288
204 if (r_len > 0 && r_len < MAXSIZE) 289 if (r_len > 0 && r_len < MAXSIZE)
290 continue;
291 }
292 else
293 {
294 v.recv_vpn_packet (r_pkt, si);
295 delete r_pkt;
296 r_pkt = 0;
297
205 continue; 298 continue;
206 } 299 }
300 }
301 else
302 break;
303 }
304 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
305 break;
306
307 // len == 0 <-> EOF
308 error ();
309 break;
310 }
311#if ENABLE_HTTP_PROXY
312 else if (state == CONNECTING_PROXY)
313 {
314 fcntl (fd, F_SETFL, 0);
315 char r[1024];
316 int i;
317 bool emptyline = false;
318
319 // we do a blocking read of the response, to hell with it
320 for (i = 0; i < 1023; i++)
321 {
322 int l = read (fd, &r[i], 1);
323
324 if (l <= 0)
325 {
326 error ();
327 return;
328 }
329
330 if (r[i] == '\012')
331 {
332 if (emptyline)
333 break;
207 else 334 else
208 {
209 v.recv_vpn_packet (r_pkt, si);
210 delete r_pkt;
211 r_pkt = 0;
212
213 continue; 335 emptyline = true;
214 }
215 } 336 }
337 else if (r[i] != '\015')
338 emptyline = false;
216 339 }
340
341 fcntl (fd, F_SETFL, O_NONBLOCK);
342
343 if (i < 12)
217 } 344 {
218 else if (len < 0 && (errno == EINTR || errno == EAGAIN)) 345 slog (L_ERR, _("(%s): unable to do proxy-forwarding, short response"),
219 return; 346 (const char *)si);
220
221 error (); 347 error ();
222 return; 348 }
349 else if (r[0] != 'H' || r[1] != 'T' || r[2] != 'T' || r[3] != 'P' || r[4] != '/'
350 || r[5] != '1' // http-major
351 || r[9] != '2') // response
352 {
353 slog (L_ERR, _("(%s): malformed or unexpected proxy response (%.12s)"),
354 (const char *)si, r);
355 error ();
356 }
357 else
358 state = ESTABLISHED;
223 } 359 }
360#endif
224 } 361 }
225} 362}
226 363
227void 364bool
228tcp_connection::send_packet (vpn_packet *pkt, int tos) 365tcp_connection::send_packet (vpn_packet *pkt, int tos)
229{ 366{
230 last_activity = NOW; 367 last_activity = ev_now ();
231 368
232 if (state == IDLE) 369 if (state == IDLE)
233 { 370 {
234 // woaw, the first lost packet ;) 371 // woaw, the first lost packet ;)
235 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 372 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
236 373
237 if (fd >= 0) 374 if (fd >= 0)
238 { 375 {
376 const sockinfo *csi = &si;
377
378#if ENABLE_HTTP_PROXY
379 sockinfo psi;
380
381 if (::conf.proxy_host && ::conf.proxy_port)
382 {
383 psi.set (::conf.proxy_host, ::conf.proxy_port, PROT_TCPv4);
384
385 if (psi.valid ())
386 {
387 csi = &psi;
388
389 proxy_req_len = asprintf (&proxy_req,
390 "CONNECT %s:%d HTTP/1.0\015\012"
391 "%s%s%s" // optional proxy-auth
392 "\015\012",
393 si.ntoa (),
394 ntohs (si.port),
395 ::conf.proxy_auth ? "Proxy-Authorization: Basic " : "",
396 ::conf.proxy_auth ? ::conf.proxy_auth : "",
397 ::conf.proxy_auth ? "\015\012" : "");
398
399 }
400 else
401 slog (L_ERR, _("unable to resolve http proxy hostname '%s', trying direct"),
402 ::conf.proxy_host);
403 }
404#endif
405
239 fcntl (fd, F_SETFL, O_NONBLOCK); 406 fcntl (fd, F_SETFL, O_NONBLOCK);
240 407
241 if (connect (fd, si.sav4 (), si.salenv4 ()) >= 0 408 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
242 || errno == EINPROGRESS) 409 || errno == EINPROGRESS)
243 { 410 {
411 fcntl (fd, F_SETFL, O_NONBLOCK);
412 fcntl (fd, F_SETFD, FD_CLOEXEC);
413
244 state = CONNECTING; 414 state = CONNECTING;
245 start (fd, POLLOUT); 415 start (fd, EV_WRITE);
246 } 416 }
247 else 417 else
248 close (fd); 418 close (fd);
249 } 419 }
250 } 420 }
251 else if (state == ESTABLISHED) 421 else if (state == ESTABLISHED)
252 { 422 {
423 // drop packet if the tcp write buffer is full. this *is* the
424 // right thing to do, not using tcp *is* the right thing to do.
425 if (!w_pkt)
426 {
253 // how this maps to the underlying tcp packet we don't know 427 // how this maps to the underlying tcp packets we don't know
254 // and we don't care. at least we tried ;) 428 // and we don't care. at least we tried ;)
429#if defined(SOL_IP) && defined(IP_TOS)
430 if (tos != this->tos)
431 {
432 this->tos = tos;
255 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); 433 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
434 }
435#endif
256 436
257 // we use none of the advantages of tcp; if an error occurs, just drop 437 w_pkt = pkt;
258 // (this happens when a tcp connection gets stuck, too, which might not be 438 w_ofs = 0;
259 // the wisest thing to do.. either drop packet (too late) or make sure 439 w_len = pkt->len + 2; // length + size header
260 // it gets delivered)
261 u16 len = htons (pkt->len);
262 440
263 iovec vec[2]; 441 if (write_packet ())
264 vec[0].iov_base = &len; 442 w_pkt = 0;
265 vec[0].iov_len = sizeof len; 443 else
266 vec[1].iov_base = &((*pkt)[0]); 444 {
267 vec[1].iov_len = pkt->len; 445 w_pkt = new vpn_packet;
446 w_pkt->set (*pkt);
447
448 set (EV_READ | EV_WRITE);
449 }
268 450 }
269 if (sizeof (u16) + pkt->len != writev (fd, vec, 2)) 451 }
270 error (); 452
453 return state != ERROR;
454}
455
456void
457tcp_connection::error ()
458{
459 stop ();
460
461 if (fd >= 0)
271 } 462 {
463 close (fd);
464 tos = -1;
465 fd = -1;
466 }
467
468 delete r_pkt; r_pkt = 0;
469 delete w_pkt; w_pkt = 0;
470#if ENABLE_HTTP_PROXY
471 free (proxy_req); proxy_req = 0;
472#endif
473
474 state = active ? IDLE : ERROR;
272} 475}
273 476
274tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 477tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
275: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 478: v(v_), si(si_)
276{ 479{
480 set<tcp_connection, &tcp_connection::tcpv4_ev> (this);
481
277 last_activity = NOW; 482 last_activity = ev_now ();
278 r_pkt = 0; 483 r_pkt = 0;
484 w_pkt = 0;
485 tos = -1;
279 fd = fd_; 486 fd = fd_;
487#if ENABLE_HTTP_PROXY
488 proxy_req = 0;
489#endif
280 490
281 if (fd < 0) 491 if (fd < 0)
282 { 492 {
283 active = true; 493 active = true;
284 state = IDLE; 494 state = IDLE;
285 } 495 }
286 else 496 else
287 { 497 {
288 active = false; 498 active = false;
289 state = ESTABLISHED; 499 state = ESTABLISHED;
290 start (fd, POLLIN); 500 start (fd, EV_READ);
291 } 501 }
292} 502}
293 503
294tcp_connection::~tcp_connection () 504tcp_connection::~tcp_connection ()
295{ 505{

Diff Legend

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