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.21 by pcg, Sun Dec 2 00:39:06 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 {
74 int tos;
74 tstamp last_activity; 75 tstamp last_activity;
75 const sockinfo si; 76 const sockinfo si;
76 vpn &v; 77 vpn &v;
77 bool active; // this connection has been actively established 78 bool active; // this connection has been actively established
78 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; 79 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
… …
104 ~tcp_connection (); 105 ~tcp_connection ();
105}; 106};
106 107
107void tcp_si_map::cleaner_cb (ev::timer &w, int revents) 108void tcp_si_map::cleaner_cb (ev::timer &w, int revents)
108{ 109{
109 tstamp to = ev::ev_now () - ::conf.keepalive - 30 - 60; 110 tstamp to = ev_now () - ::conf.keepalive - 30 - 60;
110 111
111 for (iterator i = begin (); i != end(); ) 112 for (iterator i = begin (); i != end(); )
112 if (i->second->last_activity >= to) 113 if (i->second->last_activity >= to)
113 ++i; 114 ++i;
114 else 115 else
115 { 116 {
117 delete i->second;
116 erase (i); 118 erase (i);
117 i = begin (); 119 i = begin ();
118 } 120 }
119} 121}
120 122
… …
200} 202}
201 203
202void 204void
203tcp_connection::tcpv4_ev (ev::io &w, int revents) 205tcp_connection::tcpv4_ev (ev::io &w, int revents)
204{ 206{
205 last_activity = ev::ev_now (); 207 last_activity = ev_now ();
206 208
207 if (revents & EV_WRITE) 209 if (revents & EV_WRITE)
208 { 210 {
209 if (state == CONNECTING) 211 if (state == CONNECTING)
210 { 212 {
… …
345} 347}
346 348
347bool 349bool
348tcp_connection::send_packet (vpn_packet *pkt, int tos) 350tcp_connection::send_packet (vpn_packet *pkt, int tos)
349{ 351{
350 last_activity = ev::ev_now (); 352 last_activity = ev_now ();
351 353
352 if (state == IDLE) 354 if (state == IDLE)
353 { 355 {
354 // woaw, the first lost packet ;) 356 // woaw, the first lost packet ;)
355 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 357 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
… …
408 if (!w_pkt) 410 if (!w_pkt)
409 { 411 {
410 // how this maps to the underlying tcp packets we don't know 412 // how this maps to the underlying tcp packets we don't know
411 // and we don't care. at least we tried ;) 413 // and we don't care. at least we tried ;)
412#if defined(SOL_IP) && defined(IP_TOS) 414#if defined(SOL_IP) && defined(IP_TOS)
415 if (tos != this->tos)
416 {
417 this->tos = tos;
413 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); 418 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
419 }
414#endif 420#endif
415 421
416 w_pkt = pkt; 422 w_pkt = pkt;
417 w_ofs = 0; 423 w_ofs = 0;
418 w_len = pkt->len + 2; // length + size header 424 w_len = pkt->len + 2; // length + size header
… …
432 return state != ERROR; 438 return state != ERROR;
433} 439}
434 440
435void tcp_connection::error () 441void tcp_connection::error ()
436{ 442{
443 stop ();
444
437 if (fd >= 0) 445 if (fd >= 0)
438 { 446 {
439 close (fd); 447 close (fd);
448 tos = -1;
440 fd = -1; 449 fd = -1;
441 } 450 }
442 451
443 delete r_pkt; r_pkt = 0; 452 delete r_pkt; r_pkt = 0;
444 delete w_pkt; w_pkt = 0; 453 delete w_pkt; w_pkt = 0;
445#if ENABLE_HTTP_PROXY 454#if ENABLE_HTTP_PROXY
446 free (proxy_req); proxy_req = 0; 455 free (proxy_req); proxy_req = 0;
447#endif 456#endif
448 457
449 stop ();
450 state = active ? IDLE : ERROR; 458 state = active ? IDLE : ERROR;
451} 459}
452 460
453tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 461tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
454: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev) 462: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev)
455{ 463{
456 if (!tcp_si.cleaner.active)
457 tcp_si.cleaner.start (0);
458
459 last_activity = ev::ev_now (); 464 last_activity = ev_now ();
460 r_pkt = 0; 465 r_pkt = 0;
461 w_pkt = 0; 466 w_pkt = 0;
467 tos = -1;
462 fd = fd_; 468 fd = fd_;
463#if ENABLE_HTTP_PROXY 469#if ENABLE_HTTP_PROXY
464 proxy_req = 0; 470 proxy_req = 0;
465#endif 471#endif
466 472

Diff Legend

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