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.14 by pcg, Tue Oct 14 03:22:09 2003 UTC

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

Diff Legend

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