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.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"
41#include "vpn.h" 43#include "vpn.h"
42 44
43///////////////////////////////////////////////////////////////////////////// 45/////////////////////////////////////////////////////////////////////////////
44 46
45const char *vpn::script_if_up (int) 47const char *vpn::script_if_up ()
46{ 48{
47 // the tunnel device mtu should be the physical mtu - overhead 49 // the tunnel device mtu should be the physical mtu - overhead
48 // the tricky part is rounding to the cipher key blocksize 50 // the tricky part is rounding to the cipher key blocksize
49 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD; 51 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
50 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 52 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
… …
71} 73}
72 74
73int 75int
74vpn::setup () 76vpn::setup ()
75{ 77{
76 sockinfo si; 78 ipv4_fd = -1;
77 79
78 si.set (THISNODE); 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 }
79 109
80 udpv4_fd = -1; 110 udpv4_fd = -1;
81 111
82 if (THISNODE->protocols & PROT_UDPv4) 112 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
83 { 113 {
84 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 114 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
85 115
86 if (udpv4_fd < 0) 116 if (udpv4_fd < 0)
87 return -1; 117 return -1;
88 118
89 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 119 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
120
121 // standard daemon practise...
90 { 122 {
91 slog (L_ERR, _("can't bind udpv4 to %s: %s"), (const char *)si, strerror (errno)); 123 int oval = 1;
92 exit (1); 124 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
93 } 125 }
94 126
95#ifdef IP_MTU_DISCOVER 127#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
96 // this I really consider a linux bug. I am neither connected 128 // this I really consider a linux bug. I am neither connected
97 // 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
98 // fragment for me sometimes. 130 // fragment for me sometimes.
99 { 131 {
100 int oval = IP_PMTUDISC_DONT; 132 int oval = IP_PMTUDISC_DONT;
101 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 133 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
102 } 134 }
103#endif 135#endif
104 136
105 // standard daemon practise... 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
145 udpv4_ev_watcher.start (udpv4_fd, POLLIN);
146 }
147
148 icmpv4_fd = -1;
149
150#if ENABLE_ICMP
151 if (THISNODE->protocols & PROT_ICMPv4)
152 {
153 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
154
155 if (icmpv4_fd < 0)
156 return -1;
157
158 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
159
160#ifdef ICMP_FILTER
106 { 161 {
107 int oval = 1; 162 icmp_filter oval;
163 oval.data = 0xffffffff;
164 if (::conf.icmp_type < 32)
165 oval.data &= ~(1 << ::conf.icmp_type);
166
108 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 167 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
109 } 168 }
169#endif
110 170
111 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 171#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 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);
190 }
191#endif
192
193 tcpv4_fd = -1;
194
195#if ENABLE_TCP
196 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
197 {
198 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
199
200 if (tcpv4_fd < 0)
201 return -1;
202
203 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
204
205 // standard daemon practise...
206 {
207 int oval = 1;
208 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
139 } 209 }
210
211 sockinfo si (THISNODE, PROT_TCPv4);
212
213 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
214 {
215 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
216 exit (1);
217 }
218
219 if (listen (tcpv4_fd, 5))
220 {
221 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
222 exit (1);
223 }
224
225 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
226 }
227#endif
140 228
141 tap = new tap_device (); 229 tap = new tap_device ();
142 if (!tap) //D this, of course, never catches 230 if (!tap) //D this, of course, never catches
143 { 231 {
144 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 232 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
… …
152 reconnect_all (); 240 reconnect_all ();
153 241
154 return 0; 242 return 0;
155} 243}
156 244
157void 245// send a vpn packet out to other hosts
246bool
247vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
248{
249 switch (si.prot)
250 {
251 case PROT_IPv4:
252 return send_ipv4_packet (pkt, si, tos);
253
254 case PROT_UDPv4:
255 return send_udpv4_packet (pkt, si, tos);
256
257#if ENABLE_TCP
258 case PROT_TCPv4:
259 return send_tcpv4_packet (pkt, si, tos);
260#endif
261
262#if ENABLE_ICMP
263 case PROT_ICMPv4:
264 return send_icmpv4_packet (pkt, si, tos);
265#endif
266
267 default:
268 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
269 return false;
270 }
271}
272
273bool
158vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 274vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
159{ 275{
276#if defined(SOL_IP) && defined(IP_TOS)
160 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 277 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
278#endif
161 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 ());
162}
163 280
164void 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
165vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 330vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
166{ 331{
332#if defined(SOL_IP) && defined(IP_TOS)
167 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 333 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
334#endif
168 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;
169} 338}
170 339
171void 340void
172vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 341vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
173{ 342{
… …
180 if (src == 0 || src > conns.size () 349 if (src == 0 || src > conns.size ()
181 || dst > conns.size () 350 || dst > conns.size ()
182 || pkt->typ () >= vpn_packet::PT_MAX) 351 || pkt->typ () >= vpn_packet::PT_MAX)
183 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)"),
184 (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 ());
185 else 357 else
186 { 358 {
187 connection *c = conns[src - 1]; 359 connection *c = conns[src - 1];
188 360
189 if (dst == 0 && !THISNODE->routerprio) 361 if (dst == 0)
190 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), 362 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
191 c->conf->nodename, (const char *)rsi); 363 c->conf->nodename, (const char *)rsi);
192 else if (dst != 0 && dst != THISNODE->id) 364 else if (dst != 0 && dst != THISNODE->id)
193 // 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
194 slog (L_WARN, 370 slog (L_WARN,
195 _("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,
196 dst, conns[dst - 1]->conf->nodename, 373 conns[dst - 1]->conf->nodename);
197 (const char *)rsi, 374 }
198 THISNODE->id, THISNODE->nodename);
199 else 375 else
200 c->recv_vpn_packet (pkt, rsi); 376 c->recv_vpn_packet (pkt, rsi);
201 } 377 }
202} 378}
203 379
204void 380void
205vpn::udpv4_ev (short revents) 381vpn::ipv4_ev (io_watcher &w, short revents)
206{ 382{
207 if (revents & (POLLIN | POLLERR)) 383 if (revents & (POLLIN | POLLERR))
208 { 384 {
209 vpn_packet *pkt = new vpn_packet; 385 vpn_packet *pkt = new vpn_packet;
210 struct sockaddr_in sa; 386 struct sockaddr_in sa;
211 socklen_t sa_len = sizeof (sa); 387 socklen_t sa_len = sizeof (sa);
212 int len; 388 int len;
213 389
214 len = recvfrom (udpv4_fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 390 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
215 391
216 sockinfo si(sa); 392 sockinfo si(sa, PROT_IPv4);
217 393
218 if (len > 0) 394 if (len > 0)
219 { 395 {
220 pkt->len = len; 396 pkt->len = len;
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);
221 401
222 recv_vpn_packet (pkt, si); 402 recv_vpn_packet (pkt, si);
223 } 403 }
224 else 404 else
225 { 405 {
… …
230 delete pkt; 410 delete pkt;
231 } 411 }
232 else if (revents & POLLHUP) 412 else if (revents & POLLHUP)
233 { 413 {
234 // this cannot ;) happen on udp sockets 414 // this cannot ;) happen on udp sockets
235 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating.")); 415 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
236 exit (1); 416 exit (1);
237 } 417 }
238 else 418 else
239 { 419 {
240 slog (L_ERR, 420 slog (L_ERR,
… …
242 revents); 422 revents);
243 exit (1); 423 exit (1);
244 } 424 }
245} 425}
246 426
427#if ENABLE_ICMP
247void 428void
248vpn::ipv4_ev (short revents) 429vpn::icmpv4_ev (io_watcher &w, short revents)
249{ 430{
250 if (revents & (POLLIN | POLLERR)) 431 if (revents & (POLLIN | POLLERR))
251 { 432 {
252 vpn_packet *pkt = new vpn_packet; 433 vpn_packet *pkt = new vpn_packet;
253 struct sockaddr_in sa; 434 struct sockaddr_in sa;
254 socklen_t sa_len = sizeof (sa); 435 socklen_t sa_len = sizeof (sa);
255 int len; 436 int len;
256 437
257 len = recvfrom (ipv4_fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 438 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
258 439
259 sockinfo si(sa, PROT_IPv4); 440 sockinfo si(sa, PROT_ICMPv4);
260 441
261 if (len > 0) 442 if (len > 0)
262 { 443 {
263 pkt->len = len; 444 pkt->len = len;
264 445
446 icmp_header *hdr = (icmp_header *)&((*pkt)[IP_OVERHEAD]);
447
448 if (hdr->type == ::conf.icmp_type
449 && hdr->code == 255)
450 {
265 // 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
266 // this is slow, but... 452 // this is slow, but...
267 pkt->skip_hdr (IP_OVERHEAD); 453 pkt->skip_hdr (ICMP_OVERHEAD);
268 454
269 recv_vpn_packet (pkt, si); 455 recv_vpn_packet (pkt, si);
456 }
270 } 457 }
271 else 458 else
272 { 459 {
273 // probably ECONNRESET or somesuch 460 // probably ECONNRESET or somesuch
274 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 461 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
… …
277 delete pkt; 464 delete pkt;
278 } 465 }
279 else if (revents & POLLHUP) 466 else if (revents & POLLHUP)
280 { 467 {
281 // this cannot ;) happen on udp sockets 468 // this cannot ;) happen on udp sockets
282 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating.")); 469 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
283 exit (1); 470 exit (1);
284 } 471 }
285 else 472 else
286 { 473 {
287 slog (L_ERR, 474 slog (L_ERR,
288 _("FATAL: unknown revents %08x in socket, terminating\n"), 475 _("FATAL: unknown revents %08x in socket, terminating\n"),
289 revents); 476 revents);
290 exit (1); 477 exit (1);
291 } 478 }
292} 479}
480#endif
293 481
294void 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}
524
525void
295vpn::tap_ev (short revents) 526vpn::tap_ev (io_watcher &w, short revents)
296{ 527{
297 if (revents & POLLIN) 528 if (revents & POLLIN)
298 { 529 {
299 /* process data */ 530 /* process data */
300 tap_packet *pkt; 531 tap_packet *pkt;
… …
304 int dst = mac2id (pkt->dst); 535 int dst = mac2id (pkt->dst);
305 int src = mac2id (pkt->src); 536 int src = mac2id (pkt->src);
306 537
307 if (src != THISNODE->id) 538 if (src != THISNODE->id)
308 { 539 {
309 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."));
310 exit (1); 541 exit (1);
311 } 542 }
312 543
313 if (dst == THISNODE->id) 544 if (dst == THISNODE->id)
314 { 545 {
315 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."));
316 exit (1); 547 exit (1);
317 } 548 }
318 549
319 if (dst > conns.size ()) 550 if (dst > conns.size ())
320 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);
… …
326 if (dst != THISNODE->id) 557 if (dst != THISNODE->id)
327 conns[dst - 1]->inject_data_packet (pkt); 558 conns[dst - 1]->inject_data_packet (pkt);
328 } 559 }
329 else 560 else
330 { 561 {
331 // broadcast, first check router, then self, then english 562 // broadcast, this is ugly, but due to the security policy
332 connection *router = find_router (); 563 // 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) 564 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
338 if ((*c)->conf != THISNODE) 565 if ((*c)->conf != THISNODE)
339 (*c)->inject_data_packet (pkt); 566 (*c)->inject_data_packet (pkt);
340 } 567 }
341 } 568 }
342 569
343 delete pkt; 570 delete pkt;
344 } 571 }
… …
350 else 577 else
351 abort (); 578 abort ();
352} 579}
353 580
354void 581void
355vpn::event_cb (tstamp &ts) 582vpn::event_cb (time_watcher &w)
356{ 583{
357 if (events) 584 if (events)
358 { 585 {
359 if (events & EVENT_SHUTDOWN) 586 if (events & EVENT_SHUTDOWN)
360 { 587 {
… …
377 } 604 }
378 605
379 events = 0; 606 events = 0;
380 } 607 }
381 608
382 ts = TSTAMP_CANCEL; 609 w.at = TSTAMP_CANCEL;
383} 610}
384 611
385void 612void
386vpn::shutdown_all () 613vpn::shutdown_all ()
387{ 614{
… …
411 } 638 }
412} 639}
413 640
414connection *vpn::find_router () 641connection *vpn::find_router ()
415{ 642{
416 u32 prio = 0; 643 u32 prio = 1;
417 connection *router = 0; 644 connection *router = 0;
418 645
419 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 646 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
420 { 647 {
421 connection *c = *i; 648 connection *c = *i;
422 649
423 if (c->conf->routerprio > prio 650 if (c->conf->routerprio > prio
424 && c->connectmode == conf_node::C_ALWAYS 651 && 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) 652 && c->ictx && c->octx
653 && c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode
427 { 654 {
428 prio = c->conf->routerprio; 655 prio = c->conf->routerprio;
429 router = c; 656 router = c;
430 } 657 }
431 } 658 }
432 659
433 return router; 660 return router;
434} 661}
435 662
436void vpn::connect_request (int id) 663void vpn::send_connect_request (int id)
437{ 664{
438 connection *c = find_router (); 665 connection *c = find_router ();
439 666
440 if (c) 667 if (c)
441 c->connect_request (id); 668 c->send_connect_request (id);
442 //else // does not work, because all others must connect to the same router 669 else
443 // // no router found, aggressively connect to all routers 670 // no router found, aggressively connect to all routers
444 // for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 671 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
445 // if ((*i)->conf->routerprio) 672 if ((*i)->conf->routerprio && (*i)->conf != THISNODE)
446 // (*i)->establish_connection (); 673 (*i)->establish_connection ();
447} 674}
448 675
449void 676void
450connection::dump_status () 677connection::dump_status ()
451{ 678{
… …
468 695
469 slog (L_NOTICE, _("END status dump")); 696 slog (L_NOTICE, _("END status dump"));
470} 697}
471 698
472vpn::vpn (void) 699vpn::vpn (void)
700: event (this, &vpn::event_cb)
473: udpv4_ev_watcher(this, &vpn::udpv4_ev) 701, udpv4_ev_watcher (this, &vpn::udpv4_ev)
474, ipv4_ev_watcher(this, &vpn::ipv4_ev) 702, ipv4_ev_watcher (this, &vpn::ipv4_ev)
703#if ENABLE_TCP
704, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
705#endif
706#if ENABLE_ICMP
707, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
708#endif
475, tap_ev_watcher(this, &vpn::tap_ev) 709, tap_ev_watcher (this, &vpn::tap_ev)
476, event(this, &vpn::event_cb)
477{ 710{
478} 711}
479 712
480vpn::~vpn () 713vpn::~vpn ()
481{ 714{

Diff Legend

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