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.1 by pcg, Sat Apr 5 02:32:40 2003 UTC vs.
Revision 1.11 by pcg, Sat Jan 17 01:18:36 2004 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-2004 Marc Lehmann <pcg@goof.com>
3 4
4 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 6 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 7 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 8 (at your option) any later version.
… …
27 28
28#include <cstring> 29#include <cstring>
29 30
30#include <sys/types.h> 31#include <sys/types.h>
31#include <sys/socket.h> 32#include <sys/socket.h>
32#include <sys/poll.h>
33#include <sys/wait.h> 33#include <sys/wait.h>
34#include <netinet/in.h>
35#include <sys/uio.h> 34#include <sys/uio.h>
36#include <arpa/inet.h>
37#include <errno.h> 35#include <errno.h>
38#include <time.h> 36#include <time.h>
39#include <unistd.h> 37#include <unistd.h>
38#include <fcntl.h>
40 39
41#include <map> 40#include <map>
42#include <unistd.h> 41
43#include <fcntl.h> 42#include "netcompat.h"
44#include <sys/poll.h>
45 43
46#include "vpn.h" 44#include "vpn.h"
45
46#if ENABLE_HTTP_PROXY
47# include "conf.h"
48#endif
47 49
48struct tcp_connection; 50struct tcp_connection;
49 51
50struct lt_sockinfo 52struct lt_sockinfo
51{ 53{
… …
68struct tcp_connection : io_watcher { 70struct tcp_connection : io_watcher {
69 tstamp last_activity; 71 tstamp last_activity;
70 const sockinfo si; 72 const sockinfo si;
71 vpn &v; 73 vpn &v;
72 bool active; // this connection has been actively established 74 bool active; // this connection has been actively established
73 enum { ERROR, IDLE, CONNECTING, ESTABLISHED } state; 75 enum { ERROR, IDLE, CONNECTING, CONNECTING_PROXY, ESTABLISHED } state;
74 76
75 vpn_packet *r_pkt; 77 vpn_packet *r_pkt;
76 u32 r_len, r_ofs; 78 u32 r_len, r_ofs;
77 79
80 vpn_packet *w_pkt;
81 u32 w_len, w_ofs;
82
83#if ENABLE_HTTP_PROXY
84 char *proxy_req;
85 int proxy_req_len;
86#endif
87
78 void tcpv4_ev (io_watcher &w, short revents); 88 void tcpv4_ev (io_watcher &w, short revents);
79 89
80 void send_packet (vpn_packet *pkt, int tos); 90 bool send_packet (vpn_packet *pkt, int tos);
91 bool write_packet ();
81 92
82 void error (); // abort conenction && cleanup 93 void error (); // abort conenction && cleanup
83 94
84 operator tcp_si_map::value_type() 95 operator tcp_si_map::value_type()
85 { 96 {
… …
90 ~tcp_connection (); 101 ~tcp_connection ();
91}; 102};
92 103
93void tcp_si_map::cleaner_cb (time_watcher &w) 104void tcp_si_map::cleaner_cb (time_watcher &w)
94{ 105{
95 w.at = NOW + 600; 106 w.start (NOW + 600);
107
96 tstamp to = NOW - ::conf.keepalive - 30 - 60; 108 tstamp to = NOW - ::conf.keepalive - 30 - 60;
97 109
98 for (iterator i = begin (); i != end(); ) 110 for (iterator i = begin (); i != end(); )
99 if (i->second->last_activity >= to) 111 if (i->second->last_activity >= to)
100 ++i; 112 ++i;
… …
106} 118}
107 119
108void 120void
109vpn::tcpv4_ev (io_watcher &w, short revents) 121vpn::tcpv4_ev (io_watcher &w, short revents)
110{ 122{
111 if (revents & (POLLIN | POLLERR)) 123 if (revents & EVENT_READ)
112 { 124 {
113 struct sockaddr_in sa; 125 struct sockaddr_in sa;
114 socklen_t sa_len = sizeof (sa); 126 socklen_t sa_len = sizeof (sa);
115 int len; 127 int len;
116 128
… …
128 tcp_si.insert (*i); 140 tcp_si.insert (*i);
129 } 141 }
130 } 142 }
131} 143}
132 144
133void 145bool
134vpn::send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 146vpn::send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
135{ 147{
136 tcp_si_map::iterator info = tcp_si.find (&si); 148 tcp_si_map::iterator info = tcp_si.find (&si);
137 149
138 tcp_connection *i; 150 tcp_connection *i;
… …
143 tcp_si.insert (*i); 155 tcp_si.insert (*i);
144 } 156 }
145 else 157 else
146 i = info->second; 158 i = info->second;
147 159
148 i->send_packet (pkt, tos); 160 return i->send_packet (pkt, tos);
161}
162
163bool
164tcp_connection::write_packet ()
165{
166 ssize_t len;
167
168 if (w_ofs < 2)
169 {
170 u16 plen = htons (w_pkt->len);
171
172 iovec vec[2];
173 //TODO: char* is the right type? hardly...
174 vec[0].iov_base = (char *)((u8 *)&plen) + w_ofs;
175 vec[0].iov_len = 2 - w_ofs;
176 vec[1].iov_base = (char *)&((*w_pkt)[0]);
177 vec[1].iov_len = w_len - 2;
178
179 len = writev (fd, vec, 2);
180 }
181 else
182 len = write (fd, &((*w_pkt)[w_ofs - 2]), w_len);
183
184 if (len > 0)
185 {
186 w_ofs += len;
187 w_len -= len;
188
189 return w_len == 0;
190 }
191 else if (len < 0 && (errno == EAGAIN || errno == EINTR))
192 return false;
193 else
194 {
195 error ();
196 return false;
197 }
198}
199
200void
201tcp_connection::tcpv4_ev (io_watcher &w, short revents)
202{
203 last_activity = NOW;
204
205 if (revents & EVENT_WRITE)
206 {
207 if (state == CONNECTING)
208 {
209 state = ESTABLISHED;
210 set (EVENT_READ);
211#if ENABLE_HTTP_PROXY
212 if (::conf.proxy_host && ::conf.proxy_port)
213 {
214 state = CONNECTING_PROXY;
215
216 if (write (fd, proxy_req, proxy_req_len) == 0)
217 {
218 error ();
219 return;
220 }
221
222 free (proxy_req); proxy_req = 0;
223 }
224#endif
225 }
226 else if (state == ESTABLISHED)
227 {
228 if (w_pkt)
229 {
230 if (write_packet ())
231 {
232 delete w_pkt; w_pkt = 0;
233
234 set (EVENT_READ);
235 }
236 }
237 else
238 set (EVENT_READ);
239 }
240 else
241 set (EVENT_READ);
242 }
243
244 if (revents & EVENT_READ)
245 {
246 if (state == ESTABLISHED)
247 for (;;)
248 {
249 if (!r_pkt)
250 {
251 r_pkt = new vpn_packet;
252 r_ofs = 0;
253 r_len = 2; // header
254 }
255
256 ssize_t len = read (fd, &((*r_pkt)[r_ofs < 2 ? r_ofs : r_ofs - 2]), r_len);
257
258 if (len > 0)
259 {
260 r_len -= len;
261 r_ofs += len;
262
263 if (r_len == 0)
264 {
265 if (r_ofs == 2)
266 {
267 r_len = ntohs (*(u16 *)&((*r_pkt)[0]));
268 r_pkt->len = r_len;
269
270 if (r_len > 0 && r_len < MAXSIZE)
271 continue;
272 }
273 else
274 {
275 v.recv_vpn_packet (r_pkt, si);
276 delete r_pkt;
277 r_pkt = 0;
278
279 continue;
280 }
281 }
282 else
283 break;
284 }
285 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
286 break;
287
288 // len == 0 <-> EOF
289 error ();
290 break;
291 }
292#if ENABLE_HTTP_PROXY
293 else if (state == CONNECTING_PROXY)
294 {
295 fcntl (fd, F_SETFL, 0);
296 char r[1024];
297 int i;
298 bool emptyline = false;
299
300 // we do a blocking read of the response, to hell with it
301 for (i = 0; i < 1023; i++)
302 {
303 int l = read (fd, &r[i], 1);
304
305 if (l <= 0)
306 {
307 error ();
308 return;
309 }
310
311 if (r[i] == '\012')
312 {
313 if (emptyline)
314 break;
315 else
316 emptyline = true;
317 }
318 else if (r[i] != '\015')
319 emptyline = false;
320 }
321
322 fcntl (fd, F_SETFL, O_NONBLOCK);
323
324 if (i < 12)
325 {
326 slog (L_ERR, _("(%s): unable to do proxy-forwarding, short response"),
327 (const char *)si);
328 error ();
329 }
330 else if (r[0] != 'H' || r[1] != 'T' || r[2] != 'T' || r[3] != 'P' || r[4] != '/'
331 || r[5] != '1' // http-major
332 || r[9] != '2') // response
333 {
334 slog (L_ERR, _("(%s): malformed or unexpected proxy response (%.12s)"),
335 (const char *)si, r);
336 error ();
337 }
338 else
339 state = ESTABLISHED;
340 }
341#endif
342 }
343}
344
345bool
346tcp_connection::send_packet (vpn_packet *pkt, int tos)
347{
348 last_activity = NOW;
349
350 if (state == IDLE)
351 {
352 // woaw, the first lost packet ;)
353 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
354
355 if (fd >= 0)
356 {
357 const sockinfo *csi = &si;
358
359#if ENABLE_HTTP_PROXY
360 sockinfo psi;
361
362 if (::conf.proxy_host && ::conf.proxy_port)
363 {
364 psi.set (::conf.proxy_host, ::conf.proxy_port, PROT_TCPv4);
365
366 if (psi.valid ())
367 {
368 csi = &psi;
369
370 proxy_req_len = asprintf (&proxy_req,
371 "CONNECT %s:%d HTTP/1.0\015\012"
372 "%s%s%s" // optional proxy-auth
373 "\015\012",
374 si.ntoa (),
375 ntohs (si.port),
376 ::conf.proxy_auth ? "Proxy-Authorization: Basic " : "",
377 ::conf.proxy_auth ? ::conf.proxy_auth : "",
378 ::conf.proxy_auth ? "\015\012" : "");
379
380 }
381 else
382 slog (L_ERR, _("unable to resolve http proxy hostname '%s', trying direct"),
383 ::conf.proxy_host);
384 }
385#endif
386
387 fcntl (fd, F_SETFL, O_NONBLOCK);
388
389 if (connect (fd, csi->sav4 (), csi->salenv4 ()) >= 0
390 || errno == EINPROGRESS)
391 {
392 state = CONNECTING;
393 start (fd, EVENT_WRITE);
394 }
395 else
396 close (fd);
397 }
398 }
399 else if (state == ESTABLISHED)
400 {
401 // drop packet if the tcp write buffer is full. this *is* the
402 // right thing to do, not using tcp *is* the right thing to do.
403 if (!w_pkt)
404 {
405 // how this maps to the underlying tcp packets we don't know
406 // and we don't care. at least we tried ;)
407#if defined(SOL_IP) && defined(IP_TOS)
408 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
409#endif
410
411 w_pkt = pkt;
412 w_ofs = 0;
413 w_len = pkt->len + 2; // length + size header
414
415 if (write_packet ())
416 w_pkt = 0;
417 else
418 {
419 w_pkt = new vpn_packet;
420 w_pkt->set (*pkt);
421
422 set (EVENT_READ | EVENT_WRITE);
423 }
424 }
425 }
426
427 return state != ERROR;
149} 428}
150 429
151void tcp_connection::error () 430void tcp_connection::error ()
152{ 431{
153 if (fd >= 0) 432 if (fd >= 0)
154 { 433 {
155 close (fd); 434 close (fd);
156 fd = -1; 435 fd = -1;
157 } 436 }
158 437
159 delete r_pkt; 438 delete r_pkt; r_pkt = 0;
160 r_pkt = 0; 439 delete w_pkt; w_pkt = 0;
440#if ENABLE_HTTP_PROXY
441 free (proxy_req); proxy_req = 0;
442#endif
161 443
162 stop (); 444 stop ();
163 state = active ? IDLE : ERROR; 445 state = active ? IDLE : ERROR;
164} 446}
165 447
166void
167tcp_connection::tcpv4_ev (io_watcher &w, short revents)
168{
169 last_activity = NOW;
170
171 if (revents & (POLLERR | POLLHUP))
172 error ();
173 else if (revents & POLLOUT && state == CONNECTING)
174 {
175 state = ESTABLISHED;
176 set (POLLIN);
177 }
178
179 else if (revents & POLLIN)
180 {
181 for (;;)
182 {
183 if (!r_pkt)
184 {
185 r_pkt = new vpn_packet;
186 r_ofs = 0;
187 r_len = 2; // header
188 }
189
190 ssize_t len = read (fd, &((*r_pkt)[r_ofs < 2 ? r_ofs : r_ofs - 2]), r_len);
191
192 if (len > 0)
193 {
194 r_len -= len;
195 r_ofs += len;
196
197 if (r_len == 0)
198 {
199 if (r_ofs == 2)
200 {
201 r_len = ntohs (*(u16 *)&((*r_pkt)[0]));
202 r_pkt->len = r_len;
203
204 if (r_len > 0 && r_len < MAXSIZE)
205 continue;
206 }
207 else
208 {
209 v.recv_vpn_packet (r_pkt, si);
210 delete r_pkt;
211 r_pkt = 0;
212
213 continue;
214 }
215 }
216
217 }
218 else if (len < 0 && (errno == EINTR || errno == EAGAIN))
219 return;
220
221 error ();
222 return;
223 }
224 }
225}
226
227void
228tcp_connection::send_packet (vpn_packet *pkt, int tos)
229{
230 last_activity = NOW;
231
232 if (state == IDLE)
233 {
234 // woaw, the first lost packet ;)
235 fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
236
237 if (fd >= 0)
238 {
239 fcntl (fd, F_SETFL, O_NONBLOCK);
240
241 if (connect (fd, si.sav4 (), si.salenv4 ()) >= 0
242 || errno == EINPROGRESS)
243 {
244 state = CONNECTING;
245 start (fd, POLLOUT);
246 }
247 else
248 close (fd);
249 }
250 }
251 else if (state == ESTABLISHED)
252 {
253 // how this maps to the underlying tcp packet we don't know
254 // and we don't care. at least we tried ;)
255 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
256
257 // we use none of the advantages of tcp; if an error occurs, just drop
258 // (this happens when a tcp connection gets stuck, too, which might not be
259 // the wisest thing to do.. either drop packet (too late) or make sure
260 // it gets delivered)
261 u16 len = htons (pkt->len);
262
263 iovec vec[2];
264 vec[0].iov_base = &len;
265 vec[0].iov_len = sizeof len;
266 vec[1].iov_base = &((*pkt)[0]);
267 vec[1].iov_len = pkt->len;
268
269 if (sizeof (u16) + pkt->len != writev (fd, vec, 2))
270 error ();
271 }
272}
273
274tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_) 448tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
275: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev) 449: v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev)
276{ 450{
277 last_activity = NOW; 451 last_activity = NOW;
278 r_pkt = 0; 452 r_pkt = 0;
453 w_pkt = 0;
279 fd = fd_; 454 fd = fd_;
455#if ENABLE_HTTP_PROXY
456 proxy_req = 0;
457#endif
280 458
281 if (fd < 0) 459 if (fd < 0)
282 { 460 {
283 active = true; 461 active = true;
284 state = IDLE; 462 state = IDLE;
285 } 463 }
286 else 464 else
287 { 465 {
288 active = false; 466 active = false;
289 state = ESTABLISHED; 467 state = ESTABLISHED;
290 start (fd, POLLIN); 468 start (fd, EVENT_READ);
291 } 469 }
292} 470}
293 471
294tcp_connection::~tcp_connection () 472tcp_connection::~tcp_connection ()
295{ 473{

Diff Legend

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