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.19 by pcg, Thu Oct 16 02:41:21 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>
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);
60 putenv (env);
61 asprintf (&env, "NODEID=%d", THISNODE->id);
62 putenv (env);
63 asprintf (&env, "IFNAME=%s", tap->interface ()); 63 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
64 putenv (env); 64 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
65 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
65 asprintf (&env, "MTU=%d", mtu); 66 asprintf (&env, "MTU=%d", mtu); putenv (env);
66 putenv (env); 67 asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
67 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 68 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
68 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
69 THISNODE->id & 0xff);
70 putenv (env);
71 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,
72 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;
73} 98}
74 99
75int 100int
76vpn::setup () 101vpn::setup ()
77{ 102{
83 108
84 if (ipv4_fd < 0) 109 if (ipv4_fd < 0)
85 return -1; 110 return -1;
86 111
87 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); 112 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
113 fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
88 114
89#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 115#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
90 // this I really consider a linux bug. I am neither connected 116 // this I really consider a linux bug. I am neither connected
91 // 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
92 // fragment for me sometimes. 118 // fragment for me sometimes.
99 sockinfo si (THISNODE, PROT_IPv4); 125 sockinfo si (THISNODE, PROT_IPv4);
100 126
101 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 127 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
102 { 128 {
103 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));
104 exit (1); 130 exit (EXIT_FAILURE);
105 } 131 }
106 132
107 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 133 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
108 } 134 }
109 135
110 udpv4_fd = -1; 136 udpv4_fd = -1;
111 137
112 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 138 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
115 141
116 if (udpv4_fd < 0) 142 if (udpv4_fd < 0)
117 return -1; 143 return -1;
118 144
119 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK); 145 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
146 fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
120 147
121 // standard daemon practise... 148 // standard daemon practise...
122 { 149 {
123 int oval = 1; 150 int oval = 1;
124 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 151 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
137 sockinfo si (THISNODE, PROT_UDPv4); 164 sockinfo si (THISNODE, PROT_UDPv4);
138 165
139 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 166 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
140 { 167 {
141 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));
142 exit (1); 169 exit (EXIT_FAILURE);
143 } 170 }
144 171
145 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 172 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
146 } 173 }
147 174
148 icmpv4_fd = -1; 175 icmpv4_fd = -1;
149 176
150#if ENABLE_ICMP 177#if ENABLE_ICMP
154 181
155 if (icmpv4_fd < 0) 182 if (icmpv4_fd < 0)
156 return -1; 183 return -1;
157 184
158 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK); 185 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
186 fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
159 187
160#ifdef ICMP_FILTER 188#ifdef ICMP_FILTER
161 { 189 {
162 icmp_filter oval; 190 icmp_filter oval;
163 oval.data = 0xffffffff; 191 oval.data = 0xffffffff;
172 // this I really consider a linux bug. I am neither connected 200 // this I really consider a linux bug. I am neither connected
173 // 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
174 // fragment for me sometimes. 202 // fragment for me sometimes.
175 { 203 {
176 int oval = IP_PMTUDISC_DONT; 204 int oval = IP_PMTUDISC_DONT;
177 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 205 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
178 } 206 }
179#endif 207#endif
180 208
181 sockinfo si (THISNODE, PROT_ICMPv4); 209 sockinfo si (THISNODE, PROT_ICMPv4);
182 210
183 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 211 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
184 { 212 {
185 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));
186 exit (1); 214 exit (EXIT_FAILURE);
187 } 215 }
188 216
189 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); 217 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
190 } 218 }
191#endif 219#endif
192 220
193 tcpv4_fd = -1; 221 tcpv4_fd = -1;
194 222
199 227
200 if (tcpv4_fd < 0) 228 if (tcpv4_fd < 0)
201 return -1; 229 return -1;
202 230
203 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK); 231 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
232 fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
204 233
205 // standard daemon practise... 234 // standard daemon practise...
206 { 235 {
207 int oval = 1; 236 int oval = 1;
208 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 237 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
211 sockinfo si (THISNODE, PROT_TCPv4); 240 sockinfo si (THISNODE, PROT_TCPv4);
212 241
213 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 242 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
214 { 243 {
215 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));
216 exit (1); 245 exit (EXIT_FAILURE);
217 } 246 }
218 247
219 if (listen (tcpv4_fd, 5)) 248 if (listen (tcpv4_fd, 5))
220 { 249 {
221 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));
222 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);
223 } 278 }
224
225 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
226 }
227#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 /////////////////////////////////////////////////////////////////////////////
228 306
229 tap = new tap_device (); 307 tap = new tap_device ();
230 if (!tap) //D this, of course, never catches 308 if (!tap) //D this, of course, never catches
231 { 309 {
232 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 310 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
233 exit (1); 311 exit (EXIT_FAILURE);
234 } 312 }
235 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
236 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 }
237 329
238 tap_ev_watcher.start (tap->fd, POLLIN); 330 tap_ev_watcher.start (tap->fd, EV_READ);
239
240 reconnect_all ();
241 331
242 return 0; 332 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} 333}
272 334
273bool 335bool
274vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 336vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
275{ 337{
394 else 456 else
395 c->recv_vpn_packet (pkt, rsi); 457 c->recv_vpn_packet (pkt, rsi);
396 } 458 }
397} 459}
398 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
399void 490void
400vpn::ipv4_ev (io_watcher &w, short revents) 491vpn::ipv4_ev (ev::io &w, int revents)
401{ 492{
402 if (revents & (POLLIN | POLLERR)) 493 if (revents & EV_READ)
403 { 494 {
404 vpn_packet *pkt = new vpn_packet; 495 vpn_packet *pkt = new vpn_packet;
405 struct sockaddr_in sa; 496 struct sockaddr_in sa;
406 socklen_t sa_len = sizeof (sa); 497 socklen_t sa_len = sizeof (sa);
407 int len; 498 int len;
412 503
413 if (len > 0) 504 if (len > 0)
414 { 505 {
415 pkt->len = len; 506 pkt->len = len;
416 507
417 // 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
418 // this is slow, but...
419 pkt->skip_hdr (IP_OVERHEAD); 509 pkt->skip_hdr (IP_OVERHEAD);
420 510
421 recv_vpn_packet (pkt, si); 511 recv_vpn_packet (pkt, si);
422 } 512 }
423 else 513 else
426 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 516 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
427 } 517 }
428 518
429 delete pkt; 519 delete pkt;
430 } 520 }
431 else if (revents & POLLHUP)
432 {
433 // this cannot ;) happen on udp sockets
434 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
435 exit (1);
436 }
437 else 521 else
438 { 522 {
439 slog (L_ERR, 523 slog (L_ERR,
440 _("FATAL: unknown revents %08x in socket, terminating\n"), 524 _("FATAL: unknown revents %08x in socket, terminating\n"),
441 revents); 525 revents);
442 exit (1); 526 exit (EXIT_FAILURE);
443 } 527 }
444} 528}
445 529
446#if ENABLE_ICMP 530#if ENABLE_ICMP
447void 531void
448vpn::icmpv4_ev (io_watcher &w, short revents) 532vpn::icmpv4_ev (ev::io &w, int revents)
449{ 533{
450 if (revents & (POLLIN | POLLERR)) 534 if (revents & EV_READ)
451 { 535 {
452 vpn_packet *pkt = new vpn_packet; 536 vpn_packet *pkt = new vpn_packet;
453 struct sockaddr_in sa; 537 struct sockaddr_in sa;
454 socklen_t sa_len = sizeof (sa); 538 socklen_t sa_len = sizeof (sa);
455 int len; 539 int len;
480 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 564 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
481 } 565 }
482 566
483 delete pkt; 567 delete pkt;
484 } 568 }
485 else if (revents & POLLHUP)
486 {
487 // this cannot ;) happen on udp sockets
488 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
489 exit (1);
490 }
491 else 569 else
492 { 570 {
493 slog (L_ERR, 571 slog (L_ERR,
494 _("FATAL: unknown revents %08x in socket, terminating\n"), 572 _("FATAL: unknown revents %08x in socket, terminating\n"),
495 revents); 573 revents);
496 exit (1); 574 exit (EXIT_FAILURE);
497 } 575 }
498} 576}
499#endif 577#endif
500 578
501void 579void
502vpn::udpv4_ev (io_watcher &w, short revents) 580vpn::udpv4_ev (ev::io &w, int revents)
503{ 581{
504 if (revents & (POLLIN | POLLERR)) 582 if (revents & EV_READ)
505 { 583 {
506 vpn_packet *pkt = new vpn_packet; 584 vpn_packet *pkt = new vpn_packet;
507 struct sockaddr_in sa; 585 struct sockaddr_in sa;
508 socklen_t sa_len = sizeof (sa); 586 socklen_t sa_len = sizeof (sa);
509 int len; 587 int len;
524 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));
525 } 603 }
526 604
527 delete pkt; 605 delete pkt;
528 } 606 }
529 else if (revents & POLLHUP)
530 {
531 // this cannot ;) happen on udp sockets
532 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
533 exit (1);
534 }
535 else 607 else
536 { 608 {
537 slog (L_ERR, 609 slog (L_ERR,
538 _("FATAL: unknown revents %08x in socket, terminating\n"), 610 _("FATAL: unknown revents %08x in socket, terminating\n"),
539 revents); 611 revents);
540 exit (1); 612 exit (EXIT_FAILURE);
541 } 613 }
542} 614}
543 615
544void 616void
545vpn::tap_ev (io_watcher &w, short revents) 617vpn::tap_ev (ev::io &w, int revents)
546{ 618{
547 if (revents & POLLIN) 619 if (revents & EV_READ)
548 { 620 {
549 /* process data */ 621 /* process data */
550 tap_packet *pkt; 622 tap_packet *pkt;
551 623
552 pkt = tap->recv (); 624 pkt = tap->recv ();
559 int dst = mac2id (pkt->dst); 631 int dst = mac2id (pkt->dst);
560 int src = mac2id (pkt->src); 632 int src = mac2id (pkt->src);
561 633
562 if (src != THISNODE->id) 634 if (src != THISNODE->id)
563 { 635 {
564 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."));
565 exit (1); 637 exit (EXIT_FAILURE);
566 } 638 }
567 639
568 if (dst == THISNODE->id) 640 if (dst == THISNODE->id)
569 { 641 {
570 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."));
571 exit (1); 643 exit (EXIT_FAILURE);
572 } 644 }
573 645
574 if (dst > conns.size ()) 646 if (dst > conns.size ())
575 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);
576 else 648 else
577 inject_data_packet (pkt, dst); 649 inject_data_packet (pkt, dst);
578 } 650 }
579 651
580 delete pkt; 652 delete pkt;
581 } 653 }
582 else if (revents & (POLLHUP | POLLERR))
583 {
584 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
585 exit (1);
586 }
587 else 654 else
588 abort (); 655 abort ();
589} 656}
590 657
591void 658void
592vpn::event_cb (time_watcher &w) 659vpn::event_cb (ev::timer &w, int)
593{ 660{
594 if (events) 661 if (events)
595 { 662 {
596 if (events & EVENT_SHUTDOWN) 663 if (events & EVENT_SHUTDOWN)
597 { 664 {
598 slog (L_INFO, _("preparing shutdown...")); 665 slog (L_INFO, _("preparing shutdown..."));
599 666
600 shutdown_all (); 667 shutdown_all ();
601
602 remove_pid (pidfilename); 668 remove_pid (conf.pidfilename);
603
604 slog (L_INFO, _("terminating")); 669 slog (L_INFO, _("terminating"));
605 670 exit (EXIT_SUCCESS);
606 exit (0);
607 } 671 }
608 672
609 if (events & EVENT_RECONNECT) 673 if (events & EVENT_RECONNECT)
610 { 674 {
611 slog (L_INFO, _("forced reconnect")); 675 slog (L_INFO, _("forced reconnect"));
613 reconnect_all (); 677 reconnect_all ();
614 } 678 }
615 679
616 events = 0; 680 events = 0;
617 } 681 }
618
619 w.at = TSTAMP_CANCEL;
620} 682}
621 683
622void 684void
623vpn::shutdown_all () 685vpn::shutdown_all ()
624{ 686{
637 connection_init (); 699 connection_init ();
638 700
639 for (configuration::node_vector::iterator i = conf.nodes.begin (); 701 for (configuration::node_vector::iterator i = conf.nodes.begin ();
640 i != conf.nodes.end (); ++i) 702 i != conf.nodes.end (); ++i)
641 { 703 {
642 connection *conn = new connection (this); 704 connection *conn = new connection (this, *i);
643
644 conn->conf = *i;
645 conns.push_back (conn); 705 conns.push_back (conn);
646
647 conn->establish_connection (); 706 conn->establish_connection ();
648 } 707 }
649} 708}
650 709
651connection *vpn::find_router () 710connection *vpn::find_router ()
696} 755}
697 756
698void 757void
699vpn::dump_status () 758vpn::dump_status ()
700{ 759{
701 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 760 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
702 761
703 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 762 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
704 (*c)->dump_status (); 763 (*c)->dump_status ();
705 764
706 slog (L_NOTICE, _("END status dump")); 765 slog (L_NOTICE, _("END status dump"));
714, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 773, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
715#endif 774#endif
716#if ENABLE_ICMP 775#if ENABLE_ICMP
717, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 776, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
718#endif 777#endif
778#if ENABLE_DNS
779, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
780#endif
719, tap_ev_watcher (this, &vpn::tap_ev) 781, tap_ev_watcher (this, &vpn::tap_ev)
720{ 782{
721} 783}
722 784
723vpn::~vpn () 785vpn::~vpn ()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines