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.18 by pcg, Thu Oct 16 02:28:36 2003 UTC

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

Diff Legend

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