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

Diff Legend

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