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.14 by pcg, Tue Oct 14 03:22:09 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>
35#include <sys/socket.h> 34#include <sys/socket.h>
36#include <netinet/in.h> 35
37#include <arpa/inet.h> 36#include "netcompat.h"
38#include <net/if.h>
39#ifdef HAVE_NETINET_IN_SYSTM_H
40# include <netinet/in_systm.h>
41#endif
42#ifdef HAVE_NETINET_IP_H
43# include <netinet/ip.h>
44#endif
45#ifdef HAVE_NETINET_TCP_H
46# include <netinet/tcp.h>
47#endif
48#if ENABLE_ICMP
49# include <netinet/ip_icmp.h>
50#endif
51 37
52#include "pidfile.h" 38#include "pidfile.h"
53 39
54#include "connection.h" 40#include "connection.h"
55#include "util.h" 41#include "util.h"
56#include "vpn.h" 42#include "vpn.h"
57
58#if !defined(SOL_IP) && defined(IPPROTO_IP)
59# define SOL_IP IPPROTO_IP
60#endif
61 43
62///////////////////////////////////////////////////////////////////////////// 44/////////////////////////////////////////////////////////////////////////////
63 45
64const char *vpn::script_if_up () 46const char *vpn::script_if_up ()
65{ 47{
… …
320 302
321 return ~sum; 303 return ~sum;
322} 304}
323 305
324#if ENABLE_ICMP 306#if ENABLE_ICMP
325struct icmp_header {
326 u8 type;
327 u8 code;
328 u16 checksum;
329 union {
330 struct {
331 u16 id;
332 u16 sequence;
333 } echo;
334 u32 gateway;
335 struct {
336 u16 unused;
337 u16 mtu;
338 } frag;
339 } un;
340};
341
342bool 307bool
343vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 308vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
344{ 309{
345#if defined(SOL_IP) && defined(IP_TOS) 310#if defined(SOL_IP) && defined(IP_TOS)
346 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 311 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
… …
367 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 332 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
368#endif 333#endif
369 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 334 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
370 335
371 return true; 336 return true;
337}
338
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 }
372} 356}
373 357
374void 358void
375vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 359vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
376{ 360{
… …
393 connection *c = conns[src - 1]; 377 connection *c = conns[src - 1];
394 378
395 if (dst == 0) 379 if (dst == 0)
396 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"), 380 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
397 c->conf->nodename, (const char *)rsi); 381 c->conf->nodename, (const char *)rsi);
398 else if (dst != 0 && dst != THISNODE->id) 382 else if (dst != THISNODE->id)
399 { 383 {
400 if (THISNODE->routerprio) 384 if (THISNODE->routerprio)
401 // the tos setting gets lost here. who cares. 385 // the tos setting gets lost here. who cares.
402 conns[dst - 1]->inject_vpn_packet (pkt); 386 conns[dst - 1]->inject_vpn_packet (pkt);
403 else 387 else
… …
564 /* process data */ 548 /* process data */
565 tap_packet *pkt; 549 tap_packet *pkt;
566 550
567 pkt = tap->recv (); 551 pkt = tap->recv ();
568 552
553 if (!pkt)
554 return;
555
556 if (pkt->len > 14)
557 {
569 int dst = mac2id (pkt->dst); 558 int dst = mac2id (pkt->dst);
570 int src = mac2id (pkt->src); 559 int src = mac2id (pkt->src);
571 560
572 if (src != THISNODE->id) 561 if (src != THISNODE->id)
573 {
574 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
575 exit (1);
576 }
577
578 if (dst == THISNODE->id)
579 {
580 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
581 exit (1);
582 }
583
584 if (dst > conns.size ())
585 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
586 else
587 {
588 if (dst)
589 { 562 {
590 // unicast 563 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
591 if (dst != THISNODE->id) 564 exit (1);
592 conns[dst - 1]->inject_data_packet (pkt);
593 } 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);
594 else 575 else
595 {
596 // broadcast, this is ugly, but due to the security policy
597 // we have to connect to all hosts...
598 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
599 if ((*c)->conf != THISNODE)
600 (*c)->inject_data_packet (pkt); 576 inject_data_packet (pkt, dst);
601 }
602 } 577 }
603 578
604 delete pkt; 579 delete pkt;
605 } 580 }
606 else if (revents & (POLLHUP | POLLERR)) 581 else if (revents & (POLLHUP | POLLERR))

Diff Legend

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