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.11 by pcg, Sat Jan 17 01:18:36 2004 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-2004 Marc Lehmann <pcg@goof.com>
3 4
4 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 6 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 7 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 8 (at your option) any later version.
… …
27 28
28#include <cstring> 29#include <cstring>
29 30
30#include <sys/types.h> 31#include <sys/types.h>
31#include <sys/socket.h> 32#include <sys/socket.h>
32#include <sys/poll.h>
33#include <sys/wait.h> 33#include <sys/wait.h>
34#include <netinet/in.h>
35#include <sys/uio.h> 34#include <sys/uio.h>
36#include <arpa/inet.h>
37#include <errno.h> 35#include <errno.h>
38#include <time.h> 36#include <time.h>
39#include <unistd.h> 37#include <unistd.h>
38#include <fcntl.h>
40 39
41#include <map> 40#include <map>
42#include <unistd.h> 41
43#include <fcntl.h> 42#include "netcompat.h"
44#include <sys/poll.h>
45 43
46#include "vpn.h" 44#include "vpn.h"
45
46#if ENABLE_HTTP_PROXY
47# include "conf.h"
48#endif
47 49
48struct tcp_connection; 50struct tcp_connection;
49 51
50struct lt_sockinfo 52struct lt_sockinfo
51{ 53{
… …
68struct tcp_connection : io_watcher { 70struct tcp_connection : io_watcher {
69 tstamp last_activity; 71 tstamp last_activity;
70 const sockinfo si; 72 const sockinfo si;
71 vpn &v; 73 vpn &v;
72 bool active; // this connection has been actively established 74 bool active; // this connection has been actively established
73 enum { ERROR, IDLE, CONNECTING, ESTABLISHED } state; 75 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
74 76
75 vpn_packet *r_pkt; 77 vpn_packet *r_pkt;
76 u32 r_len, r_ofs; 78 u32 r_len, r_ofs;
77 79
78 vpn_packet *w_pkt; 80 vpn_packet *w_pkt;
79 u32 w_len, w_ofs; 81 u32 w_len, w_ofs;
82
83#if ENABLE_HTTP_PROXY
84 char *proxy_req;
85 int proxy_req_len;
86#endif
80 87
81 void tcpv4_ev (io_watcher &w, short revents); 88 void tcpv4_ev (io_watcher &w, short revents);
82 89
83 bool send_packet (vpn_packet *pkt, int tos); 90 bool send_packet (vpn_packet *pkt, int tos);
84 bool write_packet (); 91 bool write_packet ();
… …
94 ~tcp_connection (); 101 ~tcp_connection ();
95}; 102};
96 103
97void tcp_si_map::cleaner_cb (time_watcher &w) 104void tcp_si_map::cleaner_cb (time_watcher &w)
98{ 105{
99 w.at = NOW + 600; 106 w.start (NOW + 600);
107
100 tstamp to = NOW - ::conf.keepalive - 30 - 60; 108 tstamp to = NOW - ::conf.keepalive - 30 - 60;
101 109
102 for (iterator i = begin (); i != end(); ) 110 for (iterator i = begin (); i != end(); )
103 if (i->second->last_activity >= to) 111 if (i->second->last_activity >= to)
104 ++i; 112 ++i;
… …
110} 118}
111 119
112void 120void
113vpn::tcpv4_ev (io_watcher &w, short revents) 121vpn::tcpv4_ev (io_watcher &w, short revents)
114{ 122{
115 if (revents & (POLLIN | POLLERR)) 123 if (revents & EVENT_READ)
116 { 124 {
117 struct sockaddr_in sa; 125 struct sockaddr_in sa;
118 socklen_t sa_len = sizeof (sa); 126 socklen_t sa_len = sizeof (sa);
119 int len; 127 int len;
120 128
… …
150 i = info->second; 158 i = info->second;
151 159
152 return i->send_packet (pkt, tos); 160 return i->send_packet (pkt, tos);
153} 161}
154 162
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 163bool
171tcp_connection::write_packet () 164tcp_connection::write_packet ()
172{ 165{
173 ssize_t len; 166 ssize_t len;
174 167
175 if (w_ofs < 2) 168 if (w_ofs < 2)
176 { 169 {
177 u16 plen = htons (w_pkt->len); 170 u16 plen = htons (w_pkt->len);
178 171
179 iovec vec[2]; 172 iovec vec[2];
173 //TODO: char* is the right type? hardly...
180 vec[0].iov_base = ((u8 *)&plen) + w_ofs; 174 vec[0].iov_base = (char *)((u8 *)&plen) + w_ofs;
181 vec[0].iov_len = 2 - w_ofs; 175 vec[0].iov_len = 2 - w_ofs;
182 vec[1].iov_base = &((*w_pkt)[0]); 176 vec[1].iov_base = (char *)&((*w_pkt)[0]);
183 vec[1].iov_len = w_len - 2; 177 vec[1].iov_len = w_len - 2;
184 178
185 len = writev (fd, vec, 2); 179 len = writev (fd, vec, 2);
186 } 180 }
187 else 181 else
… …
206void 200void
207tcp_connection::tcpv4_ev (io_watcher &w, short revents) 201tcp_connection::tcpv4_ev (io_watcher &w, short revents)
208{ 202{
209 last_activity = NOW; 203 last_activity = NOW;
210 204
211 if (revents & (POLLERR | POLLHUP)) 205 if (revents & EVENT_WRITE)
212 {
213 error ();
214 return;
215 }
216
217 if (revents & POLLOUT)
218 { 206 {
219 if (state == CONNECTING) 207 if (state == CONNECTING)
220 { 208 {
221 state = ESTABLISHED; 209 state = ESTABLISHED;
222 set (POLLIN); 210 set (EVENT_READ);
211#if ENABLE_HTTP_PROXY
212 if (::conf.proxy_host && ::conf.proxy_port)
213 {
214 state = CONNECTING_PROXY;
215
216 if (write (fd, proxy_req, proxy_req_len) == 0)
217 {
218 error ();
219 return;
220 }
221
222 free (proxy_req); proxy_req = 0;
223 }
224#endif
223 } 225 }
224 else if (state == ESTABLISHED) 226 else if (state == ESTABLISHED)
225 { 227 {
226 if (w_pkt) 228 if (w_pkt)
227 { 229 {
228 if (write_packet ()) 230 if (write_packet ())
229 { 231 {
230 delete w_pkt; w_pkt = 0; 232 delete w_pkt; w_pkt = 0;
231 233
232 set (POLLIN); 234 set (EVENT_READ);
233 } 235 }
234 } 236 }
235 else 237 else
236 set (POLLIN); 238 set (EVENT_READ);
237 } 239 }
238 else 240 else
239 set (POLLIN); 241 set (EVENT_READ);
240 }
241
242 if (revents & POLLIN)
243 { 242 }
243
244 if (revents & EVENT_READ)
245 {
246 if (state == ESTABLISHED)
244 for (;;) 247 for (;;)
245 { 248 {
246 if (!r_pkt) 249 if (!r_pkt)
247 { 250 {
248 r_pkt = new vpn_packet; 251 r_pkt = new vpn_packet;
249 r_ofs = 0; 252 r_ofs = 0;
250 r_len = 2; // header 253 r_len = 2; // header
251 } 254 }
252 255
253 ssize_t len = read (fd, &((*r_pkt)[r_ofs < 2 ? r_ofs : r_ofs - 2]), r_len); 256 ssize_t len = read (fd, &((*r_pkt)[r_ofs < 2 ? r_ofs : r_ofs - 2]), r_len);
254 257
255 if (len > 0) 258 if (len > 0)
256 { 259 {
257 r_len -= len; 260 r_len -= len;
258 r_ofs += len; 261 r_ofs += len;
259 262
260 if (r_len == 0) 263 if (r_len == 0)
264 {
265 if (r_ofs == 2)
266 {
267 r_len = ntohs (*(u16 *)&((*r_pkt)[0]));
268 r_pkt->len = r_len;
269
270 if (r_len > 0 && r_len < MAXSIZE)
271 continue;
272 }
273 else
274 {
275 v.recv_vpn_packet (r_pkt, si);
276 delete r_pkt;
277 r_pkt = 0;
278
279 continue;
280 }
281 }
282 else
283 break;
284 }
285 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
286 break;
287
288 // len == 0 <-> EOF
289 error ();
290 break;
291 }
292#if ENABLE_HTTP_PROXY
293 else if (state == CONNECTING_PROXY)
294 {
295 fcntl (fd, F_SETFL, 0);
296 char r[1024];
297 int i;
298 bool emptyline = false;
299
300 // we do a blocking read of the response, to hell with it
301 for (i = 0; i < 1023; i++)
302 {
303 int l = read (fd, &r[i], 1);
304
305 if (l <= 0)
261 { 306 {
262 if (r_ofs == 2) 307 error ();
263 { 308 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 } 309 }
310
311 if (r[i] == '\012')
312 {
313 if (emptyline)
314 break;
270 else 315 else
271 {
272 v.recv_vpn_packet (r_pkt, si);
273 delete r_pkt;
274 r_pkt = 0;
275
276 continue; 316 emptyline = true;
277 } 317 }
318 else if (r[i] != '\015')
319 emptyline = false;
320 }
321
322 fcntl (fd, F_SETFL, O_NONBLOCK);
323
324 if (i < 12)
325 {
326 slog (L_ERR, _("(%s): unable to do proxy-forwarding, short response"),
327 (const char *)si);
328 error ();
329 }
330 else if (r[0] != 'H' || r[1] != 'T' || r[2] != 'T' || r[3] != 'P' || r[4] != '/'
331 || r[5] != '1' // http-major
332 || r[9] != '2') // response
333 {
334 slog (L_ERR, _("(%s): malformed or unexpected proxy response (%.12s)"),
335 (const char *)si, r);
336 error ();
337 }
338 else
339 state = ESTABLISHED;
340 }
341#endif
342 }
343}
344
345bool
346tcp_connection::send_packet (vpn_packet *pkt, int tos)
347{
348 last_activity = NOW;
349
350 if (state == IDLE)
351 {
352 // woaw, the first lost packet ;)
353 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
354
355 if (fd >= 0)
356 {
357 const sockinfo *csi = &si;
358
359#if ENABLE_HTTP_PROXY
360 sockinfo psi;
361
362 if (::conf.proxy_host && ::conf.proxy_port)
363 {
364 psi.set (::conf.proxy_host, ::conf.proxy_port, PROT_TCPv4);
365
366 if (psi.valid ())
367 {
368 csi = &psi;
369
370 proxy_req_len = asprintf (&proxy_req,
371 "CONNECT %s:%d HTTP/1.0\015\012"
372 "%s%s%s" // optional proxy-auth
373 "\015\012",
374 si.ntoa (),
375 ntohs (si.port),
376 ::conf.proxy_auth ? "Proxy-Authorization: Basic " : "",
377 ::conf.proxy_auth ? ::conf.proxy_auth : "",
378 ::conf.proxy_auth ? "\015\012" : "");
379
278 } 380 }
279 else 381 else
280 break; 382 slog (L_ERR, _("unable to resolve http proxy hostname '%s', trying direct"),
383 ::conf.proxy_host);
384 }
385#endif
281 } 386
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); 387 fcntl (fd, F_SETFL, O_NONBLOCK);
304 388
305 if (connect (fd, si.sav4 (), si.salenv4 ()) >= 0 389 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
306 || errno == EINPROGRESS) 390 || errno == EINPROGRESS)
307 { 391 {
308 state = CONNECTING; 392 state = CONNECTING;
309 start (fd, POLLOUT); 393 start (fd, EVENT_WRITE);
310 } 394 }
311 else 395 else
312 close (fd); 396 close (fd);
313 } 397 }
314 } 398 }
… …
318 // right thing to do, not using tcp *is* the right thing to do. 402 // right thing to do, not using tcp *is* the right thing to do.
319 if (!w_pkt) 403 if (!w_pkt)
320 { 404 {
321 // how this maps to the underlying tcp packets we don't know 405 // how this maps to the underlying tcp packets we don't know
322 // and we don't care. at least we tried ;) 406 // and we don't care. at least we tried ;)
407#if defined(SOL_IP) && defined(IP_TOS)
323 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); 408 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
409#endif
324 410
325 w_pkt = pkt; 411 w_pkt = pkt;
326 w_ofs = 0; 412 w_ofs = 0;
327 w_len = pkt->len + 2; // length + size header 413 w_len = pkt->len + 2; // length + size header
328 414
… …
331 else 417 else
332 { 418 {
333 w_pkt = new vpn_packet; 419 w_pkt = new vpn_packet;
334 w_pkt->set (*pkt); 420 w_pkt->set (*pkt);
335 421
336 set (POLLIN | POLLOUT); 422 set (EVENT_READ | EVENT_WRITE);
337 } 423 }
338 } 424 }
339 } 425 }
340 426
341 return state != ERROR; 427 return state != ERROR;
428}
429
430void tcp_connection::error ()
431{
432 if (fd >= 0)
433 {
434 close (fd);
435 fd = -1;
436 }
437
438 delete r_pkt; r_pkt = 0;
439 delete w_pkt; w_pkt = 0;
440#if ENABLE_HTTP_PROXY
441 free (proxy_req); proxy_req = 0;
442#endif
443
444 stop ();
445 state = active ? IDLE : ERROR;
342} 446}
343 447
344tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 448tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
345: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 449: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev)
346{ 450{
347 last_activity = NOW; 451 last_activity = NOW;
348 r_pkt = 0; 452 r_pkt = 0;
349 w_pkt = 0; 453 w_pkt = 0;
350 fd = fd_; 454 fd = fd_;
455#if ENABLE_HTTP_PROXY
456 proxy_req = 0;
457#endif
351 458
352 if (fd < 0) 459 if (fd < 0)
353 { 460 {
354 active = true; 461 active = true;
355 state = IDLE; 462 state = IDLE;
356 } 463 }
357 else 464 else
358 { 465 {
359 active = false; 466 active = false;
360 state = ESTABLISHED; 467 state = ESTABLISHED;
361 start (fd, POLLIN); 468 start (fd, EVENT_READ);
362 } 469 }
363} 470}
364 471
365tcp_connection::~tcp_connection () 472tcp_connection::~tcp_connection ()
366{ 473{

Diff Legend

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