ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/vpn.C
(Generate patch)

Comparing gvpe/src/vpn.C (file contents):
Revision 1.4 by pcg, Fri Apr 4 05:26:45 2003 UTC vs.
Revision 1.6 by pcg, Sun Apr 6 04:17:36 2003 UTC

… …
38 38
39#include "connection.h" 39#include "connection.h"
40#include "util.h" 40#include "util.h"
41#include "vpn.h" 41#include "vpn.h"
42 42
43#if ENABLE_TCP
44# include <map>
45# include <unistd.h>
46# include <fcntl.h>
47# include <sys/poll.h>
48#endif
49
50///////////////////////////////////////////////////////////////////////////// 43/////////////////////////////////////////////////////////////////////////////
51 44
52const char *vpn::script_if_up () 45const char *vpn::script_if_up ()
53{ 46{
54 // the tunnel device mtu should be the physical mtu - overhead 47 // the tunnel device mtu should be the physical mtu - overhead
… …
191 reconnect_all (); 184 reconnect_all ();
192 185
193 return 0; 186 return 0;
194} 187}
195 188
189// send a vpn packet out to other hosts
190void
191vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
192{
193 switch (si.prot)
194 {
195 case PROT_IPv4:
196 send_ipv4_packet (pkt, si, tos);
197 break;
198
199 case PROT_UDPv4:
200 send_udpv4_packet (pkt, si, tos);
201 break;
202
203#if ENABLE_TCP
204 case PROT_TCPv4:
205 send_tcpv4_packet (pkt, si, tos);
206 break;
207#endif
208
209 default:
210 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
211 abort ();
212 }
213}
214
196void 215void
197vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 216vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
198{ 217{
199 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 218 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
200 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 219 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
… …
219 if (src == 0 || src > conns.size () 238 if (src == 0 || src > conns.size ()
220 || dst > conns.size () 239 || dst > conns.size ()
221 || pkt->typ () >= vpn_packet::PT_MAX) 240 || pkt->typ () >= vpn_packet::PT_MAX)
222 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), 241 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
223 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 242 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
243 else if (dst > conns.size ())
244 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
245 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
224 else 246 else
225 { 247 {
226 connection *c = conns[src - 1]; 248 connection *c = conns[src - 1];
227 249
228 if (dst == 0 && !THISNODE->routerprio) 250 if (dst == 0 && !THISNODE->routerprio)
229 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), 251 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"),
230 c->conf->nodename, (const char *)rsi); 252 c->conf->nodename, (const char *)rsi);
231 else if (dst != 0 && dst != THISNODE->id) 253 else if (dst != 0 && dst != THISNODE->id)
232 // FORWARDING NEEDED ;) 254 {
255 if (THISNODE->routerprio)
256 // the tos setting gets lost here. who cares.
257 conns[dst - 1]->inject_vpn_packet (pkt);
258 else
233 slog (L_WARN, 259 slog (L_WARN,
234 _("received frame for node %d ('%s') from %s, but this is node %d ('%s')"), 260 _("%s(%s): forwarding request (=> %s), but we are no router"),
261 c->conf->nodename, (const char *)rsi,
235 dst, conns[dst - 1]->conf->nodename, 262 conns[dst - 1]->conf->nodename);
236 (const char *)rsi, 263 }
237 THISNODE->id, THISNODE->nodename);
238 else 264 else
239 c->recv_vpn_packet (pkt, rsi); 265 c->recv_vpn_packet (pkt, rsi);
240 } 266 }
241} 267}
242 268
… …
248 vpn_packet *pkt = new vpn_packet; 274 vpn_packet *pkt = new vpn_packet;
249 struct sockaddr_in sa; 275 struct sockaddr_in sa;
250 socklen_t sa_len = sizeof (sa); 276 socklen_t sa_len = sizeof (sa);
251 int len; 277 int len;
252 278
253 len = recvfrom (w.p->fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 279 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
254 280
255 sockinfo si(sa); 281 sockinfo si(sa, PROT_UDPv4);
256 282
257 if (len > 0) 283 if (len > 0)
258 { 284 {
259 pkt->len = len; 285 pkt->len = len;
260 286
261 recv_vpn_packet (pkt, si); 287 recv_vpn_packet (pkt, si);
262 } 288 }
263 else 289 else
264 { 290 {
265 // probably ECONNRESET or somesuch 291 // probably ECONNRESET or somesuch
266 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 292 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
267 } 293 }
268 294
269 delete pkt; 295 delete pkt;
270 } 296 }
271 else if (revents & POLLHUP) 297 else if (revents & POLLHUP)
… …
291 vpn_packet *pkt = new vpn_packet; 317 vpn_packet *pkt = new vpn_packet;
292 struct sockaddr_in sa; 318 struct sockaddr_in sa;
293 socklen_t sa_len = sizeof (sa); 319 socklen_t sa_len = sizeof (sa);
294 int len; 320 int len;
295 321
296 len = recvfrom (w.p->fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 322 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
297 323
298 sockinfo si(sa, PROT_IPv4); 324 sockinfo si(sa, PROT_IPv4);
299 325
300 if (len > 0) 326 if (len > 0)
301 { 327 {
… …
327 _("FATAL: unknown revents %08x in socket, terminating\n"), 353 _("FATAL: unknown revents %08x in socket, terminating\n"),
328 revents); 354 revents);
329 exit (1); 355 exit (1);
330 } 356 }
331} 357}
332
333#if ENABLE_TCP
334
335struct tcp_connection;
336
337struct lt_sockinfo
338{
339 bool operator()(const sockinfo *a, const sockinfo *b) const
340 {
341 return *a < *b;
342 }
343};
344
345struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> {
346 void cleaner_cb (time_watcher &w); time_watcher cleaner;
347
348 tcp_si_map ()
349 : cleaner(this, &tcp_si_map::cleaner_cb)
350 {
351 cleaner.start (0);
352 }
353} tcp_si;
354
355struct tcp_connection : io_watcher {
356 tstamp last_activity;
357 const sockinfo si;
358 vpn &v;
359 bool ok;
360
361 vpn_packet *r_pkt;
362 u32 r_len, r_ofs;
363
364 void tcpv4_ev (io_watcher &w, short revents);
365
366 operator tcp_si_map::value_type()
367 {
368 return tcp_si_map::value_type (&si, this);
369 }
370
371 tcp_connection (int fd, const sockinfo &si_, vpn &v_)
372 : v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev)
373 {
374 last_activity = NOW;
375 ok = false;
376 r_pkt = 0;
377 start (fd, POLLOUT);
378 }
379
380 ~tcp_connection () { if (p) close (p->fd); }
381};
382
383void tcp_si_map::cleaner_cb (time_watcher &w)
384{
385 w.at = NOW + 600;
386 tstamp to = NOW - ::conf.keepalive - 30;
387
388 for (iterator i = begin (); i != end(); )
389 if (i->second->last_activity >= to)
390 ++i;
391 else
392 {
393 erase (i);
394 i = begin ();
395 }
396}
397
398void
399vpn::send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
400{
401 tcp_si_map::iterator info = tcp_si.find (&si);
402
403 if (info == tcp_si.end ())
404 {
405 // woaw, the first lost packet ;)
406 int fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
407
408 if (fd >= 0)
409 {
410 fcntl (fd, F_SETFL, O_NONBLOCK);
411
412 if (connect (fd, si.sav4 (), si.salenv4 ()) >= 0
413 || errno == EINPROGRESS)
414 {
415 tcp_connection *i = new tcp_connection (fd, si, *this);
416
417 tcp_si.insert (*i);
418 }
419 else
420 close (fd);
421 }
422 }
423 else
424 {
425 tcp_connection *i = info->second;
426
427 i->last_activity = NOW;
428
429 if (i->ok)
430 {
431 setsockopt (i->p->fd, SOL_IP, IP_TOS, &tos, sizeof tos);
432
433 // we use none of the advantages of tcp
434 write (i->p->fd, (void *)pkt, pkt->len + sizeof (u32)) != pkt->len + sizeof (u32);
435 }
436 }
437
438#if 0
439 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
440 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
441#endif
442}
443
444void
445tcp_connection::tcpv4_ev (io_watcher &w, short revents)
446{
447 last_activity = NOW;
448
449 if (!ok) // just established?
450 {
451 ok = true;
452 set (POLLIN);
453 }
454
455 if (revents & (POLLIN | POLLERR))
456 {
457 u32 len;
458
459 if (sizeof (len) == read (p->fd, &len, sizeof (len)))
460 {
461 vpn_packet *pkt = new vpn_packet;
462
463 if (len == read (p->fd, &((*pkt)[0]), len))
464 {
465 pkt->len = len;
466
467 v.recv_vpn_packet (pkt, si);
468 return;
469 }
470
471 delete pkt;
472 }
473
474 tcp_si.erase (&si);
475
476 set (0);//D
477 }
478}
479
480void
481vpn::tcpv4_ev (io_watcher &w, short revents)
482{
483 if (revents & (POLLIN | POLLERR))
484 {
485 struct sockaddr_in sa;
486 socklen_t sa_len = sizeof (sa);
487 int len;
488
489 int fd = accept (w.p->fd, (sockaddr *)&sa, &sa_len);
490
491 if (fd >= 0)
492 {
493 fcntl (fd, F_SETFL, O_NONBLOCK);
494
495 sockinfo si(sa, PROT_TCPv4);
496 tcp_connection *i = new tcp_connection (fd, si, *this);
497
498 slog (L_DEBUG, _("accepted tcp connection from %s\n"), (const char *)si);//D
499
500 tcp_si.insert (*i);
501 }
502 }
503}
504
505#endif
506 358
507void 359void
508vpn::tap_ev (io_watcher &w, short revents) 360vpn::tap_ev (io_watcher &w, short revents)
509{ 361{
510 if (revents & POLLIN) 362 if (revents & POLLIN)

Diff Legend

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