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

Diff Legend

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