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

Diff Legend

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