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.33 by pcg, Wed Mar 23 21:55:39 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>
40 42
41#include "connection.h" 43#include "connection.h"
42#include "util.h" 44#include "util.h"
43#include "vpn.h" 45#include "vpn.h"
44 46
47vpn network; // THE vpn (bad design...)
48
45///////////////////////////////////////////////////////////////////////////// 49/////////////////////////////////////////////////////////////////////////////
46 50
47const char *vpn::script_if_up () 51void
52vpn::script_init_env ()
48{ 53{
49 // the tunnel device mtu should be the physical mtu - overhead 54 // the tunnel device mtu should be the physical mtu - overhead
50 // the tricky part is rounding to the cipher key blocksize 55 // the tricky part is rounding to the cipher key blocksize
51 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD; 56 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
52 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 57 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
53 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 58 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
54 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 59 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
55 60
56 char *env; 61 char *env;
57 asprintf (&env, "CONFBASE=%s", confbase); 62 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
58 putenv (env);
59 asprintf (&env, "NODENAME=%s", THISNODE->nodename); 63 asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
60 putenv (env);
61 asprintf (&env, "NODEID=%d", THISNODE->id); 64 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
62 putenv (env);
63 asprintf (&env, "IFNAME=%s", tap->interface ()); 65 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
64 putenv (env); 66 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
67 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
65 asprintf (&env, "MTU=%d", mtu); 68 asprintf (&env, "MTU=%d", mtu); putenv (env);
66 putenv (env);
67 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 69 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",
68 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8, 70 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
69 THISNODE->id & 0xff); 71 THISNODE->id & 0xff); putenv (env);
70 putenv (env);
71 72
73 // TODO: info for other nodes, maybe?
74}
75
76const char *vpn::script_if_init ()
77{
78 script_init_env ();
79
80 return tap->if_up ();
81}
82
83const char *vpn::script_if_up ()
84{
85 script_init_env ();
86
87 char *filename;
88 asprintf (&filename,
89 "%s/%s",
90 confbase,
72 return ::conf.script_if_up ? ::conf.script_if_up : "if-up"; 91 ::conf.script_if_up ? ::conf.script_if_up : "if-up");
92
93 return filename;
73} 94}
74 95
75int 96int
76vpn::setup () 97vpn::setup ()
77{ 98{
99 sockinfo si (THISNODE, PROT_IPv4); 120 sockinfo si (THISNODE, PROT_IPv4);
100 121
101 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 122 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
102 { 123 {
103 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 124 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
104 exit (1); 125 exit (EXIT_FAILURE);
105 } 126 }
106 127
107 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 128 ipv4_ev_watcher.start (ipv4_fd, EVENT_READ);
108 } 129 }
109 130
110 udpv4_fd = -1; 131 udpv4_fd = -1;
111 132
112 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 133 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
137 sockinfo si (THISNODE, PROT_UDPv4); 158 sockinfo si (THISNODE, PROT_UDPv4);
138 159
139 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 160 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
140 { 161 {
141 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 162 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
142 exit (1); 163 exit (EXIT_FAILURE);
143 } 164 }
144 165
145 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 166 udpv4_ev_watcher.start (udpv4_fd, EVENT_READ);
146 } 167 }
147 168
148 icmpv4_fd = -1; 169 icmpv4_fd = -1;
149 170
150#if ENABLE_ICMP 171#if ENABLE_ICMP
181 sockinfo si (THISNODE, PROT_ICMPv4); 202 sockinfo si (THISNODE, PROT_ICMPv4);
182 203
183 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 204 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
184 { 205 {
185 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); 206 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
186 exit (1); 207 exit (EXIT_FAILURE);
187 } 208 }
188 209
189 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); 210 icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ);
190 } 211 }
191#endif 212#endif
192 213
193 tcpv4_fd = -1; 214 tcpv4_fd = -1;
194 215
211 sockinfo si (THISNODE, PROT_TCPv4); 232 sockinfo si (THISNODE, PROT_TCPv4);
212 233
213 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 234 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
214 { 235 {
215 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 236 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
216 exit (1); 237 exit (EXIT_FAILURE);
217 } 238 }
218 239
219 if (listen (tcpv4_fd, 5)) 240 if (listen (tcpv4_fd, 5))
220 { 241 {
221 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 242 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
222 exit (1); 243 exit (EXIT_FAILURE);
244 }
245
246 tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ);
247 }
248#endif
249
250#if ENABLE_DNS
251 if (THISNODE->protocols & PROT_DNSv4)
252 {
253 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
254
255 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
256
257 if (dnsv4_fd < 0)
258 return -1;
259
260#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
261 // this I really consider a linux bug. I am neither connected
262 // nor do I fragment myself. Linux still sets DF and doesn't
263 // fragment for me sometimes.
264 {
265 int oval = IP_PMTUDISC_DONT;
266 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
267 }
268#endif
269
270 // standard daemon practise...
271 {
272 int oval = 1;
273 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
274 }
275
276 sockinfo si (THISNODE->dns_hostname,
277 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
278 PROT_DNSv4);
279
280 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
223 } 281 {
282 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
283 exit (EXIT_FAILURE);
284 }
224 285
225 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN); 286 dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ);
226 } 287 }
227#endif 288#endif
228 289
229 tap = new tap_device (); 290 tap = new tap_device ();
230 if (!tap) //D this, of course, never catches 291 if (!tap) //D this, of course, never catches
231 { 292 {
232 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 293 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
233 exit (1); 294 exit (EXIT_FAILURE);
234 } 295 }
235 296
297 if (tap->if_up () &&
298 !run_script (run_script_cb (this, &vpn::script_if_init), true))
299 {
300 slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
301 tap->if_up ());
302 exit (EXIT_FAILURE);
303 }
304
236 run_script (run_script_cb (this, &vpn::script_if_up), true); 305 if (!run_script (run_script_cb (this, &vpn::script_if_up), true))
306 {
307 slog (L_ERR, _("if-up command execution failed, exiting."));
308 exit (EXIT_FAILURE);
309 }
237 310
238 tap_ev_watcher.start (tap->fd, POLLIN); 311 tap_ev_watcher.start (tap->fd, EVENT_READ);
239 312
240 reconnect_all (); 313 reconnect_all ();
241 314
242 return 0; 315 return 0;
243}
244
245// send a vpn packet out to other hosts
246bool
247vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
248{
249 switch (si.prot)
250 {
251 case PROT_IPv4:
252 return send_ipv4_packet (pkt, si, tos);
253
254 case PROT_UDPv4:
255 return send_udpv4_packet (pkt, si, tos);
256
257#if ENABLE_TCP
258 case PROT_TCPv4:
259 return send_tcpv4_packet (pkt, si, tos);
260#endif
261
262#if ENABLE_ICMP
263 case PROT_ICMPv4:
264 return send_icmpv4_packet (pkt, si, tos);
265#endif
266
267 default:
268 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
269 return false;
270 }
271} 316}
272 317
273bool 318bool
274vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 319vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
275{ 320{
333 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 378 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
334#endif 379#endif
335 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 380 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
336 381
337 return true; 382 return true;
383}
384
385void
386vpn::inject_data_packet (tap_packet *pkt, int dst)
387{
388 if (dst)
389 {
390 // unicast
391 if (dst != THISNODE->id)
392 conns[dst - 1]->inject_data_packet (pkt);
393 }
394 else
395 {
396 // broadcast, this is ugly, but due to the security policy
397 // we have to connect to all hosts...
398 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
399 if ((*c)->conf != THISNODE)
400 (*c)->inject_data_packet (pkt, true);
401 }
338} 402}
339 403
340void 404void
341vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 405vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
342{ 406{
359 connection *c = conns[src - 1]; 423 connection *c = conns[src - 1];
360 424
361 if (dst == 0) 425 if (dst == 0)
362 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"), 426 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
363 c->conf->nodename, (const char *)rsi); 427 c->conf->nodename, (const char *)rsi);
364 else if (dst != 0 && dst != THISNODE->id) 428 else if (dst != THISNODE->id)
365 { 429 {
366 if (THISNODE->routerprio) 430 if (THISNODE->routerprio)
367 // the tos setting gets lost here. who cares. 431 // the tos setting gets lost here. who cares.
368 conns[dst - 1]->inject_vpn_packet (pkt); 432 conns[dst - 1]->inject_vpn_packet (pkt);
369 else 433 else
375 else 439 else
376 c->recv_vpn_packet (pkt, rsi); 440 c->recv_vpn_packet (pkt, rsi);
377 } 441 }
378} 442}
379 443
444bool
445vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
446{
447 switch (si.prot)
448 {
449 case PROT_IPv4:
450 return send_ipv4_packet (pkt, si, tos);
451 case PROT_UDPv4:
452 return send_udpv4_packet (pkt, si, tos);
453#if ENABLE_TCP
454 case PROT_TCPv4:
455 return send_tcpv4_packet (pkt, si, tos);
456#endif
457#if ENABLE_ICMP
458 case PROT_ICMPv4:
459 return send_icmpv4_packet (pkt, si, tos);
460#endif
461#if ENABLE_DNS
462 case PROT_DNSv4:
463 return send_dnsv4_packet (pkt, si, tos);
464#endif
465
466 default:
467 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
468 }
469
470 return false;
471}
472
380void 473void
381vpn::ipv4_ev (io_watcher &w, short revents) 474vpn::ipv4_ev (io_watcher &w, short revents)
382{ 475{
383 if (revents & (POLLIN | POLLERR)) 476 if (revents & EVENT_READ)
384 { 477 {
385 vpn_packet *pkt = new vpn_packet; 478 vpn_packet *pkt = new vpn_packet;
386 struct sockaddr_in sa; 479 struct sockaddr_in sa;
387 socklen_t sa_len = sizeof (sa); 480 socklen_t sa_len = sizeof (sa);
388 int len; 481 int len;
393 486
394 if (len > 0) 487 if (len > 0)
395 { 488 {
396 pkt->len = len; 489 pkt->len = len;
397 490
398 // raw sockets deliver the ipv4, but don't expect it on sends 491 // raw sockets deliver the ipv4 header, but don't expect it on sends
399 // this is slow, but...
400 pkt->skip_hdr (IP_OVERHEAD); 492 pkt->skip_hdr (IP_OVERHEAD);
401 493
402 recv_vpn_packet (pkt, si); 494 recv_vpn_packet (pkt, si);
403 } 495 }
404 else 496 else
407 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 499 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
408 } 500 }
409 501
410 delete pkt; 502 delete pkt;
411 } 503 }
412 else if (revents & POLLHUP)
413 {
414 // this cannot ;) happen on udp sockets
415 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
416 exit (1);
417 }
418 else 504 else
419 { 505 {
420 slog (L_ERR, 506 slog (L_ERR,
421 _("FATAL: unknown revents %08x in socket, terminating\n"), 507 _("FATAL: unknown revents %08x in socket, terminating\n"),
422 revents); 508 revents);
423 exit (1); 509 exit (EXIT_FAILURE);
424 } 510 }
425} 511}
426 512
427#if ENABLE_ICMP 513#if ENABLE_ICMP
428void 514void
429vpn::icmpv4_ev (io_watcher &w, short revents) 515vpn::icmpv4_ev (io_watcher &w, short revents)
430{ 516{
431 if (revents & (POLLIN | POLLERR)) 517 if (revents & EVENT_READ)
432 { 518 {
433 vpn_packet *pkt = new vpn_packet; 519 vpn_packet *pkt = new vpn_packet;
434 struct sockaddr_in sa; 520 struct sockaddr_in sa;
435 socklen_t sa_len = sizeof (sa); 521 socklen_t sa_len = sizeof (sa);
436 int len; 522 int len;
461 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 547 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
462 } 548 }
463 549
464 delete pkt; 550 delete pkt;
465 } 551 }
466 else if (revents & POLLHUP)
467 {
468 // this cannot ;) happen on udp sockets
469 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
470 exit (1);
471 }
472 else 552 else
473 { 553 {
474 slog (L_ERR, 554 slog (L_ERR,
475 _("FATAL: unknown revents %08x in socket, terminating\n"), 555 _("FATAL: unknown revents %08x in socket, terminating\n"),
476 revents); 556 revents);
477 exit (1); 557 exit (EXIT_FAILURE);
478 } 558 }
479} 559}
480#endif 560#endif
481 561
482void 562void
483vpn::udpv4_ev (io_watcher &w, short revents) 563vpn::udpv4_ev (io_watcher &w, short revents)
484{ 564{
485 if (revents & (POLLIN | POLLERR)) 565 if (revents & EVENT_READ)
486 { 566 {
487 vpn_packet *pkt = new vpn_packet; 567 vpn_packet *pkt = new vpn_packet;
488 struct sockaddr_in sa; 568 struct sockaddr_in sa;
489 socklen_t sa_len = sizeof (sa); 569 socklen_t sa_len = sizeof (sa);
490 int len; 570 int len;
505 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 585 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
506 } 586 }
507 587
508 delete pkt; 588 delete pkt;
509 } 589 }
510 else if (revents & POLLHUP)
511 {
512 // this cannot ;) happen on udp sockets
513 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
514 exit (1);
515 }
516 else 590 else
517 { 591 {
518 slog (L_ERR, 592 slog (L_ERR,
519 _("FATAL: unknown revents %08x in socket, terminating\n"), 593 _("FATAL: unknown revents %08x in socket, terminating\n"),
520 revents); 594 revents);
521 exit (1); 595 exit (EXIT_FAILURE);
522 } 596 }
523} 597}
524 598
525void 599void
526vpn::tap_ev (io_watcher &w, short revents) 600vpn::tap_ev (io_watcher &w, short revents)
527{ 601{
528 if (revents & POLLIN) 602 if (revents & EVENT_READ)
529 { 603 {
530 /* process data */ 604 /* process data */
531 tap_packet *pkt; 605 tap_packet *pkt;
532 606
533 pkt = tap->recv (); 607 pkt = tap->recv ();
534 608
609 if (!pkt)
610 return;
611
612 if (pkt->len > 14)
613 {
535 int dst = mac2id (pkt->dst); 614 int dst = mac2id (pkt->dst);
536 int src = mac2id (pkt->src); 615 int src = mac2id (pkt->src);
537 616
538 if (src != THISNODE->id) 617 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 { 618 {
556 // unicast 619 slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
557 if (dst != THISNODE->id) 620 exit (EXIT_FAILURE);
558 conns[dst - 1]->inject_data_packet (pkt);
559 } 621 }
622
623 if (dst == THISNODE->id)
624 {
625 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
626 exit (EXIT_FAILURE);
627 }
628
629 if (dst > conns.size ())
630 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
560 else 631 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); 632 inject_data_packet (pkt, dst);
567 }
568 } 633 }
569 634
570 delete pkt; 635 delete pkt;
571 }
572 else if (revents & (POLLHUP | POLLERR))
573 {
574 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
575 exit (1);
576 } 636 }
577 else 637 else
578 abort (); 638 abort ();
579} 639}
580 640
586 if (events & EVENT_SHUTDOWN) 646 if (events & EVENT_SHUTDOWN)
587 { 647 {
588 slog (L_INFO, _("preparing shutdown...")); 648 slog (L_INFO, _("preparing shutdown..."));
589 649
590 shutdown_all (); 650 shutdown_all ();
591
592 remove_pid (pidfilename); 651 remove_pid (conf.pidfilename);
593
594 slog (L_INFO, _("terminating")); 652 slog (L_INFO, _("terminating"));
595 653 exit (EXIT_SUCCESS);
596 exit (0);
597 } 654 }
598 655
599 if (events & EVENT_RECONNECT) 656 if (events & EVENT_RECONNECT)
600 { 657 {
601 slog (L_INFO, _("forced reconnect")); 658 slog (L_INFO, _("forced reconnect"));
603 reconnect_all (); 660 reconnect_all ();
604 } 661 }
605 662
606 events = 0; 663 events = 0;
607 } 664 }
608
609 w.at = TSTAMP_CANCEL;
610} 665}
611 666
612void 667void
613vpn::shutdown_all () 668vpn::shutdown_all ()
614{ 669{
627 connection_init (); 682 connection_init ();
628 683
629 for (configuration::node_vector::iterator i = conf.nodes.begin (); 684 for (configuration::node_vector::iterator i = conf.nodes.begin ();
630 i != conf.nodes.end (); ++i) 685 i != conf.nodes.end (); ++i)
631 { 686 {
632 connection *conn = new connection (this); 687 connection *conn = new connection (this, *i);
633
634 conn->conf = *i;
635 conns.push_back (conn); 688 conns.push_back (conn);
636
637 conn->establish_connection (); 689 conn->establish_connection ();
638 } 690 }
639} 691}
640 692
641connection *vpn::find_router () 693connection *vpn::find_router ()
704, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 756, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
705#endif 757#endif
706#if ENABLE_ICMP 758#if ENABLE_ICMP
707, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 759, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
708#endif 760#endif
761#if ENABLE_DNS
762, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
763#endif
709, tap_ev_watcher (this, &vpn::tap_ev) 764, tap_ev_watcher (this, &vpn::tap_ev)
710{ 765{
711} 766}
712 767
713vpn::~vpn () 768vpn::~vpn ()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines