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.4 by pcg, Mon Apr 7 01:12:56 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 47
48#if ENABLE_HTTP_PROXY 48#if ENABLE_HTTP_PROXY
49# include "conf.h" 49# include "conf.h"
… …
61 61
62struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> { 62struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> {
63 void cleaner_cb (time_watcher &w); time_watcher cleaner; 63 void cleaner_cb (time_watcher &w); time_watcher cleaner;
64 64
65 tcp_si_map () 65 tcp_si_map ()
66 : cleaner(this, &tcp_si_map::cleaner_cb) 66 : cleaner(this, &tcp_si_map::cleaner_cb)
67 {
68 cleaner.start (0);
69 } 67 { }
68
70} tcp_si; 69} tcp_si;
71 70
72struct tcp_connection : io_watcher { 71struct tcp_connection : io_watcher {
73 tstamp last_activity; 72 tstamp last_activity;
74 const sockinfo si; 73 const sockinfo si;
… …
93 bool write_packet (); 92 bool write_packet ();
94 93
95 void error (); // abort conenction && cleanup 94 void error (); // abort conenction && cleanup
96 95
97 operator tcp_si_map::value_type() 96 operator tcp_si_map::value_type()
98 { 97 {
99 return tcp_si_map::value_type (&si, this); 98 return tcp_si_map::value_type (&si, this);
100 } 99 }
101 100
102 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 101 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
103 ~tcp_connection (); 102 ~tcp_connection ();
104}; 103};
105 104
106void tcp_si_map::cleaner_cb (time_watcher &w) 105void tcp_si_map::cleaner_cb (time_watcher &w)
107{ 106{
108 w.at = NOW + 600; 107 w.start (NOW + 600);
108
109 tstamp to = NOW - ::conf.keepalive - 30 - 60; 109 tstamp to = NOW - ::conf.keepalive - 30 - 60;
110 110
111 for (iterator i = begin (); i != end(); ) 111 for (iterator i = begin (); i != end(); )
112 if (i->second->last_activity >= to) 112 if (i->second->last_activity >= to)
113 ++i; 113 ++i;
… …
119} 119}
120 120
121void 121void
122vpn::tcpv4_ev (io_watcher &w, short revents) 122vpn::tcpv4_ev (io_watcher &w, short revents)
123{ 123{
124 if (revents & (POLLIN | POLLERR)) 124 if (revents & EVENT_READ)
125 { 125 {
126 struct sockaddr_in sa; 126 struct sockaddr_in sa;
127 socklen_t sa_len = sizeof (sa); 127 socklen_t sa_len = sizeof (sa);
128 int len; 128 int len;
129 129
… …
169 if (w_ofs < 2) 169 if (w_ofs < 2)
170 { 170 {
171 u16 plen = htons (w_pkt->len); 171 u16 plen = htons (w_pkt->len);
172 172
173 iovec vec[2]; 173 iovec vec[2];
174 //TODO: char* is the right type? hardly...
174 vec[0].iov_base = ((u8 *)&plen) + w_ofs; 175 vec[0].iov_base = (char *)((u8 *)&plen) + w_ofs;
175 vec[0].iov_len = 2 - w_ofs; 176 vec[0].iov_len = 2 - w_ofs;
176 vec[1].iov_base = &((*w_pkt)[0]); 177 vec[1].iov_base = (char *)&((*w_pkt)[0]);
177 vec[1].iov_len = w_len - 2; 178 vec[1].iov_len = w_len - 2;
178 179
179 len = writev (fd, vec, 2); 180 len = writev (fd, vec, 2);
180 } 181 }
181 else 182 else
… …
200void 201void
201tcp_connection::tcpv4_ev (io_watcher &w, short revents) 202tcp_connection::tcpv4_ev (io_watcher &w, short revents)
202{ 203{
203 last_activity = NOW; 204 last_activity = NOW;
204 205
205 if (revents & (POLLERR | POLLHUP)) 206 if (revents & EVENT_WRITE)
206 {
207 error ();
208 return;
209 }
210
211 if (revents & POLLOUT)
212 { 207 {
213 if (state == CONNECTING) 208 if (state == CONNECTING)
214 { 209 {
215 state = ESTABLISHED; 210 state = ESTABLISHED;
216 set (POLLIN); 211 set (EVENT_READ);
217#if ENABLE_HTTP_PROXY 212#if ENABLE_HTTP_PROXY
218 if (::conf.proxy_host && ::conf.proxy_port) 213 if (::conf.proxy_host && ::conf.proxy_port)
219 { 214 {
220 state = CONNECTING_PROXY; 215 state = CONNECTING_PROXY;
216
221 write (fd, proxy_req, proxy_req_len); 217 if (write (fd, proxy_req, proxy_req_len) == 0)
218 {
219 error ();
220 return;
221 }
222
222 free (proxy_req); proxy_req = 0; 223 free (proxy_req); proxy_req = 0;
223 } 224 }
224#endif 225#endif
225 } 226 }
226 else if (state == ESTABLISHED) 227 else if (state == ESTABLISHED)
… …
229 { 230 {
230 if (write_packet ()) 231 if (write_packet ())
231 { 232 {
232 delete w_pkt; w_pkt = 0; 233 delete w_pkt; w_pkt = 0;
233 234
234 set (POLLIN); 235 set (EVENT_READ);
235 } 236 }
236 } 237 }
237 else 238 else
238 set (POLLIN); 239 set (EVENT_READ);
239 } 240 }
240 else 241 else
241 set (POLLIN); 242 set (EVENT_READ);
242 } 243 }
243 244
244 if (revents & POLLIN) 245 if (revents & EVENT_READ)
245 { 246 {
246 if (state == ESTABLISHED) 247 if (state == ESTABLISHED)
247 for (;;) 248 for (;;)
248 { 249 {
249 if (!r_pkt) 250 if (!r_pkt)
… …
283 break; 284 break;
284 } 285 }
285 else if (len < 0 && (errno == EINTR || errno == EAGAIN)) 286 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
286 break; 287 break;
287 288
289 // len == 0 <-> EOF
288 error (); 290 error ();
289 break; 291 break;
290 } 292 }
291#if ENABLE_HTTP_PROXY 293#if ENABLE_HTTP_PROXY
292 else if (state == CONNECTING_PROXY) 294 else if (state == CONNECTING_PROXY)
… …
320 322
321 fcntl (fd, F_SETFL, O_NONBLOCK); 323 fcntl (fd, F_SETFL, O_NONBLOCK);
322 324
323 if (i < 12) 325 if (i < 12)
324 { 326 {
325 slog (L_ERR, _("unable to do proxy-forwarding, short response")); 327 slog (L_ERR, _("(%s): unable to do proxy-forwarding, short response"),
328 (const char *)si);
326 error (); 329 error ();
327 } 330 }
328 else if (r[0] != 'H' || r[1] != 'T' || r[2] != 'T' || r[3] != 'P' || r[4] != '/' 331 else if (r[0] != 'H' || r[1] != 'T' || r[2] != 'T' || r[3] != 'P' || r[4] != '/'
329 || r[5] != '1' // http-major 332 || r[5] != '1' // http-major
330 || r[9] != '2') // response 333 || r[9] != '2') // response
331 { 334 {
332 slog (L_ERR, _("malformed or unexpected proxy response (%.12s)"), r); 335 slog (L_ERR, _("(%s): malformed or unexpected proxy response (%.12s)"),
336 (const char *)si, r);
333 error (); 337 error ();
334 } 338 }
335 else 339 else
336 state = ESTABLISHED; 340 state = ESTABLISHED;
337 } 341 }
… …
385 389
386 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0 390 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
387 || errno == EINPROGRESS) 391 || errno == EINPROGRESS)
388 { 392 {
389 state = CONNECTING; 393 state = CONNECTING;
390 start (fd, POLLOUT); 394 start (fd, EVENT_WRITE);
391 } 395 }
392 else 396 else
393 close (fd); 397 close (fd);
394 } 398 }
395 } 399 }
… …
399 // right thing to do, not using tcp *is* the right thing to do. 403 // right thing to do, not using tcp *is* the right thing to do.
400 if (!w_pkt) 404 if (!w_pkt)
401 { 405 {
402 // how this maps to the underlying tcp packets we don't know 406 // how this maps to the underlying tcp packets we don't know
403 // and we don't care. at least we tried ;) 407 // and we don't care. at least we tried ;)
408#if defined(SOL_IP) && defined(IP_TOS)
404 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); 409 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
410#endif
405 411
406 w_pkt = pkt; 412 w_pkt = pkt;
407 w_ofs = 0; 413 w_ofs = 0;
408 w_len = pkt->len + 2; // length + size header 414 w_len = pkt->len + 2; // length + size header
409 415
… …
412 else 418 else
413 { 419 {
414 w_pkt = new vpn_packet; 420 w_pkt = new vpn_packet;
415 w_pkt->set (*pkt); 421 w_pkt->set (*pkt);
416 422
417 set (POLLIN | POLLOUT); 423 set (EVENT_READ | EVENT_WRITE);
418 } 424 }
419 } 425 }
420 } 426 }
421 427
422 return state != ERROR; 428 return state != ERROR;
… …
441} 447}
442 448
443tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 449tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
444: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 450: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev)
445{ 451{
452 if (!tcp_si.cleaner.active)
453 tcp_si.cleaner.start (0);
454
446 last_activity = NOW; 455 last_activity = NOW;
447 r_pkt = 0; 456 r_pkt = 0;
448 w_pkt = 0; 457 w_pkt = 0;
449 fd = fd_; 458 fd = fd_;
450#if ENABLE_HTTP_PROXY 459#if ENABLE_HTTP_PROXY
… …
458 } 467 }
459 else 468 else
460 { 469 {
461 active = false; 470 active = false;
462 state = ESTABLISHED; 471 state = ESTABLISHED;
463 start (fd, POLLIN); 472 start (fd, EVENT_READ);
464 } 473 }
465} 474}
466 475
467tcp_connection::~tcp_connection () 476tcp_connection::~tcp_connection ()
468{ 477{

Diff Legend

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