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.15 by pcg, Sat Jul 9 02:43:19 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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21 23
22#if ENABLE_TCP 24#if ENABLE_TCP
… …
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
… …
132 sockinfo si(sa, PROT_TCPv4); 134 sockinfo si(sa, PROT_TCPv4);
133 135
134 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D 136 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
135 137
136 fcntl (fd, F_SETFL, O_NONBLOCK); 138 fcntl (fd, F_SETFL, O_NONBLOCK);
139 fcntl (fd, F_SETFD, FD_CLOEXEC);
137 140
138 tcp_connection *i = new tcp_connection (fd, si, *this); 141 tcp_connection *i = new tcp_connection (fd, si, *this);
139 tcp_si.insert (*i); 142 tcp_si.insert (*i);
140 } 143 }
141 } 144 }
… …
199void 202void
200tcp_connection::tcpv4_ev (io_watcher &w, short revents) 203tcp_connection::tcpv4_ev (io_watcher &w, short revents)
201{ 204{
202 last_activity = NOW; 205 last_activity = NOW;
203 206
204 if (revents & (POLLERR | POLLHUP)) 207 if (revents & EVENT_WRITE)
205 {
206 error ();
207 return;
208 }
209
210 if (revents & POLLOUT)
211 { 208 {
212 if (state == CONNECTING) 209 if (state == CONNECTING)
213 { 210 {
214 state = ESTABLISHED; 211 state = ESTABLISHED;
215 set (POLLIN); 212 set (EVENT_READ);
216#if ENABLE_HTTP_PROXY 213#if ENABLE_HTTP_PROXY
217 if (::conf.proxy_host && ::conf.proxy_port) 214 if (::conf.proxy_host && ::conf.proxy_port)
218 { 215 {
219 state = CONNECTING_PROXY; 216 state = CONNECTING_PROXY;
217
220 write (fd, proxy_req, proxy_req_len); 218 if (write (fd, proxy_req, proxy_req_len) == 0)
219 {
220 error ();
221 return;
222 }
223
221 free (proxy_req); proxy_req = 0; 224 free (proxy_req); proxy_req = 0;
222 } 225 }
223#endif 226#endif
224 } 227 }
225 else if (state == ESTABLISHED) 228 else if (state == ESTABLISHED)
… …
228 { 231 {
229 if (write_packet ()) 232 if (write_packet ())
230 { 233 {
231 delete w_pkt; w_pkt = 0; 234 delete w_pkt; w_pkt = 0;
232 235
233 set (POLLIN); 236 set (EVENT_READ);
234 } 237 }
235 } 238 }
236 else 239 else
237 set (POLLIN); 240 set (EVENT_READ);
238 } 241 }
239 else 242 else
240 set (POLLIN); 243 set (EVENT_READ);
241 } 244 }
242 245
243 if (revents & POLLIN) 246 if (revents & EVENT_READ)
244 { 247 {
245 if (state == ESTABLISHED) 248 if (state == ESTABLISHED)
246 for (;;) 249 for (;;)
247 { 250 {
248 if (!r_pkt) 251 if (!r_pkt)
… …
282 break; 285 break;
283 } 286 }
284 else if (len < 0 && (errno == EINTR || errno == EAGAIN)) 287 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
285 break; 288 break;
286 289
290 // len == 0 <-> EOF
287 error (); 291 error ();
288 break; 292 break;
289 } 293 }
290#if ENABLE_HTTP_PROXY 294#if ENABLE_HTTP_PROXY
291 else if (state == CONNECTING_PROXY) 295 else if (state == CONNECTING_PROXY)
… …
386 390
387 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0 391 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
388 || errno == EINPROGRESS) 392 || errno == EINPROGRESS)
389 { 393 {
390 state = CONNECTING; 394 state = CONNECTING;
391 start (fd, POLLOUT); 395 start (fd, EVENT_WRITE);
392 } 396 }
393 else 397 else
394 close (fd); 398 close (fd);
395 } 399 }
396 } 400 }
… …
415 else 419 else
416 { 420 {
417 w_pkt = new vpn_packet; 421 w_pkt = new vpn_packet;
418 w_pkt->set (*pkt); 422 w_pkt->set (*pkt);
419 423
420 set (POLLIN | POLLOUT); 424 set (EVENT_READ | EVENT_WRITE);
421 } 425 }
422 } 426 }
423 } 427 }
424 428
425 return state != ERROR; 429 return state != ERROR;
… …
444} 448}
445 449
446tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 450tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
447: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 451: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev)
448{ 452{
453 if (!tcp_si.cleaner.active)
454 tcp_si.cleaner.start (0);
455
449 last_activity = NOW; 456 last_activity = NOW;
450 r_pkt = 0; 457 r_pkt = 0;
451 w_pkt = 0; 458 w_pkt = 0;
452 fd = fd_; 459 fd = fd_;
453#if ENABLE_HTTP_PROXY 460#if ENABLE_HTTP_PROXY
… …
461 } 468 }
462 else 469 else
463 { 470 {
464 active = false; 471 active = false;
465 state = ESTABLISHED; 472 state = ESTABLISHED;
466 start (fd, POLLIN); 473 start (fd, EVENT_READ);
467 } 474 }
468} 475}
469 476
470tcp_connection::~tcp_connection () 477tcp_connection::~tcp_connection ()
471{ 478{

Diff Legend

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