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.15 by pcg, Sat Jul 9 02:43:19 2005 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>
… …
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 void cleaner_cb (time_watcher &w); time_watcher 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 (::conf.keepalive / 2, ::conf.keepalive / 2);
69 }
68 70
69} tcp_si; 71} tcp_si;
70 72
71struct tcp_connection : io_watcher { 73struct tcp_connection : ev::io {
74 int tos;
72 tstamp last_activity; 75 tstamp last_activity;
73 const sockinfo si; 76 const sockinfo si;
74 vpn &v; 77 vpn &v;
75 bool active; // this connection has been actively established 78 bool active; // this connection has been actively established
76 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state; 79 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
… …
84#if ENABLE_HTTP_PROXY 87#if ENABLE_HTTP_PROXY
85 char *proxy_req; 88 char *proxy_req;
86 int proxy_req_len; 89 int proxy_req_len;
87#endif 90#endif
88 91
89 void tcpv4_ev (io_watcher &w, short revents); 92 void tcpv4_ev (ev::io &w, int revents);
90 93
91 bool send_packet (vpn_packet *pkt, int tos); 94 bool send_packet (vpn_packet *pkt, int tos);
92 bool write_packet (); 95 bool write_packet ();
93 96
94 void error (); // abort conenction && cleanup 97 void error (); // abort conenction && cleanup
… …
100 103
101 tcp_connection (int fd_, const sockinfo &si_, vpn &v_); 104 tcp_connection (int fd_, const sockinfo &si_, vpn &v_);
102 ~tcp_connection (); 105 ~tcp_connection ();
103}; 106};
104 107
105void tcp_si_map::cleaner_cb (time_watcher &w) 108void tcp_si_map::cleaner_cb (ev::timer &w, int revents)
106{ 109{
107 w.start (NOW + 600);
108
109 tstamp to = 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
121void 123void
122vpn::tcpv4_ev (io_watcher &w, short revents) 124vpn::tcpv4_ev (ev::io &w, int revents)
123{ 125{
124 if (revents & EVENT_READ) 126 if (revents & EV_READ)
125 { 127 {
126 struct sockaddr_in sa; 128 struct sockaddr_in sa;
127 socklen_t sa_len = sizeof (sa); 129 socklen_t sa_len = sizeof (sa);
128 int len; 130 int len;
129 131
130 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); 132 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len);
131 133
132 if (fd >= 0) 134 if (fd >= 0)
133 { 135 {
134 sockinfo si(sa, PROT_TCPv4);
135
136 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
137
138 fcntl (fd, F_SETFL, O_NONBLOCK); 136 fcntl (fd, F_SETFL, O_NONBLOCK);
139 fcntl (fd, F_SETFD, FD_CLOEXEC); 137 fcntl (fd, F_SETFD, FD_CLOEXEC);
138
139 sockinfo si(sa, PROT_TCPv4);
140
141 slog (L_DEBUG, _("%s: accepted tcp connection"), (const char *)si);//D
140 142
141 tcp_connection *i = new tcp_connection (fd, si, *this); 143 tcp_connection *i = new tcp_connection (fd, si, *this);
142 tcp_si.insert (*i); 144 tcp_si.insert (*i);
143 } 145 }
144 } 146 }
… …
198 return false; 200 return false;
199 } 201 }
200} 202}
201 203
202void 204void
203tcp_connection::tcpv4_ev (io_watcher &w, short revents) 205tcp_connection::tcpv4_ev (ev::io &w, int revents)
204{ 206{
205 last_activity = NOW; 207 last_activity = ev_now ();
206 208
207 if (revents & EVENT_WRITE) 209 if (revents & EV_WRITE)
208 { 210 {
209 if (state == CONNECTING) 211 if (state == CONNECTING)
210 { 212 {
211 state = ESTABLISHED; 213 state = ESTABLISHED;
212 set (EVENT_READ); 214 set (EV_READ);
213#if ENABLE_HTTP_PROXY 215#if ENABLE_HTTP_PROXY
214 if (::conf.proxy_host && ::conf.proxy_port) 216 if (::conf.proxy_host && ::conf.proxy_port)
215 { 217 {
216 state = CONNECTING_PROXY; 218 state = CONNECTING_PROXY;
217 219
… …
231 { 233 {
232 if (write_packet ()) 234 if (write_packet ())
233 { 235 {
234 delete w_pkt; w_pkt = 0; 236 delete w_pkt; w_pkt = 0;
235 237
236 set (EVENT_READ); 238 set (EV_READ);
237 } 239 }
238 } 240 }
239 else 241 else
240 set (EVENT_READ); 242 set (EV_READ);
241 } 243 }
242 else 244 else
243 set (EVENT_READ); 245 set (EV_READ);
244 } 246 }
245 247
246 if (revents & EVENT_READ) 248 if (revents & EV_READ)
247 { 249 {
248 if (state == ESTABLISHED) 250 if (state == ESTABLISHED)
249 for (;;) 251 for (;;)
250 { 252 {
251 if (!r_pkt) 253 if (!r_pkt)
… …
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 = 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);
… …
389 fcntl (fd, F_SETFL, O_NONBLOCK); 391 fcntl (fd, F_SETFL, O_NONBLOCK);
390 392
391 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0 393 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
392 || errno == EINPROGRESS) 394 || errno == EINPROGRESS)
393 { 395 {
396 fcntl (fd, F_SETFL, O_NONBLOCK);
397 fcntl (fd, F_SETFD, FD_CLOEXEC);
398
394 state = CONNECTING; 399 state = CONNECTING;
395 start (fd, EVENT_WRITE); 400 start (fd, EV_WRITE);
396 } 401 }
397 else 402 else
398 close (fd); 403 close (fd);
399 } 404 }
400 } 405 }
… …
405 if (!w_pkt) 410 if (!w_pkt)
406 { 411 {
407 // 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
408 // and we don't care. at least we tried ;) 413 // and we don't care. at least we tried ;)
409#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;
410 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); 418 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
419 }
411#endif 420#endif
412 421
413 w_pkt = pkt; 422 w_pkt = pkt;
414 w_ofs = 0; 423 w_ofs = 0;
415 w_len = pkt->len + 2; // length + size header 424 w_len = pkt->len + 2; // length + size header
… …
419 else 428 else
420 { 429 {
421 w_pkt = new vpn_packet; 430 w_pkt = new vpn_packet;
422 w_pkt->set (*pkt); 431 w_pkt->set (*pkt);
423 432
424 set (EVENT_READ | EVENT_WRITE); 433 set (EV_READ | EV_WRITE);
425 } 434 }
426 } 435 }
427 } 436 }
428 437
429 return state != ERROR; 438 return state != ERROR;
430} 439}
431 440
432void tcp_connection::error () 441void tcp_connection::error ()
433{ 442{
443 stop ();
444
434 if (fd >= 0) 445 if (fd >= 0)
435 { 446 {
436 close (fd); 447 close (fd);
448 tos = -1;
437 fd = -1; 449 fd = -1;
438 } 450 }
439 451
440 delete r_pkt; r_pkt = 0; 452 delete r_pkt; r_pkt = 0;
441 delete w_pkt; w_pkt = 0; 453 delete w_pkt; w_pkt = 0;
442#if ENABLE_HTTP_PROXY 454#if ENABLE_HTTP_PROXY
443 free (proxy_req); proxy_req = 0; 455 free (proxy_req); proxy_req = 0;
444#endif 456#endif
445 457
446 stop ();
447 state = active ? IDLE : ERROR; 458 state = active ? IDLE : ERROR;
448} 459}
449 460
450tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 461tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
451: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 462: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev)
452{ 463{
453 if (!tcp_si.cleaner.active)
454 tcp_si.cleaner.start (0);
455
456 last_activity = NOW; 464 last_activity = ev_now ();
457 r_pkt = 0; 465 r_pkt = 0;
458 w_pkt = 0; 466 w_pkt = 0;
467 tos = -1;
459 fd = fd_; 468 fd = fd_;
460#if ENABLE_HTTP_PROXY 469#if ENABLE_HTTP_PROXY
461 proxy_req = 0; 470 proxy_req = 0;
462#endif 471#endif
463 472
… …
468 } 477 }
469 else 478 else
470 { 479 {
471 active = false; 480 active = false;
472 state = ESTABLISHED; 481 state = ESTABLISHED;
473 start (fd, EVENT_READ); 482 start (fd, EV_READ);
474 } 483 }
475} 484}
476 485
477tcp_connection::~tcp_connection () 486tcp_connection::~tcp_connection ()
478{ 487{

Diff Legend

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