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.8 by pcg, Mon Apr 7 01:28:56 2003 UTC vs.
Revision 1.21 by pcg, Thu Oct 16 21:57:54 2003 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 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.
… …
24#include <cstring> 25#include <cstring>
25#include <cstdio> 26#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 <netinet/in.h>
32#include <arpa/inet.h>
33#include <errno.h> 31#include <errno.h>
34#include <time.h> 32#include <time.h>
35#include <unistd.h> 33#include <unistd.h>
34#include <fcntl.h>
35#include <sys/socket.h>
36
37#include "netcompat.h"
36 38
37#include "pidfile.h" 39#include "pidfile.h"
38 40
39#include "connection.h" 41#include "connection.h"
40#include "util.h" 42#include "util.h"
41#include "vpn.h" 43#include "vpn.h"
44
45vpn network; // THE vpn (bad design...)
42 46
43///////////////////////////////////////////////////////////////////////////// 47/////////////////////////////////////////////////////////////////////////////
44 48
45const char *vpn::script_if_up () 49const char *vpn::script_if_up ()
46{ 50{
… …
50 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 54 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
51 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 55 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
52 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 56 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
53 57
54 char *env; 58 char *env;
55 asprintf (&env, "CONFBASE=%s", confbase); 59 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
56 putenv (env);
57 asprintf (&env, "NODENAME=%s", THISNODE->nodename); 60 asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
58 putenv (env);
59 asprintf (&env, "NODEID=%d", THISNODE->id); 61 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
60 putenv (env);
61 asprintf (&env, "IFNAME=%s", tap->interface ()); 62 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
62 putenv (env); 63 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
64 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
63 asprintf (&env, "MTU=%d", mtu); 65 asprintf (&env, "MTU=%d", mtu); putenv (env);
64 putenv (env);
65 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 66 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",
66 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8, 67 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
67 THISNODE->id & 0xff); 68 THISNODE->id & 0xff);
68 putenv (env); 69 putenv (env);
69 70
… …
80 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 81 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
81 82
82 if (ipv4_fd < 0) 83 if (ipv4_fd < 0)
83 return -1; 84 return -1;
84 85
85 sockinfo si (THISNODE, PROT_IPv4); 86 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
86 87
87 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 88#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
88 {
89 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
90 exit (1);
91 }
92
93#ifdef IP_MTU_DISCOVER
94 // this I really consider a linux bug. I am neither connected 89 // this I really consider a linux bug. I am neither connected
95 // 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
96 // fragment for me sometimes. 91 // fragment for me sometimes.
97 { 92 {
98 int oval = IP_PMTUDISC_DONT; 93 int oval = IP_PMTUDISC_DONT;
99 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 94 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
100 } 95 }
101#endif 96#endif
102 97
98 sockinfo si (THISNODE, PROT_IPv4);
99
100 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
101 {
102 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
103 exit (1);
104 }
105
103 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 106 ipv4_ev_watcher.start (ipv4_fd, POLLIN);
104 } 107 }
105 108
106 udpv4_fd = -1; 109 udpv4_fd = -1;
107 110
… …
109 { 112 {
110 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 113 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
111 114
112 if (udpv4_fd < 0) 115 if (udpv4_fd < 0)
113 return -1; 116 return -1;
117
118 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
114 119
115 // standard daemon practise... 120 // standard daemon practise...
116 { 121 {
117 int oval = 1; 122 int oval = 1;
118 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 123 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
119 } 124 }
120 125
121 sockinfo si (THISNODE, PROT_UDPv4); 126#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
122
123 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
124 {
125 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
126 exit (1);
127 }
128
129#ifdef IP_MTU_DISCOVER
130 // this I really consider a linux bug. I am neither connected 127 // this I really consider a linux bug. I am neither connected
131 // 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
132 // fragment for me sometimes. 129 // fragment for me sometimes.
133 { 130 {
134 int oval = IP_PMTUDISC_DONT; 131 int oval = IP_PMTUDISC_DONT;
135 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 132 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
136 } 133 }
137#endif 134#endif
138 135
136 sockinfo si (THISNODE, PROT_UDPv4);
137
138 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
139 {
140 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
141 exit (1);
142 }
143
139 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 144 udpv4_ev_watcher.start (udpv4_fd, POLLIN);
140 } 145 }
146
147 icmpv4_fd = -1;
148
149#if ENABLE_ICMP
150 if (THISNODE->protocols & PROT_ICMPv4)
151 {
152 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
153
154 if (icmpv4_fd < 0)
155 return -1;
156
157 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
158
159#ifdef ICMP_FILTER
160 {
161 icmp_filter oval;
162 oval.data = 0xffffffff;
163 if (::conf.icmp_type < 32)
164 oval.data &= ~(1 << ::conf.icmp_type);
165
166 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
167 }
168#endif
169
170#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
171 // this I really consider a linux bug. I am neither connected
172 // nor do I fragment myself. Linux still sets DF and doesn't
173 // fragment for me sometimes.
174 {
175 int oval = IP_PMTUDISC_DONT;
176 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
177 }
178#endif
179
180 sockinfo si (THISNODE, PROT_ICMPv4);
181
182 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
183 {
184 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
185 exit (1);
186 }
187
188 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);
189 }
190#endif
141 191
142 tcpv4_fd = -1; 192 tcpv4_fd = -1;
143 193
144#if ENABLE_TCP 194#if ENABLE_TCP
145 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port) 195 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
146 { 196 {
147 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 197 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
148 198
149 if (tcpv4_fd < 0) 199 if (tcpv4_fd < 0)
150 return -1; 200 return -1;
201
202 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
151 203
152 // standard daemon practise... 204 // standard daemon practise...
153 { 205 {
154 int oval = 1; 206 int oval = 1;
155 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 207 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
204#if ENABLE_TCP 256#if ENABLE_TCP
205 case PROT_TCPv4: 257 case PROT_TCPv4:
206 return send_tcpv4_packet (pkt, si, tos); 258 return send_tcpv4_packet (pkt, si, tos);
207#endif 259#endif
208 260
261#if ENABLE_ICMP
262 case PROT_ICMPv4:
263 return send_icmpv4_packet (pkt, si, tos);
264#endif
265
209 default: 266 default:
210 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si); 267 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
211 return false; 268 return false;
212 } 269 }
213} 270}
214 271
215bool 272bool
216vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 273vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
217{ 274{
275#if defined(SOL_IP) && defined(IP_TOS)
218 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 276 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
277#endif
219 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 278 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
220 279
221 return true; 280 return true;
222} 281}
282
283static u16
284ipv4_checksum (u16 *data, unsigned int len)
285{
286 // use 32 bit accumulator and fold back carry bits at the end
287 u32 sum = 0;
288
289 while (len > 1)
290 {
291 sum += *data++;
292 len -= 2;
293 }
294
295 // odd byte left?
296 if (len)
297 sum += *(u8 *)data;
298
299 // add back carry bits
300 sum = (sum >> 16) + (sum & 0xffff); // lo += hi
301 sum += (sum >> 16); // carry
302
303 return ~sum;
304}
305
306#if ENABLE_ICMP
307bool
308vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
309{
310#if defined(SOL_IP) && defined(IP_TOS)
311 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
312#endif
313
314 pkt->unshift_hdr (4);
315
316 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
317 hdr->type = ::conf.icmp_type;
318 hdr->code = 255;
319 hdr->checksum = 0;
320 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
321
322 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
323
324 return true;
325}
326#endif
223 327
224bool 328bool
225vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 329vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
226{ 330{
331#if defined(SOL_IP) && defined(IP_TOS)
227 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 332 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
333#endif
228 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 334 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
229 335
230 return true; 336 return true;
337}
338
339void
340vpn::inject_data_packet (tap_packet *pkt, int dst)
341{
342 if (dst)
343 {
344 // unicast
345 if (dst != THISNODE->id)
346 conns[dst - 1]->inject_data_packet (pkt);
347 }
348 else
349 {
350 // broadcast, this is ugly, but due to the security policy
351 // we have to connect to all hosts...
352 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
353 if ((*c)->conf != THISNODE)
354 (*c)->inject_data_packet (pkt, true);
355 }
231} 356}
232 357
233void 358void
234vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 359vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
235{ 360{
… …
249 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 374 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
250 else 375 else
251 { 376 {
252 connection *c = conns[src - 1]; 377 connection *c = conns[src - 1];
253 378
254 if (dst == 0 && !THISNODE->routerprio) 379 if (dst == 0)
255 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), 380 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
256 c->conf->nodename, (const char *)rsi); 381 c->conf->nodename, (const char *)rsi);
257 else if (dst != 0 && dst != THISNODE->id) 382 else if (dst != THISNODE->id)
258 { 383 {
259 if (THISNODE->routerprio) 384 if (THISNODE->routerprio)
260 // the tos setting gets lost here. who cares. 385 // the tos setting gets lost here. who cares.
261 conns[dst - 1]->inject_vpn_packet (pkt); 386 conns[dst - 1]->inject_vpn_packet (pkt);
262 else 387 else
… …
269 c->recv_vpn_packet (pkt, rsi); 394 c->recv_vpn_packet (pkt, rsi);
270 } 395 }
271} 396}
272 397
273void 398void
274vpn::udpv4_ev (io_watcher &w, short revents) 399vpn::ipv4_ev (io_watcher &w, short revents)
275{ 400{
276 if (revents & (POLLIN | POLLERR)) 401 if (revents & (POLLIN | POLLERR))
277 { 402 {
278 vpn_packet *pkt = new vpn_packet; 403 vpn_packet *pkt = new vpn_packet;
279 struct sockaddr_in sa; 404 struct sockaddr_in sa;
280 socklen_t sa_len = sizeof (sa); 405 socklen_t sa_len = sizeof (sa);
281 int len; 406 int len;
282 407
283 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 408 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
284 409
285 sockinfo si(sa, PROT_UDPv4); 410 sockinfo si(sa, PROT_IPv4);
286 411
287 if (len > 0) 412 if (len > 0)
288 { 413 {
289 pkt->len = len; 414 pkt->len = len;
290 415
416 // raw sockets deliver the ipv4, but don't expect it on sends
417 // this is slow, but...
418 pkt->skip_hdr (IP_OVERHEAD);
419
291 recv_vpn_packet (pkt, si); 420 recv_vpn_packet (pkt, si);
292 } 421 }
293 else 422 else
294 { 423 {
295 // probably ECONNRESET or somesuch 424 // probably ECONNRESET or somesuch
296 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 425 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
297 } 426 }
298 427
299 delete pkt; 428 delete pkt;
300 } 429 }
301 else if (revents & POLLHUP) 430 else if (revents & POLLHUP)
302 { 431 {
303 // this cannot ;) happen on udp sockets 432 // this cannot ;) happen on udp sockets
304 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating.")); 433 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
305 exit (1); 434 exit (1);
306 } 435 }
307 else 436 else
308 { 437 {
309 slog (L_ERR, 438 slog (L_ERR,
… …
311 revents); 440 revents);
312 exit (1); 441 exit (1);
313 } 442 }
314} 443}
315 444
445#if ENABLE_ICMP
316void 446void
317vpn::ipv4_ev (io_watcher &w, short revents) 447vpn::icmpv4_ev (io_watcher &w, short revents)
318{ 448{
319 if (revents & (POLLIN | POLLERR)) 449 if (revents & (POLLIN | POLLERR))
320 { 450 {
321 vpn_packet *pkt = new vpn_packet; 451 vpn_packet *pkt = new vpn_packet;
322 struct sockaddr_in sa; 452 struct sockaddr_in sa;
323 socklen_t sa_len = sizeof (sa); 453 socklen_t sa_len = sizeof (sa);
324 int len; 454 int len;
325 455
326 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 456 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
327 457
328 sockinfo si(sa, PROT_IPv4); 458 sockinfo si(sa, PROT_ICMPv4);
329 459
330 if (len > 0) 460 if (len > 0)
331 { 461 {
332 pkt->len = len; 462 pkt->len = len;
333 463
464 icmp_header *hdr = (icmp_header *)&((*pkt)[IP_OVERHEAD]);
465
466 if (hdr->type == ::conf.icmp_type
467 && hdr->code == 255)
468 {
334 // raw sockets deliver the ipv4, but don't expect it on sends 469 // raw sockets deliver the ipv4, but don't expect it on sends
335 // this is slow, but... 470 // this is slow, but...
336 pkt->skip_hdr (IP_OVERHEAD); 471 pkt->skip_hdr (ICMP_OVERHEAD);
337 472
338 recv_vpn_packet (pkt, si); 473 recv_vpn_packet (pkt, si);
474 }
339 } 475 }
340 else 476 else
341 { 477 {
342 // probably ECONNRESET or somesuch 478 // probably ECONNRESET or somesuch
343 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 479 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
… …
346 delete pkt; 482 delete pkt;
347 } 483 }
348 else if (revents & POLLHUP) 484 else if (revents & POLLHUP)
349 { 485 {
350 // this cannot ;) happen on udp sockets 486 // this cannot ;) happen on udp sockets
351 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating.")); 487 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
352 exit (1); 488 exit (1);
353 } 489 }
354 else 490 else
355 { 491 {
356 slog (L_ERR, 492 slog (L_ERR,
357 _("FATAL: unknown revents %08x in socket, terminating\n"), 493 _("FATAL: unknown revents %08x in socket, terminating\n"),
358 revents); 494 revents);
359 exit (1); 495 exit (1);
360 } 496 }
361} 497}
498#endif
499
500void
501vpn::udpv4_ev (io_watcher &w, short revents)
502{
503 if (revents & (POLLIN | POLLERR))
504 {
505 vpn_packet *pkt = new vpn_packet;
506 struct sockaddr_in sa;
507 socklen_t sa_len = sizeof (sa);
508 int len;
509
510 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
511
512 sockinfo si(sa, PROT_UDPv4);
513
514 if (len > 0)
515 {
516 pkt->len = len;
517
518 recv_vpn_packet (pkt, si);
519 }
520 else
521 {
522 // probably ECONNRESET or somesuch
523 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
524 }
525
526 delete pkt;
527 }
528 else if (revents & POLLHUP)
529 {
530 // this cannot ;) happen on udp sockets
531 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
532 exit (1);
533 }
534 else
535 {
536 slog (L_ERR,
537 _("FATAL: unknown revents %08x in socket, terminating\n"),
538 revents);
539 exit (1);
540 }
541}
362 542
363void 543void
364vpn::tap_ev (io_watcher &w, short revents) 544vpn::tap_ev (io_watcher &w, short revents)
365{ 545{
366 if (revents & POLLIN) 546 if (revents & POLLIN)
… …
368 /* process data */ 548 /* process data */
369 tap_packet *pkt; 549 tap_packet *pkt;
370 550
371 pkt = tap->recv (); 551 pkt = tap->recv ();
372 552
553 if (!pkt)
554 return;
555
556 if (pkt->len > 14)
557 {
373 int dst = mac2id (pkt->dst); 558 int dst = mac2id (pkt->dst);
374 int src = mac2id (pkt->src); 559 int src = mac2id (pkt->src);
375 560
376 if (src != THISNODE->id) 561 if (src != THISNODE->id)
377 {
378 slog (L_ERR, _("FATAL: tap packet not originating on current node received, terminating."));
379 exit (1);
380 }
381
382 if (dst == THISNODE->id)
383 {
384 slog (L_ERR, _("FATAL: tap packet destined for current node received, terminating."));
385 exit (1);
386 }
387
388 if (dst > conns.size ())
389 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
390 else
391 {
392 if (dst)
393 { 562 {
394 // unicast 563 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
395 if (dst != THISNODE->id) 564 exit (1);
396 conns[dst - 1]->inject_data_packet (pkt);
397 } 565 }
566
567 if (dst == THISNODE->id)
568 {
569 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
570 exit (1);
571 }
572
573 if (dst > conns.size ())
574 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
398 else 575 else
399 {
400 // broadcast, first check router, then self, then english
401 connection *router = find_router ();
402
403 if (router)
404 router->inject_data_packet (pkt, true); 576 inject_data_packet (pkt, dst);
405 else
406 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
407 if ((*c)->conf != THISNODE)
408 (*c)->inject_data_packet (pkt);
409 }
410 } 577 }
411 578
412 delete pkt; 579 delete pkt;
413 } 580 }
414 else if (revents & (POLLHUP | POLLERR)) 581 else if (revents & (POLLHUP | POLLERR))
… …
480 } 647 }
481} 648}
482 649
483connection *vpn::find_router () 650connection *vpn::find_router ()
484{ 651{
485 u32 prio = 0; 652 u32 prio = 1;
486 connection *router = 0; 653 connection *router = 0;
487 654
488 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 655 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
489 { 656 {
490 connection *c = *i; 657 connection *c = *i;
491 658
492 if (c->conf->routerprio > prio 659 if (c->conf->routerprio > prio
493 && c->connectmode == conf_node::C_ALWAYS 660 && c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use
494 && c->conf != THISNODE
495 && c->ictx && c->octx) 661 && c->ictx && c->octx
662 && c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode
496 { 663 {
497 prio = c->conf->routerprio; 664 prio = c->conf->routerprio;
498 router = c; 665 router = c;
499 } 666 }
500 } 667 }
… …
509 if (c) 676 if (c)
510 c->send_connect_request (id); 677 c->send_connect_request (id);
511 else 678 else
512 // no router found, aggressively connect to all routers 679 // no router found, aggressively connect to all routers
513 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 680 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
514 if ((*i)->conf->routerprio) 681 if ((*i)->conf->routerprio && (*i)->conf != THISNODE)
515 (*i)->establish_connection (); 682 (*i)->establish_connection ();
516} 683}
517 684
518void 685void
519connection::dump_status () 686connection::dump_status ()
… …
537 704
538 slog (L_NOTICE, _("END status dump")); 705 slog (L_NOTICE, _("END status dump"));
539} 706}
540 707
541vpn::vpn (void) 708vpn::vpn (void)
542: event(this, &vpn::event_cb) 709: event (this, &vpn::event_cb)
543, udpv4_ev_watcher(this, &vpn::udpv4_ev) 710, udpv4_ev_watcher (this, &vpn::udpv4_ev)
544, ipv4_ev_watcher (this, &vpn::ipv4_ev) 711, ipv4_ev_watcher (this, &vpn::ipv4_ev)
545, tap_ev_watcher (this, &vpn::tap_ev)
546#if ENABLE_TCP 712#if ENABLE_TCP
547, tcpv4_ev_watcher(this, &vpn::tcpv4_ev) 713, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
548#endif 714#endif
715#if ENABLE_ICMP
716, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
717#endif
718, tap_ev_watcher (this, &vpn::tap_ev)
549{ 719{
550} 720}
551 721
552vpn::~vpn () 722vpn::~vpn ()
553{ 723{

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines