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.17 by pcg, Sat Nov 10 05:14:23 2007 UTC vs.
Revision 1.20 by pcg, Sat Dec 1 23:35:31 2007 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 Copyright (C) 2003-2007 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
8 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
… …
21 21
22#include "config.h" 22#include "config.h"
23 23
24#if ENABLE_TCP 24#if ENABLE_TCP
25 25
26// tcp processing is extremely ugly, since the vpe protocol is simply 26// tcp processing is extremely ugly, since the gvpe protocol is simply
27// designed for unreliable datagram networks. tcp is implemented by 27// designed for unreliable datagram networks. tcp is implemented by
28// multiplexing packets over tcp. errors are completely ignored, as we 28// multiplexing packets over tcp. errors are completely ignored, as we
29// rely on the higher level protocol to time out and reconnect. 29// rely on the higher level layers to time out and reconnect.
30 30
31#include <cstring> 31#include <cstring>
32 32
33#include <sys/types.h> 33#include <sys/types.h>
34#include <sys/socket.h> 34#include <sys/socket.h>
… …
63 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; 63 void cleaner_cb (ev::timer &w, int revents); ev::timer 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 { 67 {
68 cleaner.start (300, 300); 68 cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2);
69 } 69 }
70 70
71} tcp_si; 71} tcp_si;
72 72
73struct tcp_connection : ev::io { 73struct tcp_connection : ev::io {
… …
104 ~tcp_connection (); 104 ~tcp_connection ();
105}; 105};
106 106
107void tcp_si_map::cleaner_cb (ev::timer &w, int revents) 107void tcp_si_map::cleaner_cb (ev::timer &w, int revents)
108{ 108{
109 tstamp to = ev::ev_now () - ::conf.keepalive - 30 - 60; 109 tstamp to = ev_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;
114 else 114 else
115 { 115 {
116 delete i->second;
116 erase (i); 117 erase (i);
117 i = begin (); 118 i = begin ();
118 } 119 }
119} 120}
120 121
… …
200} 201}
201 202
202void 203void
203tcp_connection::tcpv4_ev (ev::io &w, int revents) 204tcp_connection::tcpv4_ev (ev::io &w, int revents)
204{ 205{
205 last_activity = ev::ev_now (); 206 last_activity = ev_now ();
206 207
207 if (revents & EV_WRITE) 208 if (revents & EV_WRITE)
208 { 209 {
209 if (state == CONNECTING) 210 if (state == CONNECTING)
210 { 211 {
… …
345} 346}
346 347
347bool 348bool
348tcp_connection::send_packet (vpn_packet *pkt, int tos) 349tcp_connection::send_packet (vpn_packet *pkt, int tos)
349{ 350{
350 last_activity = ev::ev_now (); 351 last_activity = ev_now ();
351 352
352 if (state == IDLE) 353 if (state == IDLE)
353 { 354 {
354 // woaw, the first lost packet ;) 355 // woaw, the first lost packet ;)
355 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 356 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
… …
432 return state != ERROR; 433 return state != ERROR;
433} 434}
434 435
435void tcp_connection::error () 436void tcp_connection::error ()
436{ 437{
438 stop ();
439
437 if (fd >= 0) 440 if (fd >= 0)
438 { 441 {
439 close (fd); 442 close (fd);
440 fd = -1; 443 fd = -1;
441 } 444 }
… …
444 delete w_pkt; w_pkt = 0; 447 delete w_pkt; w_pkt = 0;
445#if ENABLE_HTTP_PROXY 448#if ENABLE_HTTP_PROXY
446 free (proxy_req); proxy_req = 0; 449 free (proxy_req); proxy_req = 0;
447#endif 450#endif
448 451
449 stop ();
450 state = active ? IDLE : ERROR; 452 state = active ? IDLE : ERROR;
451} 453}
452 454
453tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 455tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
454: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev) 456: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev)
455{ 457{
456 if (!tcp_si.cleaner.active)
457 tcp_si.cleaner.start (0);
458
459 last_activity = ev::ev_now (); 458 last_activity = ev_now ();
460 r_pkt = 0; 459 r_pkt = 0;
461 w_pkt = 0; 460 w_pkt = 0;
462 fd = fd_; 461 fd = fd_;
463#if ENABLE_HTTP_PROXY 462#if ENABLE_HTTP_PROXY
464 proxy_req = 0; 463 proxy_req = 0;

Diff Legend

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