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.25 by pcg, Wed Dec 12 00:17:13 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>
… …
57 { 57 {
58 return *a < *b; 58 return *a < *b;
59 } 59 }
60}; 60};
61 61
62struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> { 62struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo>
63{
63 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; 64 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
64 65
65 tcp_si_map () 66 tcp_si_map ()
66 : cleaner(this, &tcp_si_map::cleaner_cb)
67 { 67 {
68 cleaner.start (300, 300); 68 ev_default_loop (0);
69 cleaner.set<tcp_si_map, &tcp_si_map::cleaner_cb> (this);
70 cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2);
69 } 71 }
70 72
71} tcp_si; 73} tcp_si;
72 74
73struct tcp_connection : ev::io { 75struct tcp_connection : ev::io
76{
77 int tos;
74 tstamp last_activity; 78 tstamp last_activity;
75 const sockinfo si; 79 const sockinfo si;
76 vpn &v; 80 vpn &v;
77 bool active; // this connection has been actively established 81 bool active; // this connection has been actively established
78 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; 82 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
… …
86#if ENABLE_HTTP_PROXY 90#if ENABLE_HTTP_PROXY
87 char *proxy_req; 91 char *proxy_req;
88 int proxy_req_len; 92 int proxy_req_len;
89#endif 93#endif
90 94
91 void tcpv4_ev (ev::io &w, int revents); 95 inline void tcpv4_ev (ev::io &w, int revents);
92 96
93 bool send_packet (vpn_packet *pkt, int tos); 97 bool send_packet (vpn_packet *pkt, int tos);
94 bool write_packet (); 98 bool write_packet ();
95 99
96 void error (); // abort conenction && cleanup 100 void error (); // abort conenction && cleanup
… …
104 ~tcp_connection (); 108 ~tcp_connection ();
105}; 109};
106 110
107void tcp_si_map::cleaner_cb (ev::timer &w, int revents) 111void tcp_si_map::cleaner_cb (ev::timer &w, int revents)
108{ 112{
109 tstamp to = ev::ev_now () - ::conf.keepalive - 30 - 60; 113 tstamp to = ev_now () - ::conf.keepalive - 30 - 60;
110 114
111 for (iterator i = begin (); i != end(); ) 115 for (iterator i = begin (); i != end(); )
112 if (i->second->last_activity >= to) 116 if (i->second->last_activity >= to)
113 ++i; 117 ++i;
114 else 118 else
115 { 119 {
120 delete i->second;
116 erase (i); 121 erase (i);
117 i = begin (); 122 i = begin ();
118 } 123 }
119} 124}
120 125
… …
200} 205}
201 206
202void 207void
203tcp_connection::tcpv4_ev (ev::io &w, int revents) 208tcp_connection::tcpv4_ev (ev::io &w, int revents)
204{ 209{
205 last_activity = ev::ev_now (); 210 last_activity = ev_now ();
206 211
207 if (revents & EV_WRITE) 212 if (revents & EV_WRITE)
208 { 213 {
209 if (state == CONNECTING) 214 if (state == CONNECTING)
210 { 215 {
… …
345} 350}
346 351
347bool 352bool
348tcp_connection::send_packet (vpn_packet *pkt, int tos) 353tcp_connection::send_packet (vpn_packet *pkt, int tos)
349{ 354{
350 last_activity = ev::ev_now (); 355 last_activity = ev_now ();
351 356
352 if (state == IDLE) 357 if (state == IDLE)
353 { 358 {
354 // woaw, the first lost packet ;) 359 // woaw, the first lost packet ;)
355 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 360 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
… …
408 if (!w_pkt) 413 if (!w_pkt)
409 { 414 {
410 // how this maps to the underlying tcp packets we don't know 415 // how this maps to the underlying tcp packets we don't know
411 // and we don't care. at least we tried ;) 416 // and we don't care. at least we tried ;)
412#if defined(SOL_IP) && defined(IP_TOS) 417#if defined(SOL_IP) && defined(IP_TOS)
418 if (tos != this->tos)
419 {
420 this->tos = tos;
413 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); 421 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
422 }
414#endif 423#endif
415 424
416 w_pkt = pkt; 425 w_pkt = pkt;
417 w_ofs = 0; 426 w_ofs = 0;
418 w_len = pkt->len + 2; // length + size header 427 w_len = pkt->len + 2; // length + size header
… …
432 return state != ERROR; 441 return state != ERROR;
433} 442}
434 443
435void tcp_connection::error () 444void tcp_connection::error ()
436{ 445{
446 stop ();
447
437 if (fd >= 0) 448 if (fd >= 0)
438 { 449 {
439 close (fd); 450 close (fd);
451 tos = -1;
440 fd = -1; 452 fd = -1;
441 } 453 }
442 454
443 delete r_pkt; r_pkt = 0; 455 delete r_pkt; r_pkt = 0;
444 delete w_pkt; w_pkt = 0; 456 delete w_pkt; w_pkt = 0;
445#if ENABLE_HTTP_PROXY 457#if ENABLE_HTTP_PROXY
446 free (proxy_req); proxy_req = 0; 458 free (proxy_req); proxy_req = 0;
447#endif 459#endif
448 460
449 stop ();
450 state = active ? IDLE : ERROR; 461 state = active ? IDLE : ERROR;
451} 462}
452 463
453tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 464tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
454: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev) 465: v(v_), si(si_)
455{ 466{
456 if (!tcp_si.cleaner.active) 467 set<tcp_connection, &tcp_connection::tcpv4_ev> (this);
457 tcp_si.cleaner.start (0);
458 468
459 last_activity = ev::ev_now (); 469 last_activity = ev_now ();
460 r_pkt = 0; 470 r_pkt = 0;
461 w_pkt = 0; 471 w_pkt = 0;
472 tos = -1;
462 fd = fd_; 473 fd = fd_;
463#if ENABLE_HTTP_PROXY 474#if ENABLE_HTTP_PROXY
464 proxy_req = 0; 475 proxy_req = 0;
465#endif 476#endif
466 477

Diff Legend

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