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.14 by pcg, Tue Oct 14 03:22:09 2003 UTC vs.
Revision 1.34 by pcg, Sat Mar 26 03:16:24 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/poll.h>
30#include <sys/wait.h> 32#include <sys/wait.h>
31#include <errno.h> 33#include <errno.h>
32#include <time.h> 34#include <time.h>
33#include <unistd.h> 35#include <unistd.h>
34#include <fcntl.h> 36#include <fcntl.h>
35#include <sys/socket.h> 37#include <sys/socket.h>
36#include <netinet/in.h> 38
37#include <arpa/inet.h> 39#include "netcompat.h"
38#include <net/if.h>
39#ifdef HAVE_NETINET_IN_SYSTM_H
40# include <netinet/in_systm.h>
41#endif
42#ifdef HAVE_NETINET_IP_H
43# include <netinet/ip.h>
44#endif
45#ifdef HAVE_NETINET_TCP_H
46# include <netinet/tcp.h>
47#endif
48#if ENABLE_ICMP
49# include <netinet/ip_icmp.h>
50#endif
51 40
52#include "pidfile.h" 41#include "pidfile.h"
53 42
54#include "connection.h" 43#include "connection.h"
55#include "util.h" 44#include "util.h"
56#include "vpn.h" 45#include "vpn.h"
57 46
58#if !defined(SOL_IP) && defined(IPPROTO_IP) 47vpn network; // THE vpn (bad design...)
59# define SOL_IP IPPROTO_IP
60#endif
61 48
62///////////////////////////////////////////////////////////////////////////// 49/////////////////////////////////////////////////////////////////////////////
63 50
64const char *vpn::script_if_up () 51void
52vpn::script_init_env ()
65{ 53{
66 // the tunnel device mtu should be the physical mtu - overhead 54 // the tunnel device mtu should be the physical mtu - overhead
67 // the tricky part is rounding to the cipher key blocksize 55 // the tricky part is rounding to the cipher key blocksize
68 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD; 56 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
69 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 57 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
70 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 58 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
71 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 59 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
72 60
73 char *env; 61 char *env;
74 asprintf (&env, "CONFBASE=%s", confbase); 62 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
75 putenv (env);
76 asprintf (&env, "NODENAME=%s", THISNODE->nodename);
77 putenv (env);
78 asprintf (&env, "NODEID=%d", THISNODE->id);
79 putenv (env);
80 asprintf (&env, "IFNAME=%s", tap->interface ()); 63 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
81 putenv (env); 64 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
65 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
82 asprintf (&env, "MTU=%d", mtu); 66 asprintf (&env, "MTU=%d", mtu); putenv (env);
83 putenv (env); 67 asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
84 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 68 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
85 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
86 THISNODE->id & 0xff);
87 putenv (env);
88 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,
89 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;
90} 98}
91 99
92int 100int
93vpn::setup () 101vpn::setup ()
94{ 102{
116 sockinfo si (THISNODE, PROT_IPv4); 124 sockinfo si (THISNODE, PROT_IPv4);
117 125
118 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 126 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
119 { 127 {
120 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));
121 exit (1); 129 exit (EXIT_FAILURE);
122 } 130 }
123 131
124 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 132 ipv4_ev_watcher.start (ipv4_fd, EVENT_READ);
125 } 133 }
126 134
127 udpv4_fd = -1; 135 udpv4_fd = -1;
128 136
129 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 137 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
154 sockinfo si (THISNODE, PROT_UDPv4); 162 sockinfo si (THISNODE, PROT_UDPv4);
155 163
156 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 164 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
157 { 165 {
158 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));
159 exit (1); 167 exit (EXIT_FAILURE);
160 } 168 }
161 169
162 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 170 udpv4_ev_watcher.start (udpv4_fd, EVENT_READ);
163 } 171 }
164 172
165 icmpv4_fd = -1; 173 icmpv4_fd = -1;
166 174
167#if ENABLE_ICMP 175#if ENABLE_ICMP
198 sockinfo si (THISNODE, PROT_ICMPv4); 206 sockinfo si (THISNODE, PROT_ICMPv4);
199 207
200 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 208 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
201 { 209 {
202 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));
203 exit (1); 211 exit (EXIT_FAILURE);
204 } 212 }
205 213
206 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); 214 icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ);
207 } 215 }
208#endif 216#endif
209 217
210 tcpv4_fd = -1; 218 tcpv4_fd = -1;
211 219
228 sockinfo si (THISNODE, PROT_TCPv4); 236 sockinfo si (THISNODE, PROT_TCPv4);
229 237
230 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 238 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
231 { 239 {
232 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));
233 exit (1); 241 exit (EXIT_FAILURE);
234 } 242 }
235 243
236 if (listen (tcpv4_fd, 5)) 244 if (listen (tcpv4_fd, 5))
237 { 245 {
238 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));
239 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 (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
271 }
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 ()))
240 } 285 {
286 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
287 exit (EXIT_FAILURE);
288 }
241 289
242 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN); 290 dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ);
243 } 291 }
244#endif 292#endif
293
294 /////////////////////////////////////////////////////////////////////////////
295
296 reconnect_all ();
297
298 /////////////////////////////////////////////////////////////////////////////
245 299
246 tap = new tap_device (); 300 tap = new tap_device ();
247 if (!tap) //D this, of course, never catches 301 if (!tap) //D this, of course, never catches
248 { 302 {
249 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 303 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
250 exit (1); 304 exit (EXIT_FAILURE);
251 } 305 }
252 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
253 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 }
254 320
255 tap_ev_watcher.start (tap->fd, POLLIN); 321 tap_ev_watcher.start (tap->fd, EVENT_READ);
256
257 reconnect_all ();
258 322
259 return 0; 323 return 0;
260}
261
262// send a vpn packet out to other hosts
263bool
264vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
265{
266 switch (si.prot)
267 {
268 case PROT_IPv4:
269 return send_ipv4_packet (pkt, si, tos);
270
271 case PROT_UDPv4:
272 return send_udpv4_packet (pkt, si, tos);
273
274#if ENABLE_TCP
275 case PROT_TCPv4:
276 return send_tcpv4_packet (pkt, si, tos);
277#endif
278
279#if ENABLE_ICMP
280 case PROT_ICMPv4:
281 return send_icmpv4_packet (pkt, si, tos);
282#endif
283
284 default:
285 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
286 return false;
287 }
288} 324}
289 325
290bool 326bool
291vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 327vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
292{ 328{
320 356
321 return ~sum; 357 return ~sum;
322} 358}
323 359
324#if ENABLE_ICMP 360#if ENABLE_ICMP
325struct icmp_header {
326 u8 type;
327 u8 code;
328 u16 checksum;
329 union {
330 struct {
331 u16 id;
332 u16 sequence;
333 } echo;
334 u32 gateway;
335 struct {
336 u16 unused;
337 u16 mtu;
338 } frag;
339 } un;
340};
341
342bool 361bool
343vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 362vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
344{ 363{
345#if defined(SOL_IP) && defined(IP_TOS) 364#if defined(SOL_IP) && defined(IP_TOS)
346 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 365 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
367 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 386 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
368#endif 387#endif
369 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 ());
370 389
371 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 }
372} 410}
373 411
374void 412void
375vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 413vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
376{ 414{
393 connection *c = conns[src - 1]; 431 connection *c = conns[src - 1];
394 432
395 if (dst == 0) 433 if (dst == 0)
396 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"), 434 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
397 c->conf->nodename, (const char *)rsi); 435 c->conf->nodename, (const char *)rsi);
398 else if (dst != 0 && dst != THISNODE->id) 436 else if (dst != THISNODE->id)
399 { 437 {
400 if (THISNODE->routerprio) 438 if (THISNODE->routerprio)
401 // the tos setting gets lost here. who cares. 439 // the tos setting gets lost here. who cares.
402 conns[dst - 1]->inject_vpn_packet (pkt); 440 conns[dst - 1]->inject_vpn_packet (pkt);
403 else 441 else
409 else 447 else
410 c->recv_vpn_packet (pkt, rsi); 448 c->recv_vpn_packet (pkt, rsi);
411 } 449 }
412} 450}
413 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
414void 481void
415vpn::ipv4_ev (io_watcher &w, short revents) 482vpn::ipv4_ev (io_watcher &w, short revents)
416{ 483{
417 if (revents & (POLLIN | POLLERR)) 484 if (revents & EVENT_READ)
418 { 485 {
419 vpn_packet *pkt = new vpn_packet; 486 vpn_packet *pkt = new vpn_packet;
420 struct sockaddr_in sa; 487 struct sockaddr_in sa;
421 socklen_t sa_len = sizeof (sa); 488 socklen_t sa_len = sizeof (sa);
422 int len; 489 int len;
427 494
428 if (len > 0) 495 if (len > 0)
429 { 496 {
430 pkt->len = len; 497 pkt->len = len;
431 498
432 // 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
433 // this is slow, but...
434 pkt->skip_hdr (IP_OVERHEAD); 500 pkt->skip_hdr (IP_OVERHEAD);
435 501
436 recv_vpn_packet (pkt, si); 502 recv_vpn_packet (pkt, si);
437 } 503 }
438 else 504 else
441 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 507 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
442 } 508 }
443 509
444 delete pkt; 510 delete pkt;
445 } 511 }
446 else if (revents & POLLHUP)
447 {
448 // this cannot ;) happen on udp sockets
449 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
450 exit (1);
451 }
452 else 512 else
453 { 513 {
454 slog (L_ERR, 514 slog (L_ERR,
455 _("FATAL: unknown revents %08x in socket, terminating\n"), 515 _("FATAL: unknown revents %08x in socket, terminating\n"),
456 revents); 516 revents);
457 exit (1); 517 exit (EXIT_FAILURE);
458 } 518 }
459} 519}
460 520
461#if ENABLE_ICMP 521#if ENABLE_ICMP
462void 522void
463vpn::icmpv4_ev (io_watcher &w, short revents) 523vpn::icmpv4_ev (io_watcher &w, short revents)
464{ 524{
465 if (revents & (POLLIN | POLLERR)) 525 if (revents & EVENT_READ)
466 { 526 {
467 vpn_packet *pkt = new vpn_packet; 527 vpn_packet *pkt = new vpn_packet;
468 struct sockaddr_in sa; 528 struct sockaddr_in sa;
469 socklen_t sa_len = sizeof (sa); 529 socklen_t sa_len = sizeof (sa);
470 int len; 530 int len;
495 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 555 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
496 } 556 }
497 557
498 delete pkt; 558 delete pkt;
499 } 559 }
500 else if (revents & POLLHUP)
501 {
502 // this cannot ;) happen on udp sockets
503 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
504 exit (1);
505 }
506 else 560 else
507 { 561 {
508 slog (L_ERR, 562 slog (L_ERR,
509 _("FATAL: unknown revents %08x in socket, terminating\n"), 563 _("FATAL: unknown revents %08x in socket, terminating\n"),
510 revents); 564 revents);
511 exit (1); 565 exit (EXIT_FAILURE);
512 } 566 }
513} 567}
514#endif 568#endif
515 569
516void 570void
517vpn::udpv4_ev (io_watcher &w, short revents) 571vpn::udpv4_ev (io_watcher &w, short revents)
518{ 572{
519 if (revents & (POLLIN | POLLERR)) 573 if (revents & EVENT_READ)
520 { 574 {
521 vpn_packet *pkt = new vpn_packet; 575 vpn_packet *pkt = new vpn_packet;
522 struct sockaddr_in sa; 576 struct sockaddr_in sa;
523 socklen_t sa_len = sizeof (sa); 577 socklen_t sa_len = sizeof (sa);
524 int len; 578 int len;
539 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));
540 } 594 }
541 595
542 delete pkt; 596 delete pkt;
543 } 597 }
544 else if (revents & POLLHUP)
545 {
546 // this cannot ;) happen on udp sockets
547 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
548 exit (1);
549 }
550 else 598 else
551 { 599 {
552 slog (L_ERR, 600 slog (L_ERR,
553 _("FATAL: unknown revents %08x in socket, terminating\n"), 601 _("FATAL: unknown revents %08x in socket, terminating\n"),
554 revents); 602 revents);
555 exit (1); 603 exit (EXIT_FAILURE);
556 } 604 }
557} 605}
558 606
559void 607void
560vpn::tap_ev (io_watcher &w, short revents) 608vpn::tap_ev (io_watcher &w, short revents)
561{ 609{
562 if (revents & POLLIN) 610 if (revents & EVENT_READ)
563 { 611 {
564 /* process data */ 612 /* process data */
565 tap_packet *pkt; 613 tap_packet *pkt;
566 614
567 pkt = tap->recv (); 615 pkt = tap->recv ();
568 616
617 if (!pkt)
618 return;
619
620 if (pkt->len > 14)
621 {
569 int dst = mac2id (pkt->dst); 622 int dst = mac2id (pkt->dst);
570 int src = mac2id (pkt->src); 623 int src = mac2id (pkt->src);
571 624
572 if (src != THISNODE->id) 625 if (src != THISNODE->id)
573 {
574 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
575 exit (1);
576 }
577
578 if (dst == THISNODE->id)
579 {
580 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
581 exit (1);
582 }
583
584 if (dst > conns.size ())
585 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
586 else
587 {
588 if (dst)
589 { 626 {
590 // unicast 627 slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
591 if (dst != THISNODE->id) 628 exit (EXIT_FAILURE);
592 conns[dst - 1]->inject_data_packet (pkt);
593 } 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);
594 else 639 else
595 {
596 // broadcast, this is ugly, but due to the security policy
597 // we have to connect to all hosts...
598 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
599 if ((*c)->conf != THISNODE)
600 (*c)->inject_data_packet (pkt); 640 inject_data_packet (pkt, dst);
601 }
602 } 641 }
603 642
604 delete pkt; 643 delete pkt;
605 }
606 else if (revents & (POLLHUP | POLLERR))
607 {
608 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
609 exit (1);
610 } 644 }
611 else 645 else
612 abort (); 646 abort ();
613} 647}
614 648
620 if (events & EVENT_SHUTDOWN) 654 if (events & EVENT_SHUTDOWN)
621 { 655 {
622 slog (L_INFO, _("preparing shutdown...")); 656 slog (L_INFO, _("preparing shutdown..."));
623 657
624 shutdown_all (); 658 shutdown_all ();
625
626 remove_pid (pidfilename); 659 remove_pid (conf.pidfilename);
627
628 slog (L_INFO, _("terminating")); 660 slog (L_INFO, _("terminating"));
629 661 exit (EXIT_SUCCESS);
630 exit (0);
631 } 662 }
632 663
633 if (events & EVENT_RECONNECT) 664 if (events & EVENT_RECONNECT)
634 { 665 {
635 slog (L_INFO, _("forced reconnect")); 666 slog (L_INFO, _("forced reconnect"));
637 reconnect_all (); 668 reconnect_all ();
638 } 669 }
639 670
640 events = 0; 671 events = 0;
641 } 672 }
642
643 w.at = TSTAMP_CANCEL;
644} 673}
645 674
646void 675void
647vpn::shutdown_all () 676vpn::shutdown_all ()
648{ 677{
661 connection_init (); 690 connection_init ();
662 691
663 for (configuration::node_vector::iterator i = conf.nodes.begin (); 692 for (configuration::node_vector::iterator i = conf.nodes.begin ();
664 i != conf.nodes.end (); ++i) 693 i != conf.nodes.end (); ++i)
665 { 694 {
666 connection *conn = new connection (this); 695 connection *conn = new connection (this, *i);
667
668 conn->conf = *i;
669 conns.push_back (conn); 696 conns.push_back (conn);
670
671 conn->establish_connection (); 697 conn->establish_connection ();
672 } 698 }
673} 699}
674 700
675connection *vpn::find_router () 701connection *vpn::find_router ()
738, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 764, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
739#endif 765#endif
740#if ENABLE_ICMP 766#if ENABLE_ICMP
741, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 767, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
742#endif 768#endif
769#if ENABLE_DNS
770, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
771#endif
743, tap_ev_watcher (this, &vpn::tap_ev) 772, tap_ev_watcher (this, &vpn::tap_ev)
744{ 773{
745} 774}
746 775
747vpn::~vpn () 776vpn::~vpn ()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines