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.16 by pcg, Sat Jul 9 02:49:06 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. 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 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
130 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); 130 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len);
131 131
132 if (fd >= 0) 132 if (fd >= 0)
133 { 133 {
134 fcntl (fd, F_SETFL, O_NONBLOCK);
135 fcntl (fd, F_SETFD, FD_CLOEXEC);
136
134 sockinfo si(sa, PROT_TCPv4); 137 sockinfo si(sa, PROT_TCPv4);
135 138
136 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D 139 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
137
138 fcntl (fd, F_SETFL, O_NONBLOCK);
139 140
140 tcp_connection *i = new tcp_connection (fd, si, *this); 141 tcp_connection *i = new tcp_connection (fd, si, *this);
141 tcp_si.insert (*i); 142 tcp_si.insert (*i);
142 } 143 }
143 } 144 }
… …
169 if (w_ofs < 2) 170 if (w_ofs < 2)
170 { 171 {
171 u16 plen = htons (w_pkt->len); 172 u16 plen = htons (w_pkt->len);
172 173
173 iovec vec[2]; 174 iovec vec[2];
175 //TODO: char* is the right type? hardly...
174 vec[0].iov_base = ((u8 *)&plen) + w_ofs; 176 vec[0].iov_base = (char *)((u8 *)&plen) + w_ofs;
175 vec[0].iov_len = 2 - w_ofs; 177 vec[0].iov_len = 2 - w_ofs;
176 vec[1].iov_base = &((*w_pkt)[0]); 178 vec[1].iov_base = (char *)&((*w_pkt)[0]);
177 vec[1].iov_len = w_len - 2; 179 vec[1].iov_len = w_len - 2;
178 180
179 len = writev (fd, vec, 2); 181 len = writev (fd, vec, 2);
180 } 182 }
181 else 183 else
… …
200void 202void
201tcp_connection::tcpv4_ev (io_watcher &w, short revents) 203tcp_connection::tcpv4_ev (io_watcher &w, short revents)
202{ 204{
203 last_activity = NOW; 205 last_activity = NOW;
204 206
205 if (revents & (POLLERR | POLLHUP)) 207 if (revents & EVENT_WRITE)
206 {
207 error ();
208 return;
209 }
210
211 if (revents & POLLOUT)
212 { 208 {
213 if (state == CONNECTING) 209 if (state == CONNECTING)
214 { 210 {
215 state = ESTABLISHED; 211 state = ESTABLISHED;
216 set (POLLIN); 212 set (EVENT_READ);
217#if ENABLE_HTTP_PROXY 213#if ENABLE_HTTP_PROXY
218 if (::conf.proxy_host && ::conf.proxy_port) 214 if (::conf.proxy_host && ::conf.proxy_port)
219 { 215 {
220 state = CONNECTING_PROXY; 216 state = CONNECTING_PROXY;
217
221 write (fd, proxy_req, proxy_req_len); 218 if (write (fd, proxy_req, proxy_req_len) == 0)
219 {
220 error ();
221 return;
222 }
223
222 free (proxy_req); proxy_req = 0; 224 free (proxy_req); proxy_req = 0;
223 } 225 }
224#endif 226#endif
225 } 227 }
226 else if (state == ESTABLISHED) 228 else if (state == ESTABLISHED)
… …
229 { 231 {
230 if (write_packet ()) 232 if (write_packet ())
231 { 233 {
232 delete w_pkt; w_pkt = 0; 234 delete w_pkt; w_pkt = 0;
233 235
234 set (POLLIN); 236 set (EVENT_READ);
235 } 237 }
236 } 238 }
237 else 239 else
238 set (POLLIN); 240 set (EVENT_READ);
239 } 241 }
240 else 242 else
241 set (POLLIN); 243 set (EVENT_READ);
242 } 244 }
243 245
244 if (revents & POLLIN) 246 if (revents & EVENT_READ)
245 { 247 {
246 if (state == ESTABLISHED) 248 if (state == ESTABLISHED)
247 for (;;) 249 for (;;)
248 { 250 {
249 if (!r_pkt) 251 if (!r_pkt)
… …
283 break; 285 break;
284 } 286 }
285 else if (len < 0 && (errno == EINTR || errno == EAGAIN)) 287 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
286 break; 288 break;
287 289
290 // len == 0 <-> EOF
288 error (); 291 error ();
289 break; 292 break;
290 } 293 }
291#if ENABLE_HTTP_PROXY 294#if ENABLE_HTTP_PROXY
292 else if (state == CONNECTING_PROXY) 295 else if (state == CONNECTING_PROXY)
… …
320 323
321 fcntl (fd, F_SETFL, O_NONBLOCK); 324 fcntl (fd, F_SETFL, O_NONBLOCK);
322 325
323 if (i < 12) 326 if (i < 12)
324 { 327 {
325 slog (L_ERR, _("unable to do proxy-forwarding, short response")); 328 slog (L_ERR, _("(%s): unable to do proxy-forwarding, short response"),
329 (const char *)si);
326 error (); 330 error ();
327 } 331 }
328 else if (r[0] != 'H' || r[1] != 'T' || r[2] != 'T' || r[3] != 'P' || r[4] != '/' 332 else if (r[0] != 'H' || r[1] != 'T' || r[2] != 'T' || r[3] != 'P' || r[4] != '/'
329 || r[5] != '1' // http-major 333 || r[5] != '1' // http-major
330 || r[9] != '2') // response 334 || r[9] != '2') // response
331 { 335 {
332 slog (L_ERR, _("malformed or unexpected proxy response (%.12s)"), r); 336 slog (L_ERR, _("(%s): malformed or unexpected proxy response (%.12s)"),
337 (const char *)si, r);
333 error (); 338 error ();
334 } 339 }
335 else 340 else
336 state = ESTABLISHED; 341 state = ESTABLISHED;
337 } 342 }
… …
384 fcntl (fd, F_SETFL, O_NONBLOCK); 389 fcntl (fd, F_SETFL, O_NONBLOCK);
385 390
386 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0 391 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
387 || errno == EINPROGRESS) 392 || errno == EINPROGRESS)
388 { 393 {
394 fcntl (fd, F_SETFL, O_NONBLOCK);
395 fcntl (fd, F_SETFD, FD_CLOEXEC);
396
389 state = CONNECTING; 397 state = CONNECTING;
390 start (fd, POLLOUT); 398 start (fd, EVENT_WRITE);
391 } 399 }
392 else 400 else
393 close (fd); 401 close (fd);
394 } 402 }
395 } 403 }
… …
399 // right thing to do, not using tcp *is* the right thing to do. 407 // right thing to do, not using tcp *is* the right thing to do.
400 if (!w_pkt) 408 if (!w_pkt)
401 { 409 {
402 // how this maps to the underlying tcp packets we don't know 410 // how this maps to the underlying tcp packets we don't know
403 // and we don't care. at least we tried ;) 411 // and we don't care. at least we tried ;)
412#if defined(SOL_IP) && defined(IP_TOS)
404 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); 413 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
414#endif
405 415
406 w_pkt = pkt; 416 w_pkt = pkt;
407 w_ofs = 0; 417 w_ofs = 0;
408 w_len = pkt->len + 2; // length + size header 418 w_len = pkt->len + 2; // length + size header
409 419
… …
412 else 422 else
413 { 423 {
414 w_pkt = new vpn_packet; 424 w_pkt = new vpn_packet;
415 w_pkt->set (*pkt); 425 w_pkt->set (*pkt);
416 426
417 set (POLLIN | POLLOUT); 427 set (EVENT_READ | EVENT_WRITE);
418 } 428 }
419 } 429 }
420 } 430 }
421 431
422 return state != ERROR; 432 return state != ERROR;
… …
441} 451}
442 452
443tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 453tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
444: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 454: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev)
445{ 455{
456 if (!tcp_si.cleaner.active)
457 tcp_si.cleaner.start (0);
458
446 last_activity = NOW; 459 last_activity = NOW;
447 r_pkt = 0; 460 r_pkt = 0;
448 w_pkt = 0; 461 w_pkt = 0;
449 fd = fd_; 462 fd = fd_;
450#if ENABLE_HTTP_PROXY 463#if ENABLE_HTTP_PROXY
… …
458 } 471 }
459 else 472 else
460 { 473 {
461 active = false; 474 active = false;
462 state = ESTABLISHED; 475 state = ESTABLISHED;
463 start (fd, POLLIN); 476 start (fd, EVENT_READ);
464 } 477 }
465} 478}
466 479
467tcp_connection::~tcp_connection () 480tcp_connection::~tcp_connection ()
468{ 481{

Diff Legend

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