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.9 by pcg, Wed Oct 15 00:41:59 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
… …
58 61
59struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> { 62struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> {
60 void cleaner_cb (time_watcher &w); time_watcher cleaner; 63 void cleaner_cb (time_watcher &w); time_watcher cleaner;
61 64
62 tcp_si_map () 65 tcp_si_map ()
63 : cleaner(this, &tcp_si_map::cleaner_cb) 66 : cleaner(this, &tcp_si_map::cleaner_cb)
64 {
65 cleaner.start (0);
66 } 67 { }
68
67} tcp_si; 69} tcp_si;
68 70
69struct tcp_connection : io_watcher { 71struct tcp_connection : io_watcher {
70 tstamp last_activity; 72 tstamp last_activity;
71 const sockinfo si; 73 const sockinfo si;
… …
90 bool write_packet (); 92 bool write_packet ();
91 93
92 void error (); // abort conenction && cleanup 94 void error (); // abort conenction && cleanup
93 95
94 operator tcp_si_map::value_type() 96 operator tcp_si_map::value_type()
95 { 97 {
96 return tcp_si_map::value_type (&si, this); 98 return tcp_si_map::value_type (&si, this);
97 } 99 }
98 100
99 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 101 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
100 ~tcp_connection (); 102 ~tcp_connection ();
101}; 103};
102 104
103void tcp_si_map::cleaner_cb (time_watcher &w) 105void tcp_si_map::cleaner_cb (time_watcher &w)
104{ 106{
105 w.at = NOW + 600; 107 w.start (NOW + 600);
108
106 tstamp to = NOW - ::conf.keepalive - 30 - 60; 109 tstamp to = NOW - ::conf.keepalive - 30 - 60;
107 110
108 for (iterator i = begin (); i != end(); ) 111 for (iterator i = begin (); i != end(); )
109 if (i->second->last_activity >= to) 112 if (i->second->last_activity >= to)
110 ++i; 113 ++i;
… …
116} 119}
117 120
118void 121void
119vpn::tcpv4_ev (io_watcher &w, short revents) 122vpn::tcpv4_ev (io_watcher &w, short revents)
120{ 123{
121 if (revents & (POLLIN | POLLERR)) 124 if (revents & EVENT_READ)
122 { 125 {
123 struct sockaddr_in sa; 126 struct sockaddr_in sa;
124 socklen_t sa_len = sizeof (sa); 127 socklen_t sa_len = sizeof (sa);
125 int len; 128 int len;
126 129
… …
198void 201void
199tcp_connection::tcpv4_ev (io_watcher &w, short revents) 202tcp_connection::tcpv4_ev (io_watcher &w, short revents)
200{ 203{
201 last_activity = NOW; 204 last_activity = NOW;
202 205
203 if (revents & (POLLERR | POLLHUP)) 206 if (revents & EVENT_WRITE)
204 {
205 error ();
206 return;
207 }
208
209 if (revents & POLLOUT)
210 { 207 {
211 if (state == CONNECTING) 208 if (state == CONNECTING)
212 { 209 {
213 state = ESTABLISHED; 210 state = ESTABLISHED;
214 set (POLLIN); 211 set (EVENT_READ);
215#if ENABLE_HTTP_PROXY 212#if ENABLE_HTTP_PROXY
216 if (::conf.proxy_host && ::conf.proxy_port) 213 if (::conf.proxy_host && ::conf.proxy_port)
217 { 214 {
218 state = CONNECTING_PROXY; 215 state = CONNECTING_PROXY;
216
219 write (fd, proxy_req, proxy_req_len); 217 if (write (fd, proxy_req, proxy_req_len) == 0)
218 {
219 error ();
220 return;
221 }
222
220 free (proxy_req); proxy_req = 0; 223 free (proxy_req); proxy_req = 0;
221 } 224 }
222#endif 225#endif
223 } 226 }
224 else if (state == ESTABLISHED) 227 else if (state == ESTABLISHED)
… …
227 { 230 {
228 if (write_packet ()) 231 if (write_packet ())
229 { 232 {
230 delete w_pkt; w_pkt = 0; 233 delete w_pkt; w_pkt = 0;
231 234
232 set (POLLIN); 235 set (EVENT_READ);
233 } 236 }
234 } 237 }
235 else 238 else
236 set (POLLIN); 239 set (EVENT_READ);
237 } 240 }
238 else 241 else
239 set (POLLIN); 242 set (EVENT_READ);
240 } 243 }
241 244
242 if (revents & POLLIN) 245 if (revents & EVENT_READ)
243 { 246 {
244 if (state == ESTABLISHED) 247 if (state == ESTABLISHED)
245 for (;;) 248 for (;;)
246 { 249 {
247 if (!r_pkt) 250 if (!r_pkt)
… …
281 break; 284 break;
282 } 285 }
283 else if (len < 0 && (errno == EINTR || errno == EAGAIN)) 286 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
284 break; 287 break;
285 288
289 // len == 0 <-> EOF
286 error (); 290 error ();
287 break; 291 break;
288 } 292 }
289#if ENABLE_HTTP_PROXY 293#if ENABLE_HTTP_PROXY
290 else if (state == CONNECTING_PROXY) 294 else if (state == CONNECTING_PROXY)
… …
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 }
… …
414 else 418 else
415 { 419 {
416 w_pkt = new vpn_packet; 420 w_pkt = new vpn_packet;
417 w_pkt->set (*pkt); 421 w_pkt->set (*pkt);
418 422
419 set (POLLIN | POLLOUT); 423 set (EVENT_READ | EVENT_WRITE);
420 } 424 }
421 } 425 }
422 } 426 }
423 427
424 return state != ERROR; 428 return state != ERROR;
… …
443} 447}
444 448
445tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 449tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
446: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 450: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev)
447{ 451{
452 if (!tcp_si.cleaner.active)
453 tcp_si.cleaner.start (0);
454
448 last_activity = NOW; 455 last_activity = NOW;
449 r_pkt = 0; 456 r_pkt = 0;
450 w_pkt = 0; 457 w_pkt = 0;
451 fd = fd_; 458 fd = fd_;
452#if ENABLE_HTTP_PROXY 459#if ENABLE_HTTP_PROXY
… …
460 } 467 }
461 else 468 else
462 { 469 {
463 active = false; 470 active = false;
464 state = ESTABLISHED; 471 state = ESTABLISHED;
465 start (fd, POLLIN); 472 start (fd, EVENT_READ);
466 } 473 }
467} 474}
468 475
469tcp_connection::~tcp_connection () 476tcp_connection::~tcp_connection ()
470{ 477{

Diff Legend

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