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.10 by pcg, Thu Oct 16 02:41:21 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 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
6 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
7 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your option) any later version.
9 11
10 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,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 15 GNU General Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 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
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21 23
… …
59 61
60struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> { 62struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> {
61 void cleaner_cb (time_watcher &w); time_watcher cleaner; 63 void cleaner_cb (time_watcher &w); time_watcher cleaner;
62 64
63 tcp_si_map () 65 tcp_si_map ()
64 : cleaner(this, &tcp_si_map::cleaner_cb) 66 : cleaner(this, &tcp_si_map::cleaner_cb)
65 {
66 cleaner.start (0);
67 } 67 { }
68
68} tcp_si; 69} tcp_si;
69 70
70struct tcp_connection : io_watcher { 71struct tcp_connection : io_watcher {
71 tstamp last_activity; 72 tstamp last_activity;
72 const sockinfo si; 73 const sockinfo si;
… …
91 bool write_packet (); 92 bool write_packet ();
92 93
93 void error (); // abort conenction && cleanup 94 void error (); // abort conenction && cleanup
94 95
95 operator tcp_si_map::value_type() 96 operator tcp_si_map::value_type()
96 { 97 {
97 return tcp_si_map::value_type (&si, this); 98 return tcp_si_map::value_type (&si, this);
98 } 99 }
99 100
100 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 101 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
101 ~tcp_connection (); 102 ~tcp_connection ();
102}; 103};
103 104
104void tcp_si_map::cleaner_cb (time_watcher &w) 105void tcp_si_map::cleaner_cb (time_watcher &w)
105{ 106{
106 w.at = NOW + 600; 107 w.start (NOW + 600);
108
107 tstamp to = NOW - ::conf.keepalive - 30 - 60; 109 tstamp to = NOW - ::conf.keepalive - 30 - 60;
108 110
109 for (iterator i = begin (); i != end(); ) 111 for (iterator i = begin (); i != end(); )
110 if (i->second->last_activity >= to) 112 if (i->second->last_activity >= to)
111 ++i; 113 ++i;
… …
117} 119}
118 120
119void 121void
120vpn::tcpv4_ev (io_watcher &w, short revents) 122vpn::tcpv4_ev (io_watcher &w, short revents)
121{ 123{
122 if (revents & (POLLIN | POLLERR)) 124 if (revents & EVENT_READ)
123 { 125 {
124 struct sockaddr_in sa; 126 struct sockaddr_in sa;
125 socklen_t sa_len = sizeof (sa); 127 socklen_t sa_len = sizeof (sa);
126 int len; 128 int len;
127 129
… …
199void 201void
200tcp_connection::tcpv4_ev (io_watcher &w, short revents) 202tcp_connection::tcpv4_ev (io_watcher &w, short revents)
201{ 203{
202 last_activity = NOW; 204 last_activity = NOW;
203 205
204 if (revents & (POLLERR | POLLHUP)) 206 if (revents & EVENT_WRITE)
205 {
206 error ();
207 return;
208 }
209
210 if (revents & POLLOUT)
211 { 207 {
212 if (state == CONNECTING) 208 if (state == CONNECTING)
213 { 209 {
214 state = ESTABLISHED; 210 state = ESTABLISHED;
215 set (POLLIN); 211 set (EVENT_READ);
216#if ENABLE_HTTP_PROXY 212#if ENABLE_HTTP_PROXY
217 if (::conf.proxy_host && ::conf.proxy_port) 213 if (::conf.proxy_host && ::conf.proxy_port)
218 { 214 {
219 state = CONNECTING_PROXY; 215 state = CONNECTING_PROXY;
216
220 write (fd, proxy_req, proxy_req_len); 217 if (write (fd, proxy_req, proxy_req_len) == 0)
218 {
219 error ();
220 return;
221 }
222
221 free (proxy_req); proxy_req = 0; 223 free (proxy_req); proxy_req = 0;
222 } 224 }
223#endif 225#endif
224 } 226 }
225 else if (state == ESTABLISHED) 227 else if (state == ESTABLISHED)
… …
228 { 230 {
229 if (write_packet ()) 231 if (write_packet ())
230 { 232 {
231 delete w_pkt; w_pkt = 0; 233 delete w_pkt; w_pkt = 0;
232 234
233 set (POLLIN); 235 set (EVENT_READ);
234 } 236 }
235 } 237 }
236 else 238 else
237 set (POLLIN); 239 set (EVENT_READ);
238 } 240 }
239 else 241 else
240 set (POLLIN); 242 set (EVENT_READ);
241 } 243 }
242 244
243 if (revents & POLLIN) 245 if (revents & EVENT_READ)
244 { 246 {
245 if (state == ESTABLISHED) 247 if (state == ESTABLISHED)
246 for (;;) 248 for (;;)
247 { 249 {
248 if (!r_pkt) 250 if (!r_pkt)
… …
282 break; 284 break;
283 } 285 }
284 else if (len < 0 && (errno == EINTR || errno == EAGAIN)) 286 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
285 break; 287 break;
286 288
289 // len == 0 <-> EOF
287 error (); 290 error ();
288 break; 291 break;
289 } 292 }
290#if ENABLE_HTTP_PROXY 293#if ENABLE_HTTP_PROXY
291 else if (state == CONNECTING_PROXY) 294 else if (state == CONNECTING_PROXY)
… …
386 389
387 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0 390 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
388 || errno == EINPROGRESS) 391 || errno == EINPROGRESS)
389 { 392 {
390 state = CONNECTING; 393 state = CONNECTING;
391 start (fd, POLLOUT); 394 start (fd, EVENT_WRITE);
392 } 395 }
393 else 396 else
394 close (fd); 397 close (fd);
395 } 398 }
396 } 399 }
… …
415 else 418 else
416 { 419 {
417 w_pkt = new vpn_packet; 420 w_pkt = new vpn_packet;
418 w_pkt->set (*pkt); 421 w_pkt->set (*pkt);
419 422
420 set (POLLIN | POLLOUT); 423 set (EVENT_READ | EVENT_WRITE);
421 } 424 }
422 } 425 }
423 } 426 }
424 427
425 return state != ERROR; 428 return state != ERROR;
… …
444} 447}
445 448
446tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 449tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
447: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 450: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev)
448{ 451{
452 if (!tcp_si.cleaner.active)
453 tcp_si.cleaner.start (0);
454
449 last_activity = NOW; 455 last_activity = NOW;
450 r_pkt = 0; 456 r_pkt = 0;
451 w_pkt = 0; 457 w_pkt = 0;
452 fd = fd_; 458 fd = fd_;
453#if ENABLE_HTTP_PROXY 459#if ENABLE_HTTP_PROXY
… …
461 } 467 }
462 else 468 else
463 { 469 {
464 active = false; 470 active = false;
465 state = ESTABLISHED; 471 state = ESTABLISHED;
466 start (fd, POLLIN); 472 start (fd, EVENT_READ);
467 } 473 }
468} 474}
469 475
470tcp_connection::~tcp_connection () 476tcp_connection::~tcp_connection ()
471{ 477{

Diff Legend

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