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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines