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.5 by pcg, Sat Apr 5 02:32:40 2003 UTC vs.
Revision 1.15 by pcg, Tue Oct 14 15:48:15 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
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);
… …
185 241
186 return 0; 242 return 0;
187} 243}
188 244
189// send a vpn packet out to other hosts 245// send a vpn packet out to other hosts
190void 246bool
191vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 247vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
192{ 248{
193 switch (si.prot) 249 switch (si.prot)
194 { 250 {
195 case PROT_IPv4: 251 case PROT_IPv4:
196 send_ipv4_packet (pkt, si, tos); 252 return send_ipv4_packet (pkt, si, tos);
197 break;
198 253
199 case PROT_UDPv4: 254 case PROT_UDPv4:
200 send_udpv4_packet (pkt, si, tos); 255 return send_udpv4_packet (pkt, si, tos);
201 break;
202 256
203#if ENABLE_TCP 257#if ENABLE_TCP
204 case PROT_TCPv4: 258 case PROT_TCPv4:
205 send_tcpv4_packet (pkt, si, tos); 259 return send_tcpv4_packet (pkt, si, tos);
206 break; 260#endif
261
262#if ENABLE_ICMP
263 case PROT_ICMPv4:
264 return send_icmpv4_packet (pkt, si, tos);
207#endif 265#endif
208 266
209 default: 267 default:
210 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);
211 abort (); 269 return false;
212 } 270 }
213} 271}
214 272
215void 273bool
216vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 274vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
217{ 275{
276#if defined(SOL_IP) && defined(IP_TOS)
218 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 277 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
278#endif
219 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 ());
220}
221 280
222void 281 return true;
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
328
329bool
223vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 330vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
224{ 331{
332#if defined(SOL_IP) && defined(IP_TOS)
225 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 333 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
334#endif
226 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 ());
336
337 return true;
227} 338}
228 339
229void 340void
230vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 341vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
231{ 342{
… …
238 if (src == 0 || src > conns.size () 349 if (src == 0 || src > conns.size ()
239 || dst > conns.size () 350 || dst > conns.size ()
240 || pkt->typ () >= vpn_packet::PT_MAX) 351 || pkt->typ () >= vpn_packet::PT_MAX)
241 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), 352 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
242 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 353 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
354 else if (dst > conns.size ())
355 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
356 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
243 else 357 else
244 { 358 {
245 connection *c = conns[src - 1]; 359 connection *c = conns[src - 1];
246 360
247 if (dst == 0 && !THISNODE->routerprio) 361 if (dst == 0)
248 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), 362 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
249 c->conf->nodename, (const char *)rsi); 363 c->conf->nodename, (const char *)rsi);
250 else if (dst != 0 && dst != THISNODE->id) 364 else if (dst != 0 && dst != THISNODE->id)
251 // FORWARDING NEEDED ;) 365 {
366 if (THISNODE->routerprio)
367 // the tos setting gets lost here. who cares.
368 conns[dst - 1]->inject_vpn_packet (pkt);
369 else
252 slog (L_WARN, 370 slog (L_WARN,
253 _("received frame for node %d ('%s') from %s, but this is node %d ('%s')"), 371 _("%s(%s): forwarding request (=> %s), but we are no router"),
372 c->conf->nodename, (const char *)rsi,
254 dst, conns[dst - 1]->conf->nodename, 373 conns[dst - 1]->conf->nodename);
255 (const char *)rsi, 374 }
256 THISNODE->id, THISNODE->nodename);
257 else 375 else
258 c->recv_vpn_packet (pkt, rsi); 376 c->recv_vpn_packet (pkt, rsi);
259 } 377 }
260} 378}
261 379
262void 380void
263vpn::udpv4_ev (io_watcher &w, short revents) 381vpn::ipv4_ev (io_watcher &w, short revents)
264{ 382{
265 if (revents & (POLLIN | POLLERR)) 383 if (revents & (POLLIN | POLLERR))
266 { 384 {
267 vpn_packet *pkt = new vpn_packet; 385 vpn_packet *pkt = new vpn_packet;
268 struct sockaddr_in sa; 386 struct sockaddr_in sa;
269 socklen_t sa_len = sizeof (sa); 387 socklen_t sa_len = sizeof (sa);
270 int len; 388 int len;
271 389
272 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 390 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
273 391
274 sockinfo si(sa, PROT_UDPv4); 392 sockinfo si(sa, PROT_IPv4);
275 393
276 if (len > 0) 394 if (len > 0)
277 { 395 {
278 pkt->len = len; 396 pkt->len = len;
279 397
398 // raw sockets deliver the ipv4, but don't expect it on sends
399 // this is slow, but...
400 pkt->skip_hdr (IP_OVERHEAD);
401
280 recv_vpn_packet (pkt, si); 402 recv_vpn_packet (pkt, si);
281 } 403 }
282 else 404 else
283 { 405 {
284 // probably ECONNRESET or somesuch 406 // probably ECONNRESET or somesuch
285 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 407 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
286 } 408 }
287 409
288 delete pkt; 410 delete pkt;
289 } 411 }
290 else if (revents & POLLHUP) 412 else if (revents & POLLHUP)
291 { 413 {
292 // this cannot ;) happen on udp sockets 414 // this cannot ;) happen on udp sockets
293 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating.")); 415 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
294 exit (1); 416 exit (1);
295 } 417 }
296 else 418 else
297 { 419 {
298 slog (L_ERR, 420 slog (L_ERR,
… …
300 revents); 422 revents);
301 exit (1); 423 exit (1);
302 } 424 }
303} 425}
304 426
427#if ENABLE_ICMP
305void 428void
306vpn::ipv4_ev (io_watcher &w, short revents) 429vpn::icmpv4_ev (io_watcher &w, short revents)
307{ 430{
308 if (revents & (POLLIN | POLLERR)) 431 if (revents & (POLLIN | POLLERR))
309 { 432 {
310 vpn_packet *pkt = new vpn_packet; 433 vpn_packet *pkt = new vpn_packet;
311 struct sockaddr_in sa; 434 struct sockaddr_in sa;
312 socklen_t sa_len = sizeof (sa); 435 socklen_t sa_len = sizeof (sa);
313 int len; 436 int len;
314 437
315 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 438 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
316 439
317 sockinfo si(sa, PROT_IPv4); 440 sockinfo si(sa, PROT_ICMPv4);
318 441
319 if (len > 0) 442 if (len > 0)
320 { 443 {
321 pkt->len = len; 444 pkt->len = len;
322 445
446 icmp_header *hdr = (icmp_header *)&((*pkt)[IP_OVERHEAD]);
447
448 if (hdr->type == ::conf.icmp_type
449 && hdr->code == 255)
450 {
323 // raw sockets deliver the ipv4, but don't expect it on sends 451 // raw sockets deliver the ipv4, but don't expect it on sends
324 // this is slow, but... 452 // this is slow, but...
325 pkt->skip_hdr (IP_OVERHEAD); 453 pkt->skip_hdr (ICMP_OVERHEAD);
326 454
327 recv_vpn_packet (pkt, si); 455 recv_vpn_packet (pkt, si);
456 }
328 } 457 }
329 else 458 else
330 { 459 {
331 // probably ECONNRESET or somesuch 460 // probably ECONNRESET or somesuch
332 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 461 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
… …
335 delete pkt; 464 delete pkt;
336 } 465 }
337 else if (revents & POLLHUP) 466 else if (revents & POLLHUP)
338 { 467 {
339 // this cannot ;) happen on udp sockets 468 // this cannot ;) happen on udp sockets
340 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating.")); 469 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
341 exit (1); 470 exit (1);
342 } 471 }
343 else 472 else
344 { 473 {
345 slog (L_ERR, 474 slog (L_ERR,
346 _("FATAL: unknown revents %08x in socket, terminating\n"), 475 _("FATAL: unknown revents %08x in socket, terminating\n"),
347 revents); 476 revents);
348 exit (1); 477 exit (1);
349 } 478 }
350} 479}
480#endif
481
482void
483vpn::udpv4_ev (io_watcher &w, short revents)
484{
485 if (revents & (POLLIN | POLLERR))
486 {
487 vpn_packet *pkt = new vpn_packet;
488 struct sockaddr_in sa;
489 socklen_t sa_len = sizeof (sa);
490 int len;
491
492 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
493
494 sockinfo si(sa, PROT_UDPv4);
495
496 if (len > 0)
497 {
498 pkt->len = len;
499
500 recv_vpn_packet (pkt, si);
501 }
502 else
503 {
504 // probably ECONNRESET or somesuch
505 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
506 }
507
508 delete pkt;
509 }
510 else if (revents & POLLHUP)
511 {
512 // this cannot ;) happen on udp sockets
513 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
514 exit (1);
515 }
516 else
517 {
518 slog (L_ERR,
519 _("FATAL: unknown revents %08x in socket, terminating\n"),
520 revents);
521 exit (1);
522 }
523}
351 524
352void 525void
353vpn::tap_ev (io_watcher &w, short revents) 526vpn::tap_ev (io_watcher &w, short revents)
354{ 527{
355 if (revents & POLLIN) 528 if (revents & POLLIN)
… …
362 int dst = mac2id (pkt->dst); 535 int dst = mac2id (pkt->dst);
363 int src = mac2id (pkt->src); 536 int src = mac2id (pkt->src);
364 537
365 if (src != THISNODE->id) 538 if (src != THISNODE->id)
366 { 539 {
367 slog (L_ERR, _("FATAL: tap packet not originating on current node received, terminating.")); 540 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
368 exit (1); 541 exit (1);
369 } 542 }
370 543
371 if (dst == THISNODE->id) 544 if (dst == THISNODE->id)
372 { 545 {
373 slog (L_ERR, _("FATAL: tap packet destined for current node received, terminating.")); 546 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
374 exit (1); 547 exit (1);
375 } 548 }
376 549
377 if (dst > conns.size ()) 550 if (dst > conns.size ())
378 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst); 551 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
… …
384 if (dst != THISNODE->id) 557 if (dst != THISNODE->id)
385 conns[dst - 1]->inject_data_packet (pkt); 558 conns[dst - 1]->inject_data_packet (pkt);
386 } 559 }
387 else 560 else
388 { 561 {
389 // broadcast, first check router, then self, then english 562 // broadcast, this is ugly, but due to the security policy
390 connection *router = find_router (); 563 // we have to connect to all hosts...
391
392 if (router)
393 router->inject_data_packet (pkt, true);
394 else
395 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 564 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
396 if ((*c)->conf != THISNODE) 565 if ((*c)->conf != THISNODE)
397 (*c)->inject_data_packet (pkt); 566 (*c)->inject_data_packet (pkt);
398 } 567 }
399 } 568 }
400 569
401 delete pkt; 570 delete pkt;
402 } 571 }
… …
469 } 638 }
470} 639}
471 640
472connection *vpn::find_router () 641connection *vpn::find_router ()
473{ 642{
474 u32 prio = 0; 643 u32 prio = 1;
475 connection *router = 0; 644 connection *router = 0;
476 645
477 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 646 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
478 { 647 {
479 connection *c = *i; 648 connection *c = *i;
480 649
481 if (c->conf->routerprio > prio 650 if (c->conf->routerprio > prio
482 && c->connectmode == conf_node::C_ALWAYS 651 && c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use
483 && c->conf != THISNODE
484 && c->ictx && c->octx) 652 && c->ictx && c->octx
653 && c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode
485 { 654 {
486 prio = c->conf->routerprio; 655 prio = c->conf->routerprio;
487 router = c; 656 router = c;
488 } 657 }
489 } 658 }
490 659
491 return router; 660 return router;
492} 661}
493 662
494void vpn::connect_request (int id) 663void vpn::send_connect_request (int id)
495{ 664{
496 connection *c = find_router (); 665 connection *c = find_router ();
497 666
498 if (c) 667 if (c)
499 c->connect_request (id); 668 c->send_connect_request (id);
500 //else // does not work, because all others must connect to the same router 669 else
501 // // no router found, aggressively connect to all routers 670 // no router found, aggressively connect to all routers
502 // for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 671 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
503 // if ((*i)->conf->routerprio) 672 if ((*i)->conf->routerprio && (*i)->conf != THISNODE)
504 // (*i)->establish_connection (); 673 (*i)->establish_connection ();
505} 674}
506 675
507void 676void
508connection::dump_status () 677connection::dump_status ()
509{ 678{
… …
526 695
527 slog (L_NOTICE, _("END status dump")); 696 slog (L_NOTICE, _("END status dump"));
528} 697}
529 698
530vpn::vpn (void) 699vpn::vpn (void)
531: event(this, &vpn::event_cb) 700: event (this, &vpn::event_cb)
532, udpv4_ev_watcher(this, &vpn::udpv4_ev) 701, udpv4_ev_watcher (this, &vpn::udpv4_ev)
533, ipv4_ev_watcher (this, &vpn::ipv4_ev) 702, ipv4_ev_watcher (this, &vpn::ipv4_ev)
534, tap_ev_watcher (this, &vpn::tap_ev)
535#if ENABLE_TCP 703#if ENABLE_TCP
536, tcpv4_ev_watcher(this, &vpn::tcpv4_ev) 704, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
537#endif 705#endif
706#if ENABLE_ICMP
707, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
708#endif
709, tap_ev_watcher (this, &vpn::tap_ev)
538{ 710{
539} 711}
540 712
541vpn::~vpn () 713vpn::~vpn ()
542{ 714{

Diff Legend

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