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

Diff Legend

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