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.15 by pcg, Tue Oct 14 15:48:15 2003 UTC vs.
Revision 1.19 by pcg, Thu Oct 16 02:41:21 2003 UTC

1/* 1/*
2 vpn.C -- handle the protocol, encryption, handshaking etc. 2 vpn.C -- handle the protocol, encryption, handshaking etc.
3 Copyright (C) 2003 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.
… …
24#include <cstring> 25#include <cstring>
25#include <cstdio> 26#include <cstdio>
26 27
27#include <sys/types.h> 28#include <sys/types.h>
28#include <sys/socket.h> 29#include <sys/socket.h>
29#include <sys/poll.h>
30#include <sys/wait.h> 30#include <sys/wait.h>
31#include <errno.h> 31#include <errno.h>
32#include <time.h> 32#include <time.h>
33#include <unistd.h> 33#include <unistd.h>
34#include <fcntl.h> 34#include <fcntl.h>
… …
336 336
337 return true; 337 return true;
338} 338}
339 339
340void 340void
341vpn::inject_data_packet (tap_packet *pkt, int dst)
342{
343 if (dst)
344 {
345 // unicast
346 if (dst != THISNODE->id)
347 conns[dst - 1]->inject_data_packet (pkt);
348 }
349 else
350 {
351 // broadcast, this is ugly, but due to the security policy
352 // we have to connect to all hosts...
353 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
354 if ((*c)->conf != THISNODE)
355 (*c)->inject_data_packet (pkt, true);
356 }
357}
358
359void
341vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 360vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
342{ 361{
343 unsigned int src = pkt->src (); 362 unsigned int src = pkt->src ();
344 unsigned int dst = pkt->dst (); 363 unsigned int dst = pkt->dst ();
345 364
… …
359 connection *c = conns[src - 1]; 378 connection *c = conns[src - 1];
360 379
361 if (dst == 0) 380 if (dst == 0)
362 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"), 381 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
363 c->conf->nodename, (const char *)rsi); 382 c->conf->nodename, (const char *)rsi);
364 else if (dst != 0 && dst != THISNODE->id) 383 else if (dst != THISNODE->id)
365 { 384 {
366 if (THISNODE->routerprio) 385 if (THISNODE->routerprio)
367 // the tos setting gets lost here. who cares. 386 // the tos setting gets lost here. who cares.
368 conns[dst - 1]->inject_vpn_packet (pkt); 387 conns[dst - 1]->inject_vpn_packet (pkt);
369 else 388 else
… …
530 /* process data */ 549 /* process data */
531 tap_packet *pkt; 550 tap_packet *pkt;
532 551
533 pkt = tap->recv (); 552 pkt = tap->recv ();
534 553
554 if (!pkt)
555 return;
556
557 if (pkt->len > 14)
558 {
535 int dst = mac2id (pkt->dst); 559 int dst = mac2id (pkt->dst);
536 int src = mac2id (pkt->src); 560 int src = mac2id (pkt->src);
537 561
538 if (src != THISNODE->id) 562 if (src != THISNODE->id)
539 {
540 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
541 exit (1);
542 }
543
544 if (dst == THISNODE->id)
545 {
546 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
547 exit (1);
548 }
549
550 if (dst > conns.size ())
551 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
552 else
553 {
554 if (dst)
555 { 563 {
556 // unicast 564 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
557 if (dst != THISNODE->id) 565 exit (1);
558 conns[dst - 1]->inject_data_packet (pkt);
559 } 566 }
567
568 if (dst == THISNODE->id)
569 {
570 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
571 exit (1);
572 }
573
574 if (dst > conns.size ())
575 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
560 else 576 else
561 {
562 // broadcast, this is ugly, but due to the security policy
563 // we have to connect to all hosts...
564 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
565 if ((*c)->conf != THISNODE)
566 (*c)->inject_data_packet (pkt); 577 inject_data_packet (pkt, dst);
567 }
568 } 578 }
569 579
570 delete pkt; 580 delete pkt;
571 } 581 }
572 else if (revents & (POLLHUP | POLLERR)) 582 else if (revents & (POLLHUP | POLLERR))

Diff Legend

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