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.12 by pcg, Sun Apr 13 00:42:04 2003 UTC vs.
Revision 1.24 by pcg, Fri Apr 2 14:42:45 2004 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-2004 Marc Lehmann <pcg@goof.com>
3 4
4 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 6 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 7 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 8 (at your option) any later version.
18 19
19#include "config.h" 20#include "config.h"
20 21
21#include <list> 22#include <list>
22 23
24#include <cstdio>
25#include <cstring>
23#include <cstdlib> 26#include <cstdlib>
24#include <cstring>
25#include <cstdio>
26 27
27#include <sys/types.h> 28#include <sys/types.h>
28#include <sys/socket.h> 29#include <sys/socket.h>
29#include <sys/poll.h>
30#include <sys/wait.h> 30#include <sys/wait.h>
31#include <errno.h> 31#include <errno.h>
32#include <time.h> 32#include <time.h>
33#include <unistd.h> 33#include <unistd.h>
34#include <fcntl.h> 34#include <fcntl.h>
35#include <arpa/inet.h> 35#include <sys/socket.h>
36#include <netinet/in.h> 36
37#include <netinet/ip_icmp.h> 37#include "netcompat.h"
38 38
39#include "pidfile.h" 39#include "pidfile.h"
40 40
41#include "connection.h" 41#include "connection.h"
42#include "util.h" 42#include "util.h"
43#include "vpn.h" 43#include "vpn.h"
44
45vpn network; // THE vpn (bad design...)
44 46
45///////////////////////////////////////////////////////////////////////////// 47/////////////////////////////////////////////////////////////////////////////
46 48
47const char *vpn::script_if_up () 49const char *vpn::script_if_up ()
48{ 50{
52 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 54 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
53 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 55 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
54 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 56 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
55 57
56 char *env; 58 char *env;
57 asprintf (&env, "CONFBASE=%s", confbase); 59 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
58 putenv (env);
59 asprintf (&env, "NODENAME=%s", THISNODE->nodename); 60 asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
60 putenv (env);
61 asprintf (&env, "NODEID=%d", THISNODE->id); 61 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
62 putenv (env);
63 asprintf (&env, "IFNAME=%s", tap->interface ()); 62 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
64 putenv (env); 63 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
64 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
65 asprintf (&env, "MTU=%d", mtu); 65 asprintf (&env, "MTU=%d", mtu); putenv (env);
66 putenv (env);
67 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 66 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",
68 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8, 67 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
69 THISNODE->id & 0xff); 68 THISNODE->id & 0xff);
70 putenv (env); 69 putenv (env);
71 70
84 if (ipv4_fd < 0) 83 if (ipv4_fd < 0)
85 return -1; 84 return -1;
86 85
87 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); 86 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
88 87
89#ifdef IP_MTU_DISCOVER 88#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
90 // this I really consider a linux bug. I am neither connected 89 // this I really consider a linux bug. I am neither connected
91 // nor do I fragment myself. Linux still sets DF and doesn't 90 // nor do I fragment myself. Linux still sets DF and doesn't
92 // fragment for me sometimes. 91 // fragment for me sometimes.
93 { 92 {
94 int oval = IP_PMTUDISC_DONT; 93 int oval = IP_PMTUDISC_DONT;
99 sockinfo si (THISNODE, PROT_IPv4); 98 sockinfo si (THISNODE, PROT_IPv4);
100 99
101 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 100 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
102 { 101 {
103 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 102 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
104 exit (1); 103 exit (EXIT_FAILURE);
105 } 104 }
106 105
107 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 106 ipv4_ev_watcher.start (ipv4_fd, EVENT_READ);
108 } 107 }
109 108
110 udpv4_fd = -1; 109 udpv4_fd = -1;
111 110
112 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 111 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
122 { 121 {
123 int oval = 1; 122 int oval = 1;
124 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 123 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
125 } 124 }
126 125
127#ifdef IP_MTU_DISCOVER 126#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
128 // this I really consider a linux bug. I am neither connected 127 // this I really consider a linux bug. I am neither connected
129 // nor do I fragment myself. Linux still sets DF and doesn't 128 // nor do I fragment myself. Linux still sets DF and doesn't
130 // fragment for me sometimes. 129 // fragment for me sometimes.
131 { 130 {
132 int oval = IP_PMTUDISC_DONT; 131 int oval = IP_PMTUDISC_DONT;
137 sockinfo si (THISNODE, PROT_UDPv4); 136 sockinfo si (THISNODE, PROT_UDPv4);
138 137
139 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 138 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
140 { 139 {
141 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 140 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
142 exit (1); 141 exit (EXIT_FAILURE);
143 } 142 }
144 143
145 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 144 udpv4_ev_watcher.start (udpv4_fd, EVENT_READ);
146 } 145 }
147 146
148 icmpv4_fd = -1; 147 icmpv4_fd = -1;
149 148
150#if ENABLE_ICMP 149#if ENABLE_ICMP
166 165
167 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval); 166 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
168 } 167 }
169#endif 168#endif
170 169
171#ifdef IP_MTU_DISCOVER 170#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
172 // this I really consider a linux bug. I am neither connected 171 // this I really consider a linux bug. I am neither connected
173 // nor do I fragment myself. Linux still sets DF and doesn't 172 // nor do I fragment myself. Linux still sets DF and doesn't
174 // fragment for me sometimes. 173 // fragment for me sometimes.
175 { 174 {
176 int oval = IP_PMTUDISC_DONT; 175 int oval = IP_PMTUDISC_DONT;
181 sockinfo si (THISNODE, PROT_ICMPv4); 180 sockinfo si (THISNODE, PROT_ICMPv4);
182 181
183 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 182 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
184 { 183 {
185 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); 184 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
186 exit (1); 185 exit (EXIT_FAILURE);
187 } 186 }
188 187
189 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); 188 icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ);
190 } 189 }
191#endif 190#endif
192 191
193 tcpv4_fd = -1; 192 tcpv4_fd = -1;
194 193
211 sockinfo si (THISNODE, PROT_TCPv4); 210 sockinfo si (THISNODE, PROT_TCPv4);
212 211
213 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 212 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
214 { 213 {
215 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 214 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
216 exit (1); 215 exit (EXIT_FAILURE);
217 } 216 }
218 217
219 if (listen (tcpv4_fd, 5)) 218 if (listen (tcpv4_fd, 5))
220 { 219 {
221 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 220 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
222 exit (1); 221 exit (EXIT_FAILURE);
222 }
223
224 tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ);
225 }
226#endif
227
228#if ENABLE_DNS
229 if (THISNODE->protocols & PROT_DNSv4)
230 {
231 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
232
233 if (dnsv4_fd < 0)
234 return -1;
235
236 // standard daemon practise...
237 {
238 int oval = 1;
239 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
240 }
241
242 sockinfo si (THISNODE, PROT_DNSv4);
243
244 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
223 } 245 {
246 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
247 exit (EXIT_FAILURE);
248 }
224 249
225 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN); 250 dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ);
226 } 251 }
227#endif 252#endif
228 253
229 tap = new tap_device (); 254 tap = new tap_device ();
230 if (!tap) //D this, of course, never catches 255 if (!tap) //D this, of course, never catches
231 { 256 {
232 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 257 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
233 exit (1); 258 exit (EXIT_FAILURE);
234 } 259 }
235 260
236 run_script (run_script_cb (this, &vpn::script_if_up), true); 261 run_script (run_script_cb (this, &vpn::script_if_up), true);
237 262
238 tap_ev_watcher.start (tap->fd, POLLIN); 263 tap_ev_watcher.start (tap->fd, EVENT_READ);
239 264
240 reconnect_all (); 265 reconnect_all ();
241 266
242 return 0; 267 return 0;
243} 268}
262#if ENABLE_ICMP 287#if ENABLE_ICMP
263 case PROT_ICMPv4: 288 case PROT_ICMPv4:
264 return send_icmpv4_packet (pkt, si, tos); 289 return send_icmpv4_packet (pkt, si, tos);
265#endif 290#endif
266 291
292#if ENABLE_DNS
293 case PROT_DNSv4:
294 return send_dnsv4_packet (pkt, si, tos);
295#endif
296
267 default: 297 default:
268 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si); 298 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
269 return false; 299 return false;
270 } 300 }
271} 301}
272 302
273bool 303bool
274vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 304vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
275{ 305{
306#if defined(SOL_IP) && defined(IP_TOS)
276 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 307 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
308#endif
277 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 309 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
278 310
279 return true; 311 return true;
280} 312}
281 313
300 sum += (sum >> 16); // carry 332 sum += (sum >> 16); // carry
301 333
302 return ~sum; 334 return ~sum;
303} 335}
304 336
337#if ENABLE_ICMP
305bool 338bool
306vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 339vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
307{ 340{
341#if defined(SOL_IP) && defined(IP_TOS)
308 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 342 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
343#endif
309 344
310 pkt->unshift_hdr (4); 345 pkt->unshift_hdr (4);
311 346
312 icmphdr *hdr = (icmphdr *)&((*pkt)[0]); 347 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
313 hdr->type = ::conf.icmp_type; 348 hdr->type = ::conf.icmp_type;
314 hdr->code = 255; 349 hdr->code = 255;
315 hdr->checksum = 0; 350 hdr->checksum = 0;
316 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 351 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
317 352
318 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 353 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
319 354
320 return true; 355 return true;
321} 356}
357#endif
322 358
323bool 359bool
324vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 360vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
325{ 361{
362#if defined(SOL_IP) && defined(IP_TOS)
326 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 363 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
364#endif
327 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 365 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
328 366
329 return true; 367 return true;
368}
369
370void
371vpn::inject_data_packet (tap_packet *pkt, int dst)
372{
373 if (dst)
374 {
375 // unicast
376 if (dst != THISNODE->id)
377 conns[dst - 1]->inject_data_packet (pkt);
378 }
379 else
380 {
381 // broadcast, this is ugly, but due to the security policy
382 // we have to connect to all hosts...
383 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
384 if ((*c)->conf != THISNODE)
385 (*c)->inject_data_packet (pkt, true);
386 }
330} 387}
331 388
332void 389void
333vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 390vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
334{ 391{
348 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 405 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
349 else 406 else
350 { 407 {
351 connection *c = conns[src - 1]; 408 connection *c = conns[src - 1];
352 409
353 if (dst == 0 && !THISNODE->routerprio) 410 if (dst == 0)
354 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), 411 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
355 c->conf->nodename, (const char *)rsi); 412 c->conf->nodename, (const char *)rsi);
356 else if (dst != 0 && dst != THISNODE->id) 413 else if (dst != THISNODE->id)
357 { 414 {
358 if (THISNODE->routerprio) 415 if (THISNODE->routerprio)
359 // the tos setting gets lost here. who cares. 416 // the tos setting gets lost here. who cares.
360 conns[dst - 1]->inject_vpn_packet (pkt); 417 conns[dst - 1]->inject_vpn_packet (pkt);
361 else 418 else
370} 427}
371 428
372void 429void
373vpn::ipv4_ev (io_watcher &w, short revents) 430vpn::ipv4_ev (io_watcher &w, short revents)
374{ 431{
375 if (revents & (POLLIN | POLLERR)) 432 if (revents & EVENT_READ)
376 { 433 {
377 vpn_packet *pkt = new vpn_packet; 434 vpn_packet *pkt = new vpn_packet;
378 struct sockaddr_in sa; 435 struct sockaddr_in sa;
379 socklen_t sa_len = sizeof (sa); 436 socklen_t sa_len = sizeof (sa);
380 int len; 437 int len;
399 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 456 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
400 } 457 }
401 458
402 delete pkt; 459 delete pkt;
403 } 460 }
404 else if (revents & POLLHUP)
405 {
406 // this cannot ;) happen on udp sockets
407 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
408 exit (1);
409 }
410 else 461 else
411 { 462 {
412 slog (L_ERR, 463 slog (L_ERR,
413 _("FATAL: unknown revents %08x in socket, terminating\n"), 464 _("FATAL: unknown revents %08x in socket, terminating\n"),
414 revents); 465 revents);
415 exit (1); 466 exit (EXIT_FAILURE);
416 } 467 }
417} 468}
418 469
470#if ENABLE_ICMP
419void 471void
420vpn::icmpv4_ev (io_watcher &w, short revents) 472vpn::icmpv4_ev (io_watcher &w, short revents)
421{ 473{
422 if (revents & (POLLIN | POLLERR)) 474 if (revents & EVENT_READ)
423 { 475 {
424 vpn_packet *pkt = new vpn_packet; 476 vpn_packet *pkt = new vpn_packet;
425 struct sockaddr_in sa; 477 struct sockaddr_in sa;
426 socklen_t sa_len = sizeof (sa); 478 socklen_t sa_len = sizeof (sa);
427 int len; 479 int len;
432 484
433 if (len > 0) 485 if (len > 0)
434 { 486 {
435 pkt->len = len; 487 pkt->len = len;
436 488
437 icmphdr *hdr = (icmphdr *)&((*pkt)[IP_OVERHEAD]); 489 icmp_header *hdr = (icmp_header *)&((*pkt)[IP_OVERHEAD]);
438 490
439 if (hdr->type == ::conf.icmp_type 491 if (hdr->type == ::conf.icmp_type
440 && hdr->code == 255) 492 && hdr->code == 255)
441 { 493 {
442 // raw sockets deliver the ipv4, but don't expect it on sends 494 // raw sockets deliver the ipv4, but don't expect it on sends
452 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 504 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
453 } 505 }
454 506
455 delete pkt; 507 delete pkt;
456 } 508 }
457 else if (revents & POLLHUP)
458 {
459 // this cannot ;) happen on udp sockets
460 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
461 exit (1);
462 }
463 else 509 else
464 { 510 {
465 slog (L_ERR, 511 slog (L_ERR,
466 _("FATAL: unknown revents %08x in socket, terminating\n"), 512 _("FATAL: unknown revents %08x in socket, terminating\n"),
467 revents); 513 revents);
468 exit (1); 514 exit (EXIT_FAILURE);
469 } 515 }
470} 516}
517#endif
471 518
472void 519void
473vpn::udpv4_ev (io_watcher &w, short revents) 520vpn::udpv4_ev (io_watcher &w, short revents)
474{ 521{
475 if (revents & (POLLIN | POLLERR)) 522 if (revents & EVENT_READ)
476 { 523 {
477 vpn_packet *pkt = new vpn_packet; 524 vpn_packet *pkt = new vpn_packet;
478 struct sockaddr_in sa; 525 struct sockaddr_in sa;
479 socklen_t sa_len = sizeof (sa); 526 socklen_t sa_len = sizeof (sa);
480 int len; 527 int len;
495 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 542 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
496 } 543 }
497 544
498 delete pkt; 545 delete pkt;
499 } 546 }
500 else if (revents & POLLHUP)
501 {
502 // this cannot ;) happen on udp sockets
503 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
504 exit (1);
505 }
506 else 547 else
507 { 548 {
508 slog (L_ERR, 549 slog (L_ERR,
509 _("FATAL: unknown revents %08x in socket, terminating\n"), 550 _("FATAL: unknown revents %08x in socket, terminating\n"),
510 revents); 551 revents);
511 exit (1); 552 exit (EXIT_FAILURE);
512 } 553 }
513} 554}
514 555
515void 556void
516vpn::tap_ev (io_watcher &w, short revents) 557vpn::tap_ev (io_watcher &w, short revents)
517{ 558{
518 if (revents & POLLIN) 559 if (revents & EVENT_READ)
519 { 560 {
520 /* process data */ 561 /* process data */
521 tap_packet *pkt; 562 tap_packet *pkt;
522 563
523 pkt = tap->recv (); 564 pkt = tap->recv ();
524 565
566 if (!pkt)
567 return;
568
569 if (pkt->len > 14)
570 {
525 int dst = mac2id (pkt->dst); 571 int dst = mac2id (pkt->dst);
526 int src = mac2id (pkt->src); 572 int src = mac2id (pkt->src);
527 573
528 if (src != THISNODE->id) 574 if (src != THISNODE->id)
529 {
530 slog (L_ERR, _("FATAL: tap packet not originating on current node received, terminating."));
531 exit (1);
532 }
533
534 if (dst == THISNODE->id)
535 {
536 slog (L_ERR, _("FATAL: tap packet destined for current node received, terminating."));
537 exit (1);
538 }
539
540 if (dst > conns.size ())
541 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
542 else
543 {
544 if (dst)
545 { 575 {
546 // unicast 576 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
547 if (dst != THISNODE->id) 577 exit (EXIT_FAILURE);
548 conns[dst - 1]->inject_data_packet (pkt);
549 } 578 }
579
580 if (dst == THISNODE->id)
581 {
582 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
583 exit (EXIT_FAILURE);
584 }
585
586 if (dst > conns.size ())
587 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
550 else 588 else
551 {
552 // broadcast, first check router, then self, then english
553 connection *router = find_router ();
554
555 if (router)
556 router->inject_data_packet (pkt, true); 589 inject_data_packet (pkt, dst);
557 else
558 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
559 if ((*c)->conf != THISNODE)
560 (*c)->inject_data_packet (pkt);
561 }
562 } 590 }
563 591
564 delete pkt; 592 delete pkt;
565 }
566 else if (revents & (POLLHUP | POLLERR))
567 {
568 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
569 exit (1);
570 } 593 }
571 else 594 else
572 abort (); 595 abort ();
573} 596}
574 597
580 if (events & EVENT_SHUTDOWN) 603 if (events & EVENT_SHUTDOWN)
581 { 604 {
582 slog (L_INFO, _("preparing shutdown...")); 605 slog (L_INFO, _("preparing shutdown..."));
583 606
584 shutdown_all (); 607 shutdown_all ();
585
586 remove_pid (pidfilename); 608 remove_pid (conf.pidfilename);
587
588 slog (L_INFO, _("terminating")); 609 slog (L_INFO, _("terminating"));
589 610 exit (EXIT_SUCCESS);
590 exit (0);
591 } 611 }
592 612
593 if (events & EVENT_RECONNECT) 613 if (events & EVENT_RECONNECT)
594 { 614 {
595 slog (L_INFO, _("forced reconnect")); 615 slog (L_INFO, _("forced reconnect"));
597 reconnect_all (); 617 reconnect_all ();
598 } 618 }
599 619
600 events = 0; 620 events = 0;
601 } 621 }
602
603 w.at = TSTAMP_CANCEL;
604} 622}
605 623
606void 624void
607vpn::shutdown_all () 625vpn::shutdown_all ()
608{ 626{
639 657
640 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 658 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
641 { 659 {
642 connection *c = *i; 660 connection *c = *i;
643 661
644 if (c->conf->routerprio >= prio 662 if (c->conf->routerprio > prio
645 && c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use 663 && c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use
646 && c->ictx && c->octx 664 && c->ictx && c->octx
647 && c->conf != THISNODE // redundant, since ictx==octx==0 always on thisnode 665 && c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode
648 && (!THISNODE->routerprio
649 || c->conf->routerprio <= THISNODE->routerprio))
650 { 666 {
651 prio = c->conf->routerprio; 667 prio = c->conf->routerprio;
652 router = c; 668 router = c;
653 } 669 }
654 } 670 }
663 if (c) 679 if (c)
664 c->send_connect_request (id); 680 c->send_connect_request (id);
665 else 681 else
666 // no router found, aggressively connect to all routers 682 // no router found, aggressively connect to all routers
667 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 683 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
668 if ((*i)->conf->routerprio) 684 if ((*i)->conf->routerprio && (*i)->conf != THISNODE)
669 (*i)->establish_connection (); 685 (*i)->establish_connection ();
670} 686}
671 687
672void 688void
673connection::dump_status () 689connection::dump_status ()
700, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 716, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
701#endif 717#endif
702#if ENABLE_ICMP 718#if ENABLE_ICMP
703, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 719, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
704#endif 720#endif
721#if ENABLE_DNS
722, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
723#endif
705, tap_ev_watcher (this, &vpn::tap_ev) 724, tap_ev_watcher (this, &vpn::tap_ev)
706{ 725{
707} 726}
708 727
709vpn::~vpn () 728vpn::~vpn ()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines