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.33 by pcg, Wed Mar 23 21:55:39 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); 63 asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
77 putenv (env);
78 asprintf (&env, "NODEID=%d", THISNODE->id); 64 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
79 putenv (env);
80 asprintf (&env, "IFNAME=%s", tap->interface ()); 65 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
81 putenv (env); 66 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
67 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
82 asprintf (&env, "MTU=%d", mtu); 68 asprintf (&env, "MTU=%d", mtu); putenv (env);
83 putenv (env);
84 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 69 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",
85 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8, 70 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
86 THISNODE->id & 0xff); 71 THISNODE->id & 0xff); putenv (env);
87 putenv (env);
88 72
73 // TODO: info for other nodes, maybe?
74}
75
76const char *vpn::script_if_init ()
77{
78 script_init_env ();
79
80 return tap->if_up ();
81}
82
83const char *vpn::script_if_up ()
84{
85 script_init_env ();
86
87 char *filename;
88 asprintf (&filename,
89 "%s/%s",
90 confbase,
89 return ::conf.script_if_up ? ::conf.script_if_up : "if-up"; 91 ::conf.script_if_up ? ::conf.script_if_up : "if-up");
92
93 return filename;
90} 94}
91 95
92int 96int
93vpn::setup () 97vpn::setup ()
94{ 98{
116 sockinfo si (THISNODE, PROT_IPv4); 120 sockinfo si (THISNODE, PROT_IPv4);
117 121
118 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 122 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
119 { 123 {
120 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 124 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
121 exit (1); 125 exit (EXIT_FAILURE);
122 } 126 }
123 127
124 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 128 ipv4_ev_watcher.start (ipv4_fd, EVENT_READ);
125 } 129 }
126 130
127 udpv4_fd = -1; 131 udpv4_fd = -1;
128 132
129 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 133 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
154 sockinfo si (THISNODE, PROT_UDPv4); 158 sockinfo si (THISNODE, PROT_UDPv4);
155 159
156 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 160 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
157 { 161 {
158 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 162 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
159 exit (1); 163 exit (EXIT_FAILURE);
160 } 164 }
161 165
162 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 166 udpv4_ev_watcher.start (udpv4_fd, EVENT_READ);
163 } 167 }
164 168
165 icmpv4_fd = -1; 169 icmpv4_fd = -1;
166 170
167#if ENABLE_ICMP 171#if ENABLE_ICMP
198 sockinfo si (THISNODE, PROT_ICMPv4); 202 sockinfo si (THISNODE, PROT_ICMPv4);
199 203
200 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 204 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
201 { 205 {
202 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); 206 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
203 exit (1); 207 exit (EXIT_FAILURE);
204 } 208 }
205 209
206 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); 210 icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ);
207 } 211 }
208#endif 212#endif
209 213
210 tcpv4_fd = -1; 214 tcpv4_fd = -1;
211 215
228 sockinfo si (THISNODE, PROT_TCPv4); 232 sockinfo si (THISNODE, PROT_TCPv4);
229 233
230 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 234 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
231 { 235 {
232 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 236 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
233 exit (1); 237 exit (EXIT_FAILURE);
234 } 238 }
235 239
236 if (listen (tcpv4_fd, 5)) 240 if (listen (tcpv4_fd, 5))
237 { 241 {
238 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 242 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
239 exit (1); 243 exit (EXIT_FAILURE);
244 }
245
246 tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ);
247 }
248#endif
249
250#if ENABLE_DNS
251 if (THISNODE->protocols & PROT_DNSv4)
252 {
253 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
254
255 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
256
257 if (dnsv4_fd < 0)
258 return -1;
259
260#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
261 // this I really consider a linux bug. I am neither connected
262 // nor do I fragment myself. Linux still sets DF and doesn't
263 // fragment for me sometimes.
264 {
265 int oval = IP_PMTUDISC_DONT;
266 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
267 }
268#endif
269
270 // standard daemon practise...
271 {
272 int oval = 1;
273 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
274 }
275
276 sockinfo si (THISNODE->dns_hostname,
277 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
278 PROT_DNSv4);
279
280 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
240 } 281 {
282 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
283 exit (EXIT_FAILURE);
284 }
241 285
242 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN); 286 dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ);
243 } 287 }
244#endif 288#endif
245 289
246 tap = new tap_device (); 290 tap = new tap_device ();
247 if (!tap) //D this, of course, never catches 291 if (!tap) //D this, of course, never catches
248 { 292 {
249 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 293 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
250 exit (1); 294 exit (EXIT_FAILURE);
251 } 295 }
252 296
297 if (tap->if_up () &&
298 !run_script (run_script_cb (this, &vpn::script_if_init), true))
299 {
300 slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
301 tap->if_up ());
302 exit (EXIT_FAILURE);
303 }
304
253 run_script (run_script_cb (this, &vpn::script_if_up), true); 305 if (!run_script (run_script_cb (this, &vpn::script_if_up), true))
306 {
307 slog (L_ERR, _("if-up command execution failed, exiting."));
308 exit (EXIT_FAILURE);
309 }
254 310
255 tap_ev_watcher.start (tap->fd, POLLIN); 311 tap_ev_watcher.start (tap->fd, EVENT_READ);
256 312
257 reconnect_all (); 313 reconnect_all ();
258 314
259 return 0; 315 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} 316}
289 317
290bool 318bool
291vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 319vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
292{ 320{
320 348
321 return ~sum; 349 return ~sum;
322} 350}
323 351
324#if ENABLE_ICMP 352#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 353bool
343vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 354vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
344{ 355{
345#if defined(SOL_IP) && defined(IP_TOS) 356#if defined(SOL_IP) && defined(IP_TOS)
346 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 357 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
367 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 378 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
368#endif 379#endif
369 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 380 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
370 381
371 return true; 382 return true;
383}
384
385void
386vpn::inject_data_packet (tap_packet *pkt, int dst)
387{
388 if (dst)
389 {
390 // unicast
391 if (dst != THISNODE->id)
392 conns[dst - 1]->inject_data_packet (pkt);
393 }
394 else
395 {
396 // broadcast, this is ugly, but due to the security policy
397 // we have to connect to all hosts...
398 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
399 if ((*c)->conf != THISNODE)
400 (*c)->inject_data_packet (pkt, true);
401 }
372} 402}
373 403
374void 404void
375vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 405vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
376{ 406{
393 connection *c = conns[src - 1]; 423 connection *c = conns[src - 1];
394 424
395 if (dst == 0) 425 if (dst == 0)
396 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"), 426 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
397 c->conf->nodename, (const char *)rsi); 427 c->conf->nodename, (const char *)rsi);
398 else if (dst != 0 && dst != THISNODE->id) 428 else if (dst != THISNODE->id)
399 { 429 {
400 if (THISNODE->routerprio) 430 if (THISNODE->routerprio)
401 // the tos setting gets lost here. who cares. 431 // the tos setting gets lost here. who cares.
402 conns[dst - 1]->inject_vpn_packet (pkt); 432 conns[dst - 1]->inject_vpn_packet (pkt);
403 else 433 else
409 else 439 else
410 c->recv_vpn_packet (pkt, rsi); 440 c->recv_vpn_packet (pkt, rsi);
411 } 441 }
412} 442}
413 443
444bool
445vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
446{
447 switch (si.prot)
448 {
449 case PROT_IPv4:
450 return send_ipv4_packet (pkt, si, tos);
451 case PROT_UDPv4:
452 return send_udpv4_packet (pkt, si, tos);
453#if ENABLE_TCP
454 case PROT_TCPv4:
455 return send_tcpv4_packet (pkt, si, tos);
456#endif
457#if ENABLE_ICMP
458 case PROT_ICMPv4:
459 return send_icmpv4_packet (pkt, si, tos);
460#endif
461#if ENABLE_DNS
462 case PROT_DNSv4:
463 return send_dnsv4_packet (pkt, si, tos);
464#endif
465
466 default:
467 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
468 }
469
470 return false;
471}
472
414void 473void
415vpn::ipv4_ev (io_watcher &w, short revents) 474vpn::ipv4_ev (io_watcher &w, short revents)
416{ 475{
417 if (revents & (POLLIN | POLLERR)) 476 if (revents & EVENT_READ)
418 { 477 {
419 vpn_packet *pkt = new vpn_packet; 478 vpn_packet *pkt = new vpn_packet;
420 struct sockaddr_in sa; 479 struct sockaddr_in sa;
421 socklen_t sa_len = sizeof (sa); 480 socklen_t sa_len = sizeof (sa);
422 int len; 481 int len;
427 486
428 if (len > 0) 487 if (len > 0)
429 { 488 {
430 pkt->len = len; 489 pkt->len = len;
431 490
432 // raw sockets deliver the ipv4, but don't expect it on sends 491 // raw sockets deliver the ipv4 header, but don't expect it on sends
433 // this is slow, but...
434 pkt->skip_hdr (IP_OVERHEAD); 492 pkt->skip_hdr (IP_OVERHEAD);
435 493
436 recv_vpn_packet (pkt, si); 494 recv_vpn_packet (pkt, si);
437 } 495 }
438 else 496 else
441 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 499 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
442 } 500 }
443 501
444 delete pkt; 502 delete pkt;
445 } 503 }
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 504 else
453 { 505 {
454 slog (L_ERR, 506 slog (L_ERR,
455 _("FATAL: unknown revents %08x in socket, terminating\n"), 507 _("FATAL: unknown revents %08x in socket, terminating\n"),
456 revents); 508 revents);
457 exit (1); 509 exit (EXIT_FAILURE);
458 } 510 }
459} 511}
460 512
461#if ENABLE_ICMP 513#if ENABLE_ICMP
462void 514void
463vpn::icmpv4_ev (io_watcher &w, short revents) 515vpn::icmpv4_ev (io_watcher &w, short revents)
464{ 516{
465 if (revents & (POLLIN | POLLERR)) 517 if (revents & EVENT_READ)
466 { 518 {
467 vpn_packet *pkt = new vpn_packet; 519 vpn_packet *pkt = new vpn_packet;
468 struct sockaddr_in sa; 520 struct sockaddr_in sa;
469 socklen_t sa_len = sizeof (sa); 521 socklen_t sa_len = sizeof (sa);
470 int len; 522 int len;
495 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 547 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
496 } 548 }
497 549
498 delete pkt; 550 delete pkt;
499 } 551 }
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 552 else
507 { 553 {
508 slog (L_ERR, 554 slog (L_ERR,
509 _("FATAL: unknown revents %08x in socket, terminating\n"), 555 _("FATAL: unknown revents %08x in socket, terminating\n"),
510 revents); 556 revents);
511 exit (1); 557 exit (EXIT_FAILURE);
512 } 558 }
513} 559}
514#endif 560#endif
515 561
516void 562void
517vpn::udpv4_ev (io_watcher &w, short revents) 563vpn::udpv4_ev (io_watcher &w, short revents)
518{ 564{
519 if (revents & (POLLIN | POLLERR)) 565 if (revents & EVENT_READ)
520 { 566 {
521 vpn_packet *pkt = new vpn_packet; 567 vpn_packet *pkt = new vpn_packet;
522 struct sockaddr_in sa; 568 struct sockaddr_in sa;
523 socklen_t sa_len = sizeof (sa); 569 socklen_t sa_len = sizeof (sa);
524 int len; 570 int len;
539 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 585 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
540 } 586 }
541 587
542 delete pkt; 588 delete pkt;
543 } 589 }
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 590 else
551 { 591 {
552 slog (L_ERR, 592 slog (L_ERR,
553 _("FATAL: unknown revents %08x in socket, terminating\n"), 593 _("FATAL: unknown revents %08x in socket, terminating\n"),
554 revents); 594 revents);
555 exit (1); 595 exit (EXIT_FAILURE);
556 } 596 }
557} 597}
558 598
559void 599void
560vpn::tap_ev (io_watcher &w, short revents) 600vpn::tap_ev (io_watcher &w, short revents)
561{ 601{
562 if (revents & POLLIN) 602 if (revents & EVENT_READ)
563 { 603 {
564 /* process data */ 604 /* process data */
565 tap_packet *pkt; 605 tap_packet *pkt;
566 606
567 pkt = tap->recv (); 607 pkt = tap->recv ();
568 608
609 if (!pkt)
610 return;
611
612 if (pkt->len > 14)
613 {
569 int dst = mac2id (pkt->dst); 614 int dst = mac2id (pkt->dst);
570 int src = mac2id (pkt->src); 615 int src = mac2id (pkt->src);
571 616
572 if (src != THISNODE->id) 617 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 { 618 {
590 // unicast 619 slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
591 if (dst != THISNODE->id) 620 exit (EXIT_FAILURE);
592 conns[dst - 1]->inject_data_packet (pkt);
593 } 621 }
622
623 if (dst == THISNODE->id)
624 {
625 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
626 exit (EXIT_FAILURE);
627 }
628
629 if (dst > conns.size ())
630 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
594 else 631 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); 632 inject_data_packet (pkt, dst);
601 }
602 } 633 }
603 634
604 delete pkt; 635 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 } 636 }
611 else 637 else
612 abort (); 638 abort ();
613} 639}
614 640
620 if (events & EVENT_SHUTDOWN) 646 if (events & EVENT_SHUTDOWN)
621 { 647 {
622 slog (L_INFO, _("preparing shutdown...")); 648 slog (L_INFO, _("preparing shutdown..."));
623 649
624 shutdown_all (); 650 shutdown_all ();
625
626 remove_pid (pidfilename); 651 remove_pid (conf.pidfilename);
627
628 slog (L_INFO, _("terminating")); 652 slog (L_INFO, _("terminating"));
629 653 exit (EXIT_SUCCESS);
630 exit (0);
631 } 654 }
632 655
633 if (events & EVENT_RECONNECT) 656 if (events & EVENT_RECONNECT)
634 { 657 {
635 slog (L_INFO, _("forced reconnect")); 658 slog (L_INFO, _("forced reconnect"));
637 reconnect_all (); 660 reconnect_all ();
638 } 661 }
639 662
640 events = 0; 663 events = 0;
641 } 664 }
642
643 w.at = TSTAMP_CANCEL;
644} 665}
645 666
646void 667void
647vpn::shutdown_all () 668vpn::shutdown_all ()
648{ 669{
661 connection_init (); 682 connection_init ();
662 683
663 for (configuration::node_vector::iterator i = conf.nodes.begin (); 684 for (configuration::node_vector::iterator i = conf.nodes.begin ();
664 i != conf.nodes.end (); ++i) 685 i != conf.nodes.end (); ++i)
665 { 686 {
666 connection *conn = new connection (this); 687 connection *conn = new connection (this, *i);
667
668 conn->conf = *i;
669 conns.push_back (conn); 688 conns.push_back (conn);
670
671 conn->establish_connection (); 689 conn->establish_connection ();
672 } 690 }
673} 691}
674 692
675connection *vpn::find_router () 693connection *vpn::find_router ()
738, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 756, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
739#endif 757#endif
740#if ENABLE_ICMP 758#if ENABLE_ICMP
741, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 759, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
742#endif 760#endif
761#if ENABLE_DNS
762, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
763#endif
743, tap_ev_watcher (this, &vpn::tap_ev) 764, tap_ev_watcher (this, &vpn::tap_ev)
744{ 765{
745} 766}
746 767
747vpn::~vpn () 768vpn::~vpn ()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines