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.11 by pcg, Sun Apr 13 00:35:46 2003 UTC vs.
Revision 1.15 by pcg, Tue Oct 14 15:48:15 2003 UTC

… …
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>
35#include <arpa/inet.h> 35#include <sys/socket.h>
36#include <netinet/in.h> 36
37#include <netinet/ip_icmp.h> 37#include "netcompat.h"
38 38
39#include "pidfile.h" 39#include "pidfile.h"
40 40
41#include "connection.h" 41#include "connection.h"
42#include "util.h" 42#include "util.h"
… …
84 if (ipv4_fd < 0) 84 if (ipv4_fd < 0)
85 return -1; 85 return -1;
86 86
87 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); 87 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
88 88
89#ifdef IP_MTU_DISCOVER 89#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
90 // this I really consider a linux bug. I am neither connected 90 // this I really consider a linux bug. I am neither connected
91 // nor do I fragment myself. Linux still sets DF and doesn't 91 // nor do I fragment myself. Linux still sets DF and doesn't
92 // fragment for me sometimes. 92 // fragment for me sometimes.
93 { 93 {
94 int oval = IP_PMTUDISC_DONT; 94 int oval = IP_PMTUDISC_DONT;
… …
122 { 122 {
123 int oval = 1; 123 int oval = 1;
124 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 124 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
125 } 125 }
126 126
127#ifdef IP_MTU_DISCOVER 127#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
128 // this I really consider a linux bug. I am neither connected 128 // this I really consider a linux bug. I am neither connected
129 // nor do I fragment myself. Linux still sets DF and doesn't 129 // nor do I fragment myself. Linux still sets DF and doesn't
130 // fragment for me sometimes. 130 // fragment for me sometimes.
131 { 131 {
132 int oval = IP_PMTUDISC_DONT; 132 int oval = IP_PMTUDISC_DONT;
… …
166 166
167 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval); 167 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
168 } 168 }
169#endif 169#endif
170 170
171#ifdef IP_MTU_DISCOVER 171#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
172 // this I really consider a linux bug. I am neither connected 172 // this I really consider a linux bug. I am neither connected
173 // nor do I fragment myself. Linux still sets DF and doesn't 173 // nor do I fragment myself. Linux still sets DF and doesn't
174 // fragment for me sometimes. 174 // fragment for me sometimes.
175 { 175 {
176 int oval = IP_PMTUDISC_DONT; 176 int oval = IP_PMTUDISC_DONT;
… …
271} 271}
272 272
273bool 273bool
274vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 274vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
275{ 275{
276#if defined(SOL_IP) && defined(IP_TOS)
276 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 277 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
278#endif
277 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 279 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
278 280
279 return true; 281 return true;
280} 282}
281 283
… …
300 sum += (sum >> 16); // carry 302 sum += (sum >> 16); // carry
301 303
302 return ~sum; 304 return ~sum;
303} 305}
304 306
307#if ENABLE_ICMP
305bool 308bool
306vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 309vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
307{ 310{
311#if defined(SOL_IP) && defined(IP_TOS)
308 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 312 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
313#endif
309 314
310 pkt->unshift_hdr (4); 315 pkt->unshift_hdr (4);
311 316
312 icmphdr *hdr = (icmphdr *)&((*pkt)[0]); 317 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
313 hdr->type = ::conf.icmp_type; 318 hdr->type = ::conf.icmp_type;
314 hdr->code = 255; 319 hdr->code = 255;
315 hdr->checksum = 0; 320 hdr->checksum = 0;
316 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 321 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
317 322
318 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 323 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
319 324
320 return true; 325 return true;
321} 326}
327#endif
322 328
323bool 329bool
324vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 330vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
325{ 331{
332#if defined(SOL_IP) && defined(IP_TOS)
326 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 333 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
334#endif
327 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 335 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
328 336
329 return true; 337 return true;
330} 338}
331 339
… …
348 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 356 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
349 else 357 else
350 { 358 {
351 connection *c = conns[src - 1]; 359 connection *c = conns[src - 1];
352 360
353 if (dst == 0 && !THISNODE->routerprio) 361 if (dst == 0)
354 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), 362 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
355 c->conf->nodename, (const char *)rsi); 363 c->conf->nodename, (const char *)rsi);
356 else if (dst != 0 && dst != THISNODE->id) 364 else if (dst != 0 && dst != THISNODE->id)
357 { 365 {
358 if (THISNODE->routerprio) 366 if (THISNODE->routerprio)
359 // the tos setting gets lost here. who cares. 367 // the tos setting gets lost here. who cares.
… …
414 revents); 422 revents);
415 exit (1); 423 exit (1);
416 } 424 }
417} 425}
418 426
427#if ENABLE_ICMP
419void 428void
420vpn::icmpv4_ev (io_watcher &w, short revents) 429vpn::icmpv4_ev (io_watcher &w, short revents)
421{ 430{
422 if (revents & (POLLIN | POLLERR)) 431 if (revents & (POLLIN | POLLERR))
423 { 432 {
… …
432 441
433 if (len > 0) 442 if (len > 0)
434 { 443 {
435 pkt->len = len; 444 pkt->len = len;
436 445
437 icmphdr *hdr = (icmphdr *)&((*pkt)[IP_OVERHEAD]); 446 icmp_header *hdr = (icmp_header *)&((*pkt)[IP_OVERHEAD]);
438 447
439 if (hdr->type == ::conf.icmp_type 448 if (hdr->type == ::conf.icmp_type
440 && hdr->code == 255) 449 && hdr->code == 255)
441 { 450 {
442 // raw sockets deliver the ipv4, but don't expect it on sends 451 // raw sockets deliver the ipv4, but don't expect it on sends
… …
466 _("FATAL: unknown revents %08x in socket, terminating\n"), 475 _("FATAL: unknown revents %08x in socket, terminating\n"),
467 revents); 476 revents);
468 exit (1); 477 exit (1);
469 } 478 }
470} 479}
480#endif
471 481
472void 482void
473vpn::udpv4_ev (io_watcher &w, short revents) 483vpn::udpv4_ev (io_watcher &w, short revents)
474{ 484{
475 if (revents & (POLLIN | POLLERR)) 485 if (revents & (POLLIN | POLLERR))
… …
525 int dst = mac2id (pkt->dst); 535 int dst = mac2id (pkt->dst);
526 int src = mac2id (pkt->src); 536 int src = mac2id (pkt->src);
527 537
528 if (src != THISNODE->id) 538 if (src != THISNODE->id)
529 { 539 {
530 slog (L_ERR, _("FATAL: tap packet not originating on current node received, terminating.")); 540 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
531 exit (1); 541 exit (1);
532 } 542 }
533 543
534 if (dst == THISNODE->id) 544 if (dst == THISNODE->id)
535 { 545 {
536 slog (L_ERR, _("FATAL: tap packet destined for current node received, terminating.")); 546 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
537 exit (1); 547 exit (1);
538 } 548 }
539 549
540 if (dst > conns.size ()) 550 if (dst > conns.size ())
541 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst); 551 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
… …
547 if (dst != THISNODE->id) 557 if (dst != THISNODE->id)
548 conns[dst - 1]->inject_data_packet (pkt); 558 conns[dst - 1]->inject_data_packet (pkt);
549 } 559 }
550 else 560 else
551 { 561 {
552 // broadcast, first check router, then self, then english 562 // broadcast, this is ugly, but due to the security policy
553 connection *router = find_router (); 563 // we have to connect to all hosts...
554
555 if (router)
556 router->inject_data_packet (pkt, true);
557 else
558 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 564 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
559 if ((*c)->conf != THISNODE) 565 if ((*c)->conf != THISNODE)
560 (*c)->inject_data_packet (pkt); 566 (*c)->inject_data_packet (pkt);
561 } 567 }
562 } 568 }
563 569
564 delete pkt; 570 delete pkt;
565 } 571 }
… …
632 } 638 }
633} 639}
634 640
635connection *vpn::find_router () 641connection *vpn::find_router ()
636{ 642{
637 u32 prio = 0; 643 u32 prio = 1;
638 connection *router = 0; 644 connection *router = 0;
639 645
640 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 646 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
641 { 647 {
642 connection *c = *i; 648 connection *c = *i;
643 649
644 if (c->conf->routerprio > prio 650 if (c->conf->routerprio > prio
645 && c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use 651 && c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use
646 && c->ictx && c->octx 652 && c->ictx && c->octx
647 && c->conf != THISNODE // redundant, since ictx==octx==0 always on thisnode 653 && c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode
648 && (!THISNODE->routerprio
649 || c->conf->routerprio <= THISNODE->routerprio))
650 { 654 {
651 prio = c->conf->routerprio; 655 prio = c->conf->routerprio;
652 router = c; 656 router = c;
653 } 657 }
654 } 658 }
… …
663 if (c) 667 if (c)
664 c->send_connect_request (id); 668 c->send_connect_request (id);
665 else 669 else
666 // no router found, aggressively connect to all routers 670 // no router found, aggressively connect to all routers
667 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 671 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
668 if ((*i)->conf->routerprio) 672 if ((*i)->conf->routerprio && (*i)->conf != THISNODE)
669 (*i)->establish_connection (); 673 (*i)->establish_connection ();
670} 674}
671 675
672void 676void
673connection::dump_status () 677connection::dump_status ()

Diff Legend

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