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.18 by pcg, Thu Oct 16 02:28:36 2003 UTC vs.
Revision 1.39 by pcg, Sat Nov 10 05:14:22 2007 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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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{
82 108
83 if (ipv4_fd < 0) 109 if (ipv4_fd < 0)
84 return -1; 110 return -1;
85 111
86 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); 112 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
113 fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
87 114
88#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 115#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
89 // this I really consider a linux bug. I am neither connected 116 // this I really consider a linux bug. I am neither connected
90 // nor do I fragment myself. Linux still sets DF and doesn't 117 // nor do I fragment myself. Linux still sets DF and doesn't
91 // fragment for me sometimes. 118 // fragment for me sometimes.
98 sockinfo si (THISNODE, PROT_IPv4); 125 sockinfo si (THISNODE, PROT_IPv4);
99 126
100 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 127 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
101 { 128 {
102 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 129 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
103 exit (1); 130 exit (EXIT_FAILURE);
104 } 131 }
105 132
106 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 133 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
107 } 134 }
108 135
109 udpv4_fd = -1; 136 udpv4_fd = -1;
110 137
111 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 138 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
114 141
115 if (udpv4_fd < 0) 142 if (udpv4_fd < 0)
116 return -1; 143 return -1;
117 144
118 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK); 145 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
146 fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
119 147
120 // standard daemon practise... 148 // standard daemon practise...
121 { 149 {
122 int oval = 1; 150 int oval = 1;
123 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 151 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
136 sockinfo si (THISNODE, PROT_UDPv4); 164 sockinfo si (THISNODE, PROT_UDPv4);
137 165
138 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 166 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
139 { 167 {
140 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 168 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
141 exit (1); 169 exit (EXIT_FAILURE);
142 } 170 }
143 171
144 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 172 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
145 } 173 }
146 174
147 icmpv4_fd = -1; 175 icmpv4_fd = -1;
148 176
149#if ENABLE_ICMP 177#if ENABLE_ICMP
153 181
154 if (icmpv4_fd < 0) 182 if (icmpv4_fd < 0)
155 return -1; 183 return -1;
156 184
157 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK); 185 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
186 fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
158 187
159#ifdef ICMP_FILTER 188#ifdef ICMP_FILTER
160 { 189 {
161 icmp_filter oval; 190 icmp_filter oval;
162 oval.data = 0xffffffff; 191 oval.data = 0xffffffff;
171 // this I really consider a linux bug. I am neither connected 200 // this I really consider a linux bug. I am neither connected
172 // nor do I fragment myself. Linux still sets DF and doesn't 201 // nor do I fragment myself. Linux still sets DF and doesn't
173 // fragment for me sometimes. 202 // fragment for me sometimes.
174 { 203 {
175 int oval = IP_PMTUDISC_DONT; 204 int oval = IP_PMTUDISC_DONT;
176 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 205 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
177 } 206 }
178#endif 207#endif
179 208
180 sockinfo si (THISNODE, PROT_ICMPv4); 209 sockinfo si (THISNODE, PROT_ICMPv4);
181 210
182 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 211 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
183 { 212 {
184 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); 213 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
185 exit (1); 214 exit (EXIT_FAILURE);
186 } 215 }
187 216
188 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); 217 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
189 } 218 }
190#endif 219#endif
191 220
192 tcpv4_fd = -1; 221 tcpv4_fd = -1;
193 222
198 227
199 if (tcpv4_fd < 0) 228 if (tcpv4_fd < 0)
200 return -1; 229 return -1;
201 230
202 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK); 231 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
232 fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
203 233
204 // standard daemon practise... 234 // standard daemon practise...
205 { 235 {
206 int oval = 1; 236 int oval = 1;
207 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 237 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
210 sockinfo si (THISNODE, PROT_TCPv4); 240 sockinfo si (THISNODE, PROT_TCPv4);
211 241
212 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 242 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
213 { 243 {
214 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 244 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
215 exit (1); 245 exit (EXIT_FAILURE);
216 } 246 }
217 247
218 if (listen (tcpv4_fd, 5)) 248 if (listen (tcpv4_fd, 5))
219 { 249 {
220 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 250 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
221 exit (1); 251 exit (EXIT_FAILURE);
252 }
253
254 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
255 }
256#endif
257
258#if ENABLE_DNS
259 if (THISNODE->protocols & PROT_DNSv4)
260 {
261 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
262
263 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
264
265 if (dnsv4_fd < 0)
266 return -1;
267
268 fcntl (dnsv4_fd, F_SETFL, O_NONBLOCK);
269 fcntl (dnsv4_fd, F_SETFD, FD_CLOEXEC);
270
271# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
272 // this I really consider a linux bug. I am neither connected
273 // nor do I fragment myself. Linux still sets DF and doesn't
274 // fragment for me sometimes.
275 {
276 int oval = IP_PMTUDISC_DONT;
277 setsockopt (dnsv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
222 } 278 }
223
224 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
225 }
226#endif 279# endif
280
281 // standard daemon practise...
282 {
283 int oval = 1;
284 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
285 }
286
287 sockinfo si (THISNODE->dns_hostname,
288 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
289 PROT_DNSv4);
290
291 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
292 {
293 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
294 exit (EXIT_FAILURE);
295 }
296
297 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
298 }
299#endif
300
301 /////////////////////////////////////////////////////////////////////////////
302
303 reconnect_all ();
304
305 /////////////////////////////////////////////////////////////////////////////
227 306
228 tap = new tap_device (); 307 tap = new tap_device ();
229 if (!tap) //D this, of course, never catches 308 if (!tap) //D this, of course, never catches
230 { 309 {
231 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 310 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
232 exit (1); 311 exit (EXIT_FAILURE);
233 } 312 }
234 313
314 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
315
316 if (tap->if_up () &&
317 !run_script (run_script_cb (this, &vpn::script_if_init), true))
318 {
319 slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
320 tap->if_up ());
321 exit (EXIT_FAILURE);
322 }
323
235 run_script (run_script_cb (this, &vpn::script_if_up), true); 324 if (!run_script (run_script_cb (this, &vpn::script_if_up), true))
325 {
326 slog (L_ERR, _("if-up command execution failed, exiting."));
327 exit (EXIT_FAILURE);
328 }
236 329
237 tap_ev_watcher.start (tap->fd, POLLIN); 330 tap_ev_watcher.start (tap->fd, EV_READ);
238
239 reconnect_all ();
240 331
241 return 0; 332 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} 333}
271 334
272bool 335bool
273vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 336vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
274{ 337{
393 else 456 else
394 c->recv_vpn_packet (pkt, rsi); 457 c->recv_vpn_packet (pkt, rsi);
395 } 458 }
396} 459}
397 460
461bool
462vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
463{
464 switch (si.prot)
465 {
466 case PROT_IPv4:
467 return send_ipv4_packet (pkt, si, tos);
468 case PROT_UDPv4:
469 return send_udpv4_packet (pkt, si, tos);
470#if ENABLE_TCP
471 case PROT_TCPv4:
472 return send_tcpv4_packet (pkt, si, tos);
473#endif
474#if ENABLE_ICMP
475 case PROT_ICMPv4:
476 return send_icmpv4_packet (pkt, si, tos);
477#endif
478#if ENABLE_DNS
479 case PROT_DNSv4:
480 return send_dnsv4_packet (pkt, si, tos);
481#endif
482
483 default:
484 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
485 }
486
487 return false;
488}
489
398void 490void
399vpn::ipv4_ev (io_watcher &w, short revents) 491vpn::ipv4_ev (ev::io &w, int revents)
400{ 492{
401 if (revents & (POLLIN | POLLERR)) 493 if (revents & EV_READ)
402 { 494 {
403 vpn_packet *pkt = new vpn_packet; 495 vpn_packet *pkt = new vpn_packet;
404 struct sockaddr_in sa; 496 struct sockaddr_in sa;
405 socklen_t sa_len = sizeof (sa); 497 socklen_t sa_len = sizeof (sa);
406 int len; 498 int len;
411 503
412 if (len > 0) 504 if (len > 0)
413 { 505 {
414 pkt->len = len; 506 pkt->len = len;
415 507
416 // raw sockets deliver the ipv4, but don't expect it on sends 508 // raw sockets deliver the ipv4 header, but don't expect it on sends
417 // this is slow, but...
418 pkt->skip_hdr (IP_OVERHEAD); 509 pkt->skip_hdr (IP_OVERHEAD);
419 510
420 recv_vpn_packet (pkt, si); 511 recv_vpn_packet (pkt, si);
421 } 512 }
422 else 513 else
425 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 516 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
426 } 517 }
427 518
428 delete pkt; 519 delete pkt;
429 } 520 }
430 else if (revents & POLLHUP)
431 {
432 // this cannot ;) happen on udp sockets
433 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
434 exit (1);
435 }
436 else 521 else
437 { 522 {
438 slog (L_ERR, 523 slog (L_ERR,
439 _("FATAL: unknown revents %08x in socket, terminating\n"), 524 _("FATAL: unknown revents %08x in socket, terminating\n"),
440 revents); 525 revents);
441 exit (1); 526 exit (EXIT_FAILURE);
442 } 527 }
443} 528}
444 529
445#if ENABLE_ICMP 530#if ENABLE_ICMP
446void 531void
447vpn::icmpv4_ev (io_watcher &w, short revents) 532vpn::icmpv4_ev (ev::io &w, int revents)
448{ 533{
449 if (revents & (POLLIN | POLLERR)) 534 if (revents & EV_READ)
450 { 535 {
451 vpn_packet *pkt = new vpn_packet; 536 vpn_packet *pkt = new vpn_packet;
452 struct sockaddr_in sa; 537 struct sockaddr_in sa;
453 socklen_t sa_len = sizeof (sa); 538 socklen_t sa_len = sizeof (sa);
454 int len; 539 int len;
479 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 564 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
480 } 565 }
481 566
482 delete pkt; 567 delete pkt;
483 } 568 }
484 else if (revents & POLLHUP)
485 {
486 // this cannot ;) happen on udp sockets
487 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
488 exit (1);
489 }
490 else 569 else
491 { 570 {
492 slog (L_ERR, 571 slog (L_ERR,
493 _("FATAL: unknown revents %08x in socket, terminating\n"), 572 _("FATAL: unknown revents %08x in socket, terminating\n"),
494 revents); 573 revents);
495 exit (1); 574 exit (EXIT_FAILURE);
496 } 575 }
497} 576}
498#endif 577#endif
499 578
500void 579void
501vpn::udpv4_ev (io_watcher &w, short revents) 580vpn::udpv4_ev (ev::io &w, int revents)
502{ 581{
503 if (revents & (POLLIN | POLLERR)) 582 if (revents & EV_READ)
504 { 583 {
505 vpn_packet *pkt = new vpn_packet; 584 vpn_packet *pkt = new vpn_packet;
506 struct sockaddr_in sa; 585 struct sockaddr_in sa;
507 socklen_t sa_len = sizeof (sa); 586 socklen_t sa_len = sizeof (sa);
508 int len; 587 int len;
523 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 602 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
524 } 603 }
525 604
526 delete pkt; 605 delete pkt;
527 } 606 }
528 else if (revents & POLLHUP)
529 {
530 // this cannot ;) happen on udp sockets
531 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
532 exit (1);
533 }
534 else 607 else
535 { 608 {
536 slog (L_ERR, 609 slog (L_ERR,
537 _("FATAL: unknown revents %08x in socket, terminating\n"), 610 _("FATAL: unknown revents %08x in socket, terminating\n"),
538 revents); 611 revents);
539 exit (1); 612 exit (EXIT_FAILURE);
540 } 613 }
541} 614}
542 615
543void 616void
544vpn::tap_ev (io_watcher &w, short revents) 617vpn::tap_ev (ev::io &w, int revents)
545{ 618{
546 if (revents & POLLIN) 619 if (revents & EV_READ)
547 { 620 {
548 /* process data */ 621 /* process data */
549 tap_packet *pkt; 622 tap_packet *pkt;
550 623
551 pkt = tap->recv (); 624 pkt = tap->recv ();
558 int dst = mac2id (pkt->dst); 631 int dst = mac2id (pkt->dst);
559 int src = mac2id (pkt->src); 632 int src = mac2id (pkt->src);
560 633
561 if (src != THISNODE->id) 634 if (src != THISNODE->id)
562 { 635 {
563 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting.")); 636 slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
564 exit (1); 637 exit (EXIT_FAILURE);
565 } 638 }
566 639
567 if (dst == THISNODE->id) 640 if (dst == THISNODE->id)
568 { 641 {
569 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting.")); 642 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
570 exit (1); 643 exit (EXIT_FAILURE);
571 } 644 }
572 645
573 if (dst > conns.size ()) 646 if (dst > conns.size ())
574 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst); 647 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
575 else 648 else
576 inject_data_packet (pkt, dst); 649 inject_data_packet (pkt, dst);
577 } 650 }
578 651
579 delete pkt; 652 delete pkt;
580 } 653 }
581 else if (revents & (POLLHUP | POLLERR))
582 {
583 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
584 exit (1);
585 }
586 else 654 else
587 abort (); 655 abort ();
588} 656}
589 657
590void 658void
591vpn::event_cb (time_watcher &w) 659vpn::event_cb (ev::timer &w, int)
592{ 660{
593 if (events) 661 if (events)
594 { 662 {
595 if (events & EVENT_SHUTDOWN) 663 if (events & EVENT_SHUTDOWN)
596 { 664 {
597 slog (L_INFO, _("preparing shutdown...")); 665 slog (L_INFO, _("preparing shutdown..."));
598 666
599 shutdown_all (); 667 shutdown_all ();
600
601 remove_pid (pidfilename); 668 remove_pid (conf.pidfilename);
602
603 slog (L_INFO, _("terminating")); 669 slog (L_INFO, _("terminating"));
604 670 exit (EXIT_SUCCESS);
605 exit (0);
606 } 671 }
607 672
608 if (events & EVENT_RECONNECT) 673 if (events & EVENT_RECONNECT)
609 { 674 {
610 slog (L_INFO, _("forced reconnect")); 675 slog (L_INFO, _("forced reconnect"));
612 reconnect_all (); 677 reconnect_all ();
613 } 678 }
614 679
615 events = 0; 680 events = 0;
616 } 681 }
617
618 w.at = TSTAMP_CANCEL;
619} 682}
620 683
621void 684void
622vpn::shutdown_all () 685vpn::shutdown_all ()
623{ 686{
636 connection_init (); 699 connection_init ();
637 700
638 for (configuration::node_vector::iterator i = conf.nodes.begin (); 701 for (configuration::node_vector::iterator i = conf.nodes.begin ();
639 i != conf.nodes.end (); ++i) 702 i != conf.nodes.end (); ++i)
640 { 703 {
641 connection *conn = new connection (this); 704 connection *conn = new connection (this, *i);
642
643 conn->conf = *i;
644 conns.push_back (conn); 705 conns.push_back (conn);
645
646 conn->establish_connection (); 706 conn->establish_connection ();
647 } 707 }
648} 708}
649 709
650connection *vpn::find_router () 710connection *vpn::find_router ()
695} 755}
696 756
697void 757void
698vpn::dump_status () 758vpn::dump_status ()
699{ 759{
700 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 760 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev::ev_now ());
701 761
702 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 762 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
703 (*c)->dump_status (); 763 (*c)->dump_status ();
704 764
705 slog (L_NOTICE, _("END status dump")); 765 slog (L_NOTICE, _("END status dump"));
713, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 773, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
714#endif 774#endif
715#if ENABLE_ICMP 775#if ENABLE_ICMP
716, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 776, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
717#endif 777#endif
778#if ENABLE_DNS
779, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
780#endif
718, tap_ev_watcher (this, &vpn::tap_ev) 781, tap_ev_watcher (this, &vpn::tap_ev)
719{ 782{
720} 783}
721 784
722vpn::~vpn () 785vpn::~vpn ()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines