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.6 by pcg, Sun Apr 6 04:17:36 2003 UTC vs.
Revision 1.17 by pcg, Wed Oct 15 06:06:41 2003 UTC

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

Diff Legend

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