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.32 by pcg, Mon Mar 7 01:31:26 2005 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-2005 Marc Lehmann <gvpe@schmorp.de>
3 4
5 This file is part of GVPE.
6
4 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 8 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 9 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 10 (at your option) any later version.
8 11
9 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 GNU General Public License for more details. 15 GNU General Public License for more details.
13 16
14 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
15 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
16 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17*/ 20*/
18 21
19#include "config.h" 22#include "config.h"
20 23
21#include <list> 24#include <list>
22 25
26#include <cstdio>
27#include <cstring>
23#include <cstdlib> 28#include <cstdlib>
24#include <cstring>
25#include <cstdio>
26 29
27#include <sys/types.h> 30#include <sys/types.h>
28#include <sys/socket.h> 31#include <sys/socket.h>
29#include <sys/poll.h>
30#include <sys/wait.h> 32#include <sys/wait.h>
31#include <errno.h> 33#include <errno.h>
32#include <time.h> 34#include <time.h>
33#include <unistd.h> 35#include <unistd.h>
34#include <fcntl.h> 36#include <fcntl.h>
35#include <sys/socket.h> 37#include <sys/socket.h>
36#include <netinet/in.h> 38
37#include <arpa/inet.h> 39#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 40
52#include "pidfile.h" 41#include "pidfile.h"
53 42
54#include "connection.h" 43#include "connection.h"
55#include "util.h" 44#include "util.h"
56#include "vpn.h" 45#include "vpn.h"
57 46
58#if !defined(SOL_IP) && defined(IPPROTO_IP) 47vpn network; // THE vpn (bad design...)
59# define SOL_IP IPPROTO_IP
60#endif
61 48
62///////////////////////////////////////////////////////////////////////////// 49/////////////////////////////////////////////////////////////////////////////
63 50
64const char *vpn::script_if_up () 51const char *vpn::script_if_up ()
65{ 52{
… …
69 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 56 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
70 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 57 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
71 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 58 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
72 59
73 char *env; 60 char *env;
74 asprintf (&env, "CONFBASE=%s", confbase); 61 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
75 putenv (env);
76 asprintf (&env, "NODENAME=%s", THISNODE->nodename); 62 asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
77 putenv (env);
78 asprintf (&env, "NODEID=%d", THISNODE->id); 63 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
79 putenv (env);
80 asprintf (&env, "IFNAME=%s", tap->interface ()); 64 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
81 putenv (env); 65 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
66 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
82 asprintf (&env, "MTU=%d", mtu); 67 asprintf (&env, "MTU=%d", mtu); putenv (env);
83 putenv (env);
84 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 68 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",
85 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8, 69 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
86 THISNODE->id & 0xff); 70 THISNODE->id & 0xff);
87 putenv (env); 71 putenv (env);
88 72
… …
116 sockinfo si (THISNODE, PROT_IPv4); 100 sockinfo si (THISNODE, PROT_IPv4);
117 101
118 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 102 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
119 { 103 {
120 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 104 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
121 exit (1); 105 exit (EXIT_FAILURE);
122 } 106 }
123 107
124 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 108 ipv4_ev_watcher.start (ipv4_fd, EVENT_READ);
125 } 109 }
126 110
127 udpv4_fd = -1; 111 udpv4_fd = -1;
128 112
129 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 113 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
… …
154 sockinfo si (THISNODE, PROT_UDPv4); 138 sockinfo si (THISNODE, PROT_UDPv4);
155 139
156 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 140 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
157 { 141 {
158 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 142 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
159 exit (1); 143 exit (EXIT_FAILURE);
160 } 144 }
161 145
162 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 146 udpv4_ev_watcher.start (udpv4_fd, EVENT_READ);
163 } 147 }
164 148
165 icmpv4_fd = -1; 149 icmpv4_fd = -1;
166 150
167#if ENABLE_ICMP 151#if ENABLE_ICMP
… …
198 sockinfo si (THISNODE, PROT_ICMPv4); 182 sockinfo si (THISNODE, PROT_ICMPv4);
199 183
200 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 184 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
201 { 185 {
202 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); 186 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
203 exit (1); 187 exit (EXIT_FAILURE);
204 } 188 }
205 189
206 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); 190 icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ);
207 } 191 }
208#endif 192#endif
209 193
210 tcpv4_fd = -1; 194 tcpv4_fd = -1;
211 195
… …
228 sockinfo si (THISNODE, PROT_TCPv4); 212 sockinfo si (THISNODE, PROT_TCPv4);
229 213
230 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 214 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
231 { 215 {
232 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 216 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
233 exit (1); 217 exit (EXIT_FAILURE);
234 } 218 }
235 219
236 if (listen (tcpv4_fd, 5)) 220 if (listen (tcpv4_fd, 5))
237 { 221 {
238 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 222 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
239 exit (1); 223 exit (EXIT_FAILURE);
224 }
225
226 tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ);
227 }
228#endif
229
230#if ENABLE_DNS
231 if (THISNODE->protocols & PROT_DNSv4)
232 {
233 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
234
235 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
236
237 if (dnsv4_fd < 0)
238 return -1;
239
240#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
241 // this I really consider a linux bug. I am neither connected
242 // nor do I fragment myself. Linux still sets DF and doesn't
243 // fragment for me sometimes.
244 {
245 int oval = IP_PMTUDISC_DONT;
246 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
247 }
248#endif
249
250 // standard daemon practise...
251 {
252 int oval = 1;
253 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
254 }
255
256 sockinfo si (THISNODE->dns_hostname,
257 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
258 PROT_DNSv4);
259
260 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
240 } 261 {
262 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
263 exit (EXIT_FAILURE);
264 }
241 265
242 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN); 266 dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ);
243 } 267 }
244#endif 268#endif
245 269
246 tap = new tap_device (); 270 tap = new tap_device ();
247 if (!tap) //D this, of course, never catches 271 if (!tap) //D this, of course, never catches
248 { 272 {
249 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 273 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
250 exit (1); 274 exit (EXIT_FAILURE);
251 } 275 }
252 276
253 run_script (run_script_cb (this, &vpn::script_if_up), true); 277 run_script (run_script_cb (this, &vpn::script_if_up), true);
254 278
255 tap_ev_watcher.start (tap->fd, POLLIN); 279 tap_ev_watcher.start (tap->fd, EVENT_READ);
256 280
257 reconnect_all (); 281 reconnect_all ();
258 282
259 return 0; 283 return 0;
260}
261
262// send a vpn packet out to other hosts
263bool
264vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
265{
266 switch (si.prot)
267 {
268 case PROT_IPv4:
269 return send_ipv4_packet (pkt, si, tos);
270
271 case PROT_UDPv4:
272 return send_udpv4_packet (pkt, si, tos);
273
274#if ENABLE_TCP
275 case PROT_TCPv4:
276 return send_tcpv4_packet (pkt, si, tos);
277#endif
278
279#if ENABLE_ICMP
280 case PROT_ICMPv4:
281 return send_icmpv4_packet (pkt, si, tos);
282#endif
283
284 default:
285 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
286 return false;
287 }
288} 284}
289 285
290bool 286bool
291vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 287vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
292{ 288{
… …
320 316
321 return ~sum; 317 return ~sum;
322} 318}
323 319
324#if ENABLE_ICMP 320#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 321bool
343vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 322vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
344{ 323{
345#if defined(SOL_IP) && defined(IP_TOS) 324#if defined(SOL_IP) && defined(IP_TOS)
346 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 325 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
… …
367 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 346 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
368#endif 347#endif
369 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 348 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
370 349
371 return true; 350 return true;
351}
352
353void
354vpn::inject_data_packet (tap_packet *pkt, int dst)
355{
356 if (dst)
357 {
358 // unicast
359 if (dst != THISNODE->id)
360 conns[dst - 1]->inject_data_packet (pkt);
361 }
362 else
363 {
364 // broadcast, this is ugly, but due to the security policy
365 // we have to connect to all hosts...
366 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
367 if ((*c)->conf != THISNODE)
368 (*c)->inject_data_packet (pkt, true);
369 }
372} 370}
373 371
374void 372void
375vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 373vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
376{ 374{
… …
393 connection *c = conns[src - 1]; 391 connection *c = conns[src - 1];
394 392
395 if (dst == 0) 393 if (dst == 0)
396 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"), 394 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
397 c->conf->nodename, (const char *)rsi); 395 c->conf->nodename, (const char *)rsi);
398 else if (dst != 0 && dst != THISNODE->id) 396 else if (dst != THISNODE->id)
399 { 397 {
400 if (THISNODE->routerprio) 398 if (THISNODE->routerprio)
401 // the tos setting gets lost here. who cares. 399 // the tos setting gets lost here. who cares.
402 conns[dst - 1]->inject_vpn_packet (pkt); 400 conns[dst - 1]->inject_vpn_packet (pkt);
403 else 401 else
… …
409 else 407 else
410 c->recv_vpn_packet (pkt, rsi); 408 c->recv_vpn_packet (pkt, rsi);
411 } 409 }
412} 410}
413 411
412bool
413vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
414{
415 switch (si.prot)
416 {
417 case PROT_IPv4:
418 return send_ipv4_packet (pkt, si, tos);
419 case PROT_UDPv4:
420 return send_udpv4_packet (pkt, si, tos);
421#if ENABLE_TCP
422 case PROT_TCPv4:
423 return send_tcpv4_packet (pkt, si, tos);
424#endif
425#if ENABLE_ICMP
426 case PROT_ICMPv4:
427 return send_icmpv4_packet (pkt, si, tos);
428#endif
429#if ENABLE_DNS
430 case PROT_DNSv4:
431 return send_dnsv4_packet (pkt, si, tos);
432#endif
433
434 default:
435 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
436 }
437
438 return false;
439}
440
414void 441void
415vpn::ipv4_ev (io_watcher &w, short revents) 442vpn::ipv4_ev (io_watcher &w, short revents)
416{ 443{
417 if (revents & (POLLIN | POLLERR)) 444 if (revents & EVENT_READ)
418 { 445 {
419 vpn_packet *pkt = new vpn_packet; 446 vpn_packet *pkt = new vpn_packet;
420 struct sockaddr_in sa; 447 struct sockaddr_in sa;
421 socklen_t sa_len = sizeof (sa); 448 socklen_t sa_len = sizeof (sa);
422 int len; 449 int len;
… …
427 454
428 if (len > 0) 455 if (len > 0)
429 { 456 {
430 pkt->len = len; 457 pkt->len = len;
431 458
432 // raw sockets deliver the ipv4, but don't expect it on sends 459 // raw sockets deliver the ipv4 header, but don't expect it on sends
433 // this is slow, but...
434 pkt->skip_hdr (IP_OVERHEAD); 460 pkt->skip_hdr (IP_OVERHEAD);
435 461
436 recv_vpn_packet (pkt, si); 462 recv_vpn_packet (pkt, si);
437 } 463 }
438 else 464 else
… …
441 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 467 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
442 } 468 }
443 469
444 delete pkt; 470 delete pkt;
445 } 471 }
446 else if (revents & POLLHUP)
447 {
448 // this cannot ;) happen on udp sockets
449 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
450 exit (1);
451 }
452 else 472 else
453 { 473 {
454 slog (L_ERR, 474 slog (L_ERR,
455 _("FATAL: unknown revents %08x in socket, terminating\n"), 475 _("FATAL: unknown revents %08x in socket, terminating\n"),
456 revents); 476 revents);
457 exit (1); 477 exit (EXIT_FAILURE);
458 } 478 }
459} 479}
460 480
461#if ENABLE_ICMP 481#if ENABLE_ICMP
462void 482void
463vpn::icmpv4_ev (io_watcher &w, short revents) 483vpn::icmpv4_ev (io_watcher &w, short revents)
464{ 484{
465 if (revents & (POLLIN | POLLERR)) 485 if (revents & EVENT_READ)
466 { 486 {
467 vpn_packet *pkt = new vpn_packet; 487 vpn_packet *pkt = new vpn_packet;
468 struct sockaddr_in sa; 488 struct sockaddr_in sa;
469 socklen_t sa_len = sizeof (sa); 489 socklen_t sa_len = sizeof (sa);
470 int len; 490 int len;
… …
495 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 515 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
496 } 516 }
497 517
498 delete pkt; 518 delete pkt;
499 } 519 }
500 else if (revents & POLLHUP)
501 {
502 // this cannot ;) happen on udp sockets
503 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
504 exit (1);
505 }
506 else 520 else
507 { 521 {
508 slog (L_ERR, 522 slog (L_ERR,
509 _("FATAL: unknown revents %08x in socket, terminating\n"), 523 _("FATAL: unknown revents %08x in socket, terminating\n"),
510 revents); 524 revents);
511 exit (1); 525 exit (EXIT_FAILURE);
512 } 526 }
513} 527}
514#endif 528#endif
515 529
516void 530void
517vpn::udpv4_ev (io_watcher &w, short revents) 531vpn::udpv4_ev (io_watcher &w, short revents)
518{ 532{
519 if (revents & (POLLIN | POLLERR)) 533 if (revents & EVENT_READ)
520 { 534 {
521 vpn_packet *pkt = new vpn_packet; 535 vpn_packet *pkt = new vpn_packet;
522 struct sockaddr_in sa; 536 struct sockaddr_in sa;
523 socklen_t sa_len = sizeof (sa); 537 socklen_t sa_len = sizeof (sa);
524 int len; 538 int len;
… …
539 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 553 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
540 } 554 }
541 555
542 delete pkt; 556 delete pkt;
543 } 557 }
544 else if (revents & POLLHUP)
545 {
546 // this cannot ;) happen on udp sockets
547 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
548 exit (1);
549 }
550 else 558 else
551 { 559 {
552 slog (L_ERR, 560 slog (L_ERR,
553 _("FATAL: unknown revents %08x in socket, terminating\n"), 561 _("FATAL: unknown revents %08x in socket, terminating\n"),
554 revents); 562 revents);
555 exit (1); 563 exit (EXIT_FAILURE);
556 } 564 }
557} 565}
558 566
559void 567void
560vpn::tap_ev (io_watcher &w, short revents) 568vpn::tap_ev (io_watcher &w, short revents)
561{ 569{
562 if (revents & POLLIN) 570 if (revents & EVENT_READ)
563 { 571 {
564 /* process data */ 572 /* process data */
565 tap_packet *pkt; 573 tap_packet *pkt;
566 574
567 pkt = tap->recv (); 575 pkt = tap->recv ();
568 576
577 if (!pkt)
578 return;
579
580 if (pkt->len > 14)
581 {
569 int dst = mac2id (pkt->dst); 582 int dst = mac2id (pkt->dst);
570 int src = mac2id (pkt->src); 583 int src = mac2id (pkt->src);
571 584
572 if (src != THISNODE->id) 585 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 { 586 {
590 // unicast 587 slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
591 if (dst != THISNODE->id) 588 exit (EXIT_FAILURE);
592 conns[dst - 1]->inject_data_packet (pkt);
593 } 589 }
590
591 if (dst == THISNODE->id)
592 {
593 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
594 exit (EXIT_FAILURE);
595 }
596
597 if (dst > conns.size ())
598 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
594 else 599 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); 600 inject_data_packet (pkt, dst);
601 }
602 } 601 }
603 602
604 delete pkt; 603 delete pkt;
605 }
606 else if (revents & (POLLHUP | POLLERR))
607 {
608 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
609 exit (1);
610 } 604 }
611 else 605 else
612 abort (); 606 abort ();
613} 607}
614 608
… …
620 if (events & EVENT_SHUTDOWN) 614 if (events & EVENT_SHUTDOWN)
621 { 615 {
622 slog (L_INFO, _("preparing shutdown...")); 616 slog (L_INFO, _("preparing shutdown..."));
623 617
624 shutdown_all (); 618 shutdown_all ();
625
626 remove_pid (pidfilename); 619 remove_pid (conf.pidfilename);
627
628 slog (L_INFO, _("terminating")); 620 slog (L_INFO, _("terminating"));
629 621 exit (EXIT_SUCCESS);
630 exit (0);
631 } 622 }
632 623
633 if (events & EVENT_RECONNECT) 624 if (events & EVENT_RECONNECT)
634 { 625 {
635 slog (L_INFO, _("forced reconnect")); 626 slog (L_INFO, _("forced reconnect"));
… …
637 reconnect_all (); 628 reconnect_all ();
638 } 629 }
639 630
640 events = 0; 631 events = 0;
641 } 632 }
642
643 w.at = TSTAMP_CANCEL;
644} 633}
645 634
646void 635void
647vpn::shutdown_all () 636vpn::shutdown_all ()
648{ 637{
… …
661 connection_init (); 650 connection_init ();
662 651
663 for (configuration::node_vector::iterator i = conf.nodes.begin (); 652 for (configuration::node_vector::iterator i = conf.nodes.begin ();
664 i != conf.nodes.end (); ++i) 653 i != conf.nodes.end (); ++i)
665 { 654 {
666 connection *conn = new connection (this); 655 connection *conn = new connection (this, *i);
667
668 conn->conf = *i;
669 conns.push_back (conn); 656 conns.push_back (conn);
670
671 conn->establish_connection (); 657 conn->establish_connection ();
672 } 658 }
673} 659}
674 660
675connection *vpn::find_router () 661connection *vpn::find_router ()
… …
738, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 724, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
739#endif 725#endif
740#if ENABLE_ICMP 726#if ENABLE_ICMP
741, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 727, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
742#endif 728#endif
729#if ENABLE_DNS
730, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
731#endif
743, tap_ev_watcher (this, &vpn::tap_ev) 732, tap_ev_watcher (this, &vpn::tap_ev)
744{ 733{
745} 734}
746 735
747vpn::~vpn () 736vpn::~vpn ()

Diff Legend

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