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.12 by pcg, Thu Mar 3 16:54:34 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
… …
100 ~tcp_connection (); 103 ~tcp_connection ();
101}; 104};
102 105
103void tcp_si_map::cleaner_cb (time_watcher &w) 106void tcp_si_map::cleaner_cb (time_watcher &w)
104{ 107{
105 w.at = NOW + 600; 108 w.start (NOW + 600);
109
106 tstamp to = NOW - ::conf.keepalive - 30 - 60; 110 tstamp to = NOW - ::conf.keepalive - 30 - 60;
107 111
108 for (iterator i = begin (); i != end(); ) 112 for (iterator i = begin (); i != end(); )
109 if (i->second->last_activity >= to) 113 if (i->second->last_activity >= to)
110 ++i; 114 ++i;
… …
116} 120}
117 121
118void 122void
119vpn::tcpv4_ev (io_watcher &w, short revents) 123vpn::tcpv4_ev (io_watcher &w, short revents)
120{ 124{
121 if (revents & (POLLIN | POLLERR)) 125 if (revents & EVENT_READ)
122 { 126 {
123 struct sockaddr_in sa; 127 struct sockaddr_in sa;
124 socklen_t sa_len = sizeof (sa); 128 socklen_t sa_len = sizeof (sa);
125 int len; 129 int len;
126 130
… …
198void 202void
199tcp_connection::tcpv4_ev (io_watcher &w, short revents) 203tcp_connection::tcpv4_ev (io_watcher &w, short revents)
200{ 204{
201 last_activity = NOW; 205 last_activity = NOW;
202 206
203 if (revents & (POLLERR | POLLHUP)) 207 if (revents & EVENT_WRITE)
204 {
205 error ();
206 return;
207 }
208
209 if (revents & POLLOUT)
210 { 208 {
211 if (state == CONNECTING) 209 if (state == CONNECTING)
212 { 210 {
213 state = ESTABLISHED; 211 state = ESTABLISHED;
214 set (POLLIN); 212 set (EVENT_READ);
215#if ENABLE_HTTP_PROXY 213#if ENABLE_HTTP_PROXY
216 if (::conf.proxy_host && ::conf.proxy_port) 214 if (::conf.proxy_host && ::conf.proxy_port)
217 { 215 {
218 state = CONNECTING_PROXY; 216 state = CONNECTING_PROXY;
217
219 write (fd, proxy_req, proxy_req_len); 218 if (write (fd, proxy_req, proxy_req_len) == 0)
219 {
220 error ();
221 return;
222 }
223
220 free (proxy_req); proxy_req = 0; 224 free (proxy_req); proxy_req = 0;
221 } 225 }
222#endif 226#endif
223 } 227 }
224 else if (state == ESTABLISHED) 228 else if (state == ESTABLISHED)
… …
227 { 231 {
228 if (write_packet ()) 232 if (write_packet ())
229 { 233 {
230 delete w_pkt; w_pkt = 0; 234 delete w_pkt; w_pkt = 0;
231 235
232 set (POLLIN); 236 set (EVENT_READ);
233 } 237 }
234 } 238 }
235 else 239 else
236 set (POLLIN); 240 set (EVENT_READ);
237 } 241 }
238 else 242 else
239 set (POLLIN); 243 set (EVENT_READ);
240 } 244 }
241 245
242 if (revents & POLLIN) 246 if (revents & EVENT_READ)
243 { 247 {
244 if (state == ESTABLISHED) 248 if (state == ESTABLISHED)
245 for (;;) 249 for (;;)
246 { 250 {
247 if (!r_pkt) 251 if (!r_pkt)
… …
281 break; 285 break;
282 } 286 }
283 else if (len < 0 && (errno == EINTR || errno == EAGAIN)) 287 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
284 break; 288 break;
285 289
290 // len == 0 <-> EOF
286 error (); 291 error ();
287 break; 292 break;
288 } 293 }
289#if ENABLE_HTTP_PROXY 294#if ENABLE_HTTP_PROXY
290 else if (state == CONNECTING_PROXY) 295 else if (state == CONNECTING_PROXY)
… …
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 {
389 state = CONNECTING; 394 state = CONNECTING;
390 start (fd, POLLOUT); 395 start (fd, EVENT_WRITE);
391 } 396 }
392 else 397 else
393 close (fd); 398 close (fd);
394 } 399 }
395 } 400 }
… …
414 else 419 else
415 { 420 {
416 w_pkt = new vpn_packet; 421 w_pkt = new vpn_packet;
417 w_pkt->set (*pkt); 422 w_pkt->set (*pkt);
418 423
419 set (POLLIN | POLLOUT); 424 set (EVENT_READ | EVENT_WRITE);
420 } 425 }
421 } 426 }
422 } 427 }
423 428
424 return state != ERROR; 429 return state != ERROR;
… …
460 } 465 }
461 else 466 else
462 { 467 {
463 active = false; 468 active = false;
464 state = ESTABLISHED; 469 state = ESTABLISHED;
465 start (fd, POLLIN); 470 start (fd, EVENT_READ);
466 } 471 }
467} 472}
468 473
469tcp_connection::~tcp_connection () 474tcp_connection::~tcp_connection ()
470{ 475{

Diff Legend

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