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.20 by pcg, Thu Oct 16 14:12:00 2003 UTC vs.
Revision 1.40 by pcg, Sat Dec 1 23:35:31 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 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
6 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
7 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your option) any later version.
9 11
10 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,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 15 GNU General Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 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
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21 23
22#include <list> 24#include <list>
23 25
26#include <cstdio>
27#include <cstring>
24#include <cstdlib> 28#include <cstdlib>
25#include <cstring>
26#include <cstdio>
27 29
28#include <sys/types.h> 30#include <sys/types.h>
29#include <sys/socket.h> 31#include <sys/socket.h>
30#include <sys/wait.h> 32#include <sys/wait.h>
31#include <errno.h> 33#include <errno.h>
44 46
45vpn network; // THE vpn (bad design...) 47vpn network; // THE vpn (bad design...)
46 48
47///////////////////////////////////////////////////////////////////////////// 49/////////////////////////////////////////////////////////////////////////////
48 50
49const char *vpn::script_if_up () 51void
52vpn::script_init_env ()
50{ 53{
51 // the tunnel device mtu should be the physical mtu - overhead 54 // the tunnel device mtu should be the physical mtu - overhead
52 // the tricky part is rounding to the cipher key blocksize 55 // the tricky part is rounding to the cipher key blocksize
53 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD; 56 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
54 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 57 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
55 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 58 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
56 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 59 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
57 60
58 char *env; 61 char *env;
59 asprintf (&env, "CONFBASE=%s", confbase); 62 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
60 putenv (env);
61 asprintf (&env, "NODENAME=%s", THISNODE->nodename);
62 putenv (env);
63 asprintf (&env, "NODEID=%d", THISNODE->id);
64 putenv (env);
65 asprintf (&env, "IFNAME=%s", tap->interface ()); 63 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
66 putenv (env); 64 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
65 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
67 asprintf (&env, "MTU=%d", mtu); 66 asprintf (&env, "MTU=%d", mtu); putenv (env);
68 putenv (env); 67 asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
69 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 68 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
70 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
71 THISNODE->id & 0xff);
72 putenv (env);
73 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,
74 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;
75} 98}
76 99
77int 100int
78vpn::setup () 101vpn::setup ()
79{ 102{
85 108
86 if (ipv4_fd < 0) 109 if (ipv4_fd < 0)
87 return -1; 110 return -1;
88 111
89 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); 112 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
113 fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
90 114
91#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 115#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
92 // this I really consider a linux bug. I am neither connected 116 // this I really consider a linux bug. I am neither connected
93 // 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
94 // fragment for me sometimes. 118 // fragment for me sometimes.
101 sockinfo si (THISNODE, PROT_IPv4); 125 sockinfo si (THISNODE, PROT_IPv4);
102 126
103 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 127 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
104 { 128 {
105 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));
106 exit (1); 130 exit (EXIT_FAILURE);
107 } 131 }
108 132
109 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 133 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
110 } 134 }
111 135
112 udpv4_fd = -1; 136 udpv4_fd = -1;
113 137
114 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 138 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
117 141
118 if (udpv4_fd < 0) 142 if (udpv4_fd < 0)
119 return -1; 143 return -1;
120 144
121 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK); 145 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
146 fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
122 147
123 // standard daemon practise... 148 // standard daemon practise...
124 { 149 {
125 int oval = 1; 150 int oval = 1;
126 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 151 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
139 sockinfo si (THISNODE, PROT_UDPv4); 164 sockinfo si (THISNODE, PROT_UDPv4);
140 165
141 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 166 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
142 { 167 {
143 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));
144 exit (1); 169 exit (EXIT_FAILURE);
145 } 170 }
146 171
147 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 172 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
148 } 173 }
149 174
150 icmpv4_fd = -1; 175 icmpv4_fd = -1;
151 176
152#if ENABLE_ICMP 177#if ENABLE_ICMP
156 181
157 if (icmpv4_fd < 0) 182 if (icmpv4_fd < 0)
158 return -1; 183 return -1;
159 184
160 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK); 185 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
186 fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
161 187
162#ifdef ICMP_FILTER 188#ifdef ICMP_FILTER
163 { 189 {
164 icmp_filter oval; 190 icmp_filter oval;
165 oval.data = 0xffffffff; 191 oval.data = 0xffffffff;
174 // this I really consider a linux bug. I am neither connected 200 // this I really consider a linux bug. I am neither connected
175 // 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
176 // fragment for me sometimes. 202 // fragment for me sometimes.
177 { 203 {
178 int oval = IP_PMTUDISC_DONT; 204 int oval = IP_PMTUDISC_DONT;
179 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 205 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
180 } 206 }
181#endif 207#endif
182 208
183 sockinfo si (THISNODE, PROT_ICMPv4); 209 sockinfo si (THISNODE, PROT_ICMPv4);
184 210
185 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 211 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
186 { 212 {
187 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));
188 exit (1); 214 exit (EXIT_FAILURE);
189 } 215 }
190 216
191 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); 217 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
192 } 218 }
193#endif 219#endif
194 220
195 tcpv4_fd = -1; 221 tcpv4_fd = -1;
196 222
201 227
202 if (tcpv4_fd < 0) 228 if (tcpv4_fd < 0)
203 return -1; 229 return -1;
204 230
205 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK); 231 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
232 fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
206 233
207 // standard daemon practise... 234 // standard daemon practise...
208 { 235 {
209 int oval = 1; 236 int oval = 1;
210 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 237 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
213 sockinfo si (THISNODE, PROT_TCPv4); 240 sockinfo si (THISNODE, PROT_TCPv4);
214 241
215 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 242 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
216 { 243 {
217 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));
218 exit (1); 245 exit (EXIT_FAILURE);
219 } 246 }
220 247
221 if (listen (tcpv4_fd, 5)) 248 if (listen (tcpv4_fd, 5))
222 { 249 {
223 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));
224 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);
225 } 278 }
226
227 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
228 }
229#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 /////////////////////////////////////////////////////////////////////////////
230 306
231 tap = new tap_device (); 307 tap = new tap_device ();
232 if (!tap) //D this, of course, never catches 308 if (!tap) //D this, of course, never catches
233 { 309 {
234 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 310 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
235 exit (1); 311 exit (EXIT_FAILURE);
236 } 312 }
237 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
238 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 }
239 329
240 tap_ev_watcher.start (tap->fd, POLLIN); 330 tap_ev_watcher.start (tap->fd, EV_READ);
241
242 reconnect_all ();
243 331
244 return 0; 332 return 0;
245}
246
247// send a vpn packet out to other hosts
248bool
249vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
250{
251 switch (si.prot)
252 {
253 case PROT_IPv4:
254 return send_ipv4_packet (pkt, si, tos);
255
256 case PROT_UDPv4:
257 return send_udpv4_packet (pkt, si, tos);
258
259#if ENABLE_TCP
260 case PROT_TCPv4:
261 return send_tcpv4_packet (pkt, si, tos);
262#endif
263
264#if ENABLE_ICMP
265 case PROT_ICMPv4:
266 return send_icmpv4_packet (pkt, si, tos);
267#endif
268
269 default:
270 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
271 return false;
272 }
273} 333}
274 334
275bool 335bool
276vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 336vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
277{ 337{
396 else 456 else
397 c->recv_vpn_packet (pkt, rsi); 457 c->recv_vpn_packet (pkt, rsi);
398 } 458 }
399} 459}
400 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
401void 490void
402vpn::ipv4_ev (io_watcher &w, short revents) 491vpn::ipv4_ev (ev::io &w, int revents)
403{ 492{
404 if (revents & (POLLIN | POLLERR)) 493 if (revents & EV_READ)
405 { 494 {
406 vpn_packet *pkt = new vpn_packet; 495 vpn_packet *pkt = new vpn_packet;
407 struct sockaddr_in sa; 496 struct sockaddr_in sa;
408 socklen_t sa_len = sizeof (sa); 497 socklen_t sa_len = sizeof (sa);
409 int len; 498 int len;
414 503
415 if (len > 0) 504 if (len > 0)
416 { 505 {
417 pkt->len = len; 506 pkt->len = len;
418 507
419 // 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
420 // this is slow, but...
421 pkt->skip_hdr (IP_OVERHEAD); 509 pkt->skip_hdr (IP_OVERHEAD);
422 510
423 recv_vpn_packet (pkt, si); 511 recv_vpn_packet (pkt, si);
424 } 512 }
425 else 513 else
428 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 516 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
429 } 517 }
430 518
431 delete pkt; 519 delete pkt;
432 } 520 }
433 else if (revents & POLLHUP)
434 {
435 // this cannot ;) happen on udp sockets
436 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
437 exit (1);
438 }
439 else 521 else
440 { 522 {
441 slog (L_ERR, 523 slog (L_ERR,
442 _("FATAL: unknown revents %08x in socket, terminating\n"), 524 _("FATAL: unknown revents %08x in socket, terminating\n"),
443 revents); 525 revents);
444 exit (1); 526 exit (EXIT_FAILURE);
445 } 527 }
446} 528}
447 529
448#if ENABLE_ICMP 530#if ENABLE_ICMP
449void 531void
450vpn::icmpv4_ev (io_watcher &w, short revents) 532vpn::icmpv4_ev (ev::io &w, int revents)
451{ 533{
452 if (revents & (POLLIN | POLLERR)) 534 if (revents & EV_READ)
453 { 535 {
454 vpn_packet *pkt = new vpn_packet; 536 vpn_packet *pkt = new vpn_packet;
455 struct sockaddr_in sa; 537 struct sockaddr_in sa;
456 socklen_t sa_len = sizeof (sa); 538 socklen_t sa_len = sizeof (sa);
457 int len; 539 int len;
482 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 564 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
483 } 565 }
484 566
485 delete pkt; 567 delete pkt;
486 } 568 }
487 else if (revents & POLLHUP)
488 {
489 // this cannot ;) happen on udp sockets
490 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
491 exit (1);
492 }
493 else 569 else
494 { 570 {
495 slog (L_ERR, 571 slog (L_ERR,
496 _("FATAL: unknown revents %08x in socket, terminating\n"), 572 _("FATAL: unknown revents %08x in socket, terminating\n"),
497 revents); 573 revents);
498 exit (1); 574 exit (EXIT_FAILURE);
499 } 575 }
500} 576}
501#endif 577#endif
502 578
503void 579void
504vpn::udpv4_ev (io_watcher &w, short revents) 580vpn::udpv4_ev (ev::io &w, int revents)
505{ 581{
506 if (revents & (POLLIN | POLLERR)) 582 if (revents & EV_READ)
507 { 583 {
508 vpn_packet *pkt = new vpn_packet; 584 vpn_packet *pkt = new vpn_packet;
509 struct sockaddr_in sa; 585 struct sockaddr_in sa;
510 socklen_t sa_len = sizeof (sa); 586 socklen_t sa_len = sizeof (sa);
511 int len; 587 int len;
526 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));
527 } 603 }
528 604
529 delete pkt; 605 delete pkt;
530 } 606 }
531 else if (revents & POLLHUP)
532 {
533 // this cannot ;) happen on udp sockets
534 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
535 exit (1);
536 }
537 else 607 else
538 { 608 {
539 slog (L_ERR, 609 slog (L_ERR,
540 _("FATAL: unknown revents %08x in socket, terminating\n"), 610 _("FATAL: unknown revents %08x in socket, terminating\n"),
541 revents); 611 revents);
542 exit (1); 612 exit (EXIT_FAILURE);
543 } 613 }
544} 614}
545 615
546void 616void
547vpn::tap_ev (io_watcher &w, short revents) 617vpn::tap_ev (ev::io &w, int revents)
548{ 618{
549 if (revents & POLLIN) 619 if (revents & EV_READ)
550 { 620 {
551 /* process data */ 621 /* process data */
552 tap_packet *pkt; 622 tap_packet *pkt;
553 623
554 pkt = tap->recv (); 624 pkt = tap->recv ();
561 int dst = mac2id (pkt->dst); 631 int dst = mac2id (pkt->dst);
562 int src = mac2id (pkt->src); 632 int src = mac2id (pkt->src);
563 633
564 if (src != THISNODE->id) 634 if (src != THISNODE->id)
565 { 635 {
566 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."));
567 exit (1); 637 exit (EXIT_FAILURE);
568 } 638 }
569 639
570 if (dst == THISNODE->id) 640 if (dst == THISNODE->id)
571 { 641 {
572 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."));
573 exit (1); 643 exit (EXIT_FAILURE);
574 } 644 }
575 645
576 if (dst > conns.size ()) 646 if (dst > conns.size ())
577 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);
578 else 648 else
579 inject_data_packet (pkt, dst); 649 inject_data_packet (pkt, dst);
580 } 650 }
581 651
582 delete pkt; 652 delete pkt;
583 } 653 }
584 else if (revents & (POLLHUP | POLLERR))
585 {
586 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
587 exit (1);
588 }
589 else 654 else
590 abort (); 655 abort ();
591} 656}
592 657
593void 658void
594vpn::event_cb (time_watcher &w) 659vpn::event_cb (ev::timer &w, int)
595{ 660{
596 if (events) 661 if (events)
597 { 662 {
598 if (events & EVENT_SHUTDOWN) 663 if (events & EVENT_SHUTDOWN)
599 { 664 {
600 slog (L_INFO, _("preparing shutdown...")); 665 slog (L_INFO, _("preparing shutdown..."));
601 666
602 shutdown_all (); 667 shutdown_all ();
603
604 remove_pid (pidfilename); 668 remove_pid (conf.pidfilename);
605
606 slog (L_INFO, _("terminating")); 669 slog (L_INFO, _("terminating"));
607 670 exit (EXIT_SUCCESS);
608 exit (0);
609 } 671 }
610 672
611 if (events & EVENT_RECONNECT) 673 if (events & EVENT_RECONNECT)
612 { 674 {
613 slog (L_INFO, _("forced reconnect")); 675 slog (L_INFO, _("forced reconnect"));
615 reconnect_all (); 677 reconnect_all ();
616 } 678 }
617 679
618 events = 0; 680 events = 0;
619 } 681 }
620
621 w.at = TSTAMP_CANCEL;
622} 682}
623 683
624void 684void
625vpn::shutdown_all () 685vpn::shutdown_all ()
626{ 686{
639 connection_init (); 699 connection_init ();
640 700
641 for (configuration::node_vector::iterator i = conf.nodes.begin (); 701 for (configuration::node_vector::iterator i = conf.nodes.begin ();
642 i != conf.nodes.end (); ++i) 702 i != conf.nodes.end (); ++i)
643 { 703 {
644 connection *conn = new connection (this); 704 connection *conn = new connection (this, *i);
645
646 conn->conf = *i;
647 conns.push_back (conn); 705 conns.push_back (conn);
648
649 conn->establish_connection (); 706 conn->establish_connection ();
650 } 707 }
651} 708}
652 709
653connection *vpn::find_router () 710connection *vpn::find_router ()
698} 755}
699 756
700void 757void
701vpn::dump_status () 758vpn::dump_status ()
702{ 759{
703 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 760 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
704 761
705 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 762 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
706 (*c)->dump_status (); 763 (*c)->dump_status ();
707 764
708 slog (L_NOTICE, _("END status dump")); 765 slog (L_NOTICE, _("END status dump"));
716, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 773, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
717#endif 774#endif
718#if ENABLE_ICMP 775#if ENABLE_ICMP
719, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 776, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
720#endif 777#endif
778#if ENABLE_DNS
779, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
780#endif
721, tap_ev_watcher (this, &vpn::tap_ev) 781, tap_ev_watcher (this, &vpn::tap_ev)
722{ 782{
723} 783}
724 784
725vpn::~vpn () 785vpn::~vpn ()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines