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.44 by pcg, Tue Dec 4 17:17:20 2007 UTC vs.
Revision 1.54 by pcg, Mon Mar 23 15:22:00 2009 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-2007 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 Public License for more details.
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22#include "config.h" 32#include "config.h"
23 33
24#include <list> 34#include <list>
… …
87 snprintf (ext, 16, "_%d", (*c)->conf->id); 97 snprintf (ext, 16, "_%d", (*c)->conf->id);
88 (*c)->script_init_env (ext); 98 (*c)->script_init_env (ext);
89 } 99 }
90} 100}
91 101
102inline const char *
92const char *vpn::script_if_init () 103vpn::script_if_init ()
93{ 104{
94 script_init_env (); 105 script_init_env ();
95 106
96 return tap->if_up (); 107 return tap->if_up ();
97} 108}
98 109
110inline const char *
99const char *vpn::script_if_up () 111vpn::script_if_up ()
100{ 112{
101 script_init_env (); 113 script_init_env ();
102 114
103 char *filename; 115 char *filename;
104 asprintf (&filename, 116 asprintf (&filename,
… …
108 120
109 return filename; 121 return filename;
110} 122}
111 123
112int 124int
125vpn::setup_socket (u8 prot, int family, int type, int proto)
126{
127 int fd = socket (family, type, proto);
128
129 if (fd < 0)
130 {
131 slog (L_ERR, _("unable to create %s socket: %s."), strprotocol (prot), strerror (errno));
132 return fd;
133 }
134
135 fcntl (fd, F_SETFL, O_NONBLOCK);
136 fcntl (fd, F_SETFD, FD_CLOEXEC);
137
138#ifdef SO_MARK
139 if (::conf.nfmark)
140 setsockopt (ipv4_fd, SOL_SOCKET, SO_MARK, &::conf.nfmark, sizeof ::conf.nfmark);
141#endif
142
143 return fd;
144}
145
146int
113vpn::setup () 147vpn::setup ()
114{ 148{
149 int success = 0;
150
115 ipv4_tos = -1; 151 ipv4_tos = -1;
116 ipv4_fd = -1; 152 ipv4_fd = -1;
117 153
118 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 154 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
119 { 155 {
120 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 156 ipv4_fd = setup_socket (PROT_IPv4, PF_INET, SOCK_RAW, ::conf.ip_proto);
121 157
122 if (ipv4_fd < 0) 158 if (ipv4_fd < 0)
123 return -1; 159 return -1;
124
125 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
126 fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
127 160
128#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 161#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
129 // this I really consider a linux bug. I am neither connected 162 // this I really consider a linux bug. I am neither connected
130 // nor do I fragment myself. Linux still sets DF and doesn't 163 // nor do I fragment myself. Linux still sets DF and doesn't
131 // fragment for me sometimes. 164 // fragment for me sometimes.
… …
137 170
138 sockinfo si (THISNODE, PROT_IPv4); 171 sockinfo si (THISNODE, PROT_IPv4);
139 172
140 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 173 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
141 { 174 {
142 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 175 slog (L_ERR, _("can't bind ipv4 socket on %s: %s, exiting."), (const char *)si, strerror (errno));
143 exit (EXIT_FAILURE); 176 return -1;
144 } 177 }
145 178
146 ipv4_ev_watcher.start (ipv4_fd, EV_READ); 179 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
180 ++success;
147 } 181 }
182 else
183 THISNODE->protocols &= ~PROT_IPv4;
148 184
149 udpv4_tos = -1; 185 udpv4_tos = -1;
150 udpv4_fd = -1; 186 udpv4_fd = -1;
151 187
152 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 188 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
153 { 189 {
154 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 190 udpv4_fd = setup_socket (PROT_UDPv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
155 191
156 if (udpv4_fd < 0) 192 if (udpv4_fd < 0)
157 return -1; 193 return -1;
158
159 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
160 fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
161 194
162 // standard daemon practise... 195 // standard daemon practise...
163 { 196 {
164 int oval = 1; 197 int oval = 1;
165 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 198 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
177 210
178 sockinfo si (THISNODE, PROT_UDPv4); 211 sockinfo si (THISNODE, PROT_UDPv4);
179 212
180 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 213 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
181 { 214 {
182 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 215 slog (L_ERR, _("can't bind udpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
183 exit (EXIT_FAILURE); 216 return -1;
184 } 217 }
185 218
186 udpv4_ev_watcher.start (udpv4_fd, EV_READ); 219 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
220 ++success;
187 } 221 }
222 else
223 THISNODE->protocols &= ~PROT_UDPv4;
188 224
189 icmpv4_tos = -1; 225 icmpv4_tos = -1;
190 icmpv4_fd = -1; 226 icmpv4_fd = -1;
191 227
192#if ENABLE_ICMP 228#if ENABLE_ICMP
193 if (THISNODE->protocols & PROT_ICMPv4) 229 if (THISNODE->protocols & PROT_ICMPv4)
194 { 230 {
195 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 231 icmpv4_fd = setup_socket (PROT_ICMPv4, PF_INET, SOCK_RAW, IPPROTO_ICMP);
196 232
197 if (icmpv4_fd < 0) 233 if (icmpv4_fd < 0)
198 return -1; 234 return -1;
199
200 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
201 fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
202 235
203#ifdef ICMP_FILTER 236#ifdef ICMP_FILTER
204 { 237 {
205 icmp_filter oval; 238 icmp_filter oval;
206 oval.data = 0xffffffff; 239 oval.data = 0xffffffff;
… …
223 256
224 sockinfo si (THISNODE, PROT_ICMPv4); 257 sockinfo si (THISNODE, PROT_ICMPv4);
225 258
226 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 259 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
227 { 260 {
228 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); 261 slog (L_ERR, _("can't bind icmpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
229 exit (EXIT_FAILURE); 262 return -1;
230 } 263 }
231 264
232 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ); 265 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
266 ++success;
233 } 267 }
234#endif 268#endif
235 269
236 tcpv4_fd = -1; 270 tcpv4_fd = -1;
237 271
238#if ENABLE_TCP 272#if ENABLE_TCP
239 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port) 273 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
240 { 274 {
241 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 275 tcpv4_fd = setup_socket (PROT_TCPv4, PF_INET, SOCK_STREAM, IPPROTO_TCP);
242 276
243 if (tcpv4_fd < 0) 277 if (tcpv4_fd < 0)
244 return -1; 278 return -1;
245 279
246 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
247 fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
248
249 // standard daemon practise... 280 // standard daemon practise...
250 { 281 {
251 int oval = 1; 282 int oval = 1;
252 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 283 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
253 } 284 }
254 285
255 sockinfo si (THISNODE, PROT_TCPv4); 286 sockinfo si (THISNODE, PROT_TCPv4);
256 287
257 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 288 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
258 { 289 {
259 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 290 slog (L_ERR, _("can't bind tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
260 exit (EXIT_FAILURE); 291 return -1;
261 } 292 }
262 293
263 if (listen (tcpv4_fd, 5)) 294 if (listen (tcpv4_fd, 5))
264 { 295 {
265 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 296 slog (L_ERR, _("can't listen tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
266 exit (EXIT_FAILURE); 297 return -1;
267 } 298 }
268 299
269 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ); 300 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
301 ++success;
270 } 302 }
303 else
304 THISNODE->protocols &= ~PROT_TCPv4;
271#endif 305#endif
272 306
273 dnsv4_tos = -1; 307 dnsv4_tos = -1;
274 dnsv4_fd = -1; 308 dnsv4_fd = -1;
275 309
276#if ENABLE_DNS 310#if ENABLE_DNS
277 if (THISNODE->protocols & PROT_DNSv4) 311 if (THISNODE->protocols & PROT_DNSv4)
278 { 312 {
279 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4); 313 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
280 314
281 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 315 dnsv4_fd = setup_socket (PROT_DNSv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
282 316
283 if (dnsv4_fd < 0) 317 if (dnsv4_fd < 0)
284 return -1; 318 return -1;
285
286 fcntl (dnsv4_fd, F_SETFL, O_NONBLOCK);
287 fcntl (dnsv4_fd, F_SETFD, FD_CLOEXEC);
288 319
289# if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 320# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
290 // this I really consider a linux bug. I am neither connected 321 // this I really consider a linux bug. I am neither connected
291 // nor do I fragment myself. Linux still sets DF and doesn't 322 // nor do I fragment myself. Linux still sets DF and doesn't
292 // fragment for me sometimes. 323 // fragment for me sometimes.
… …
306 THISNODE->dns_hostname ? THISNODE->dns_port : 0, 337 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
307 PROT_DNSv4); 338 PROT_DNSv4);
308 339
309 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ())) 340 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
310 { 341 {
311 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno)); 342 slog (L_ERR, _("can't bind dnsv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
312 exit (EXIT_FAILURE); 343 return -1;
313 } 344 }
314 345
315 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ); 346 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
347 ++success;
316 } 348 }
317#endif 349#endif
318 350
319 ///////////////////////////////////////////////////////////////////////////// 351 /////////////////////////////////////////////////////////////////////////////
352
353 if (!success)
354 {
355 slog (L_ERR, _("no protocols enabled."));
356 return -1;
357 }
320 358
321 reconnect_all (); 359 reconnect_all ();
322 360
323 ///////////////////////////////////////////////////////////////////////////// 361 /////////////////////////////////////////////////////////////////////////////
324 362
325 tap = new tap_device (); 363 tap = new tap_device ();
326 if (!tap) //D this, of course, never catches 364 if (!tap) //D this, of course, never catches
327 { 365 {
328 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 366 slog (L_ERR, _("cannot create network interface '%s'."), conf.ifname);
329 exit (EXIT_FAILURE); 367 return -1;
330 } 368 }
331 369
332 fcntl (tap->fd, F_SETFD, FD_CLOEXEC); 370 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
333 371
334 run_script_cb cb; 372 run_script_cb cb;
335 cb.set<vpn, &vpn::script_if_init> (this); 373 cb.set<vpn, &vpn::script_if_init> (this);
336 374
337 if (tap->if_up () && 375 if (tap->if_up () &&
338 !run_script (cb, true)) 376 !run_script (cb, true))
339 { 377 {
340 slog (L_ERR, _("interface initialization command '%s' failed, exiting."), 378 slog (L_ERR, _("interface initialization command '%s' failed."),
341 tap->if_up ()); 379 tap->if_up ());
342 exit (EXIT_FAILURE); 380 return -1;
343 } 381 }
344 382
345 cb.set<vpn, &vpn::script_if_up> (this); 383 cb.set<vpn, &vpn::script_if_up> (this);
346 if (!run_script (cb, true)) 384 if (!run_script (cb, true))
347 { 385 {
348 slog (L_ERR, _("if-up command execution failed, exiting.")); 386 slog (L_ERR, _("if-up command execution failed."));
349 exit (EXIT_FAILURE); 387 return -1;
350 } 388 }
351 389
352 tap_ev_watcher.start (tap->fd, EV_READ); 390 tap_ev_watcher.start (tap->fd, EV_READ);
353 391
354 return 0; 392 return 0;
… …
427 { 465 {
428 // broadcast, this is ugly, but due to the security policy 466 // broadcast, this is ugly, but due to the security policy
429 // we have to connect to all hosts... 467 // we have to connect to all hosts...
430 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 468 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
431 if ((*c)->conf != THISNODE) 469 if ((*c)->conf != THISNODE)
432 (*c)->inject_data_packet (pkt, true); 470 (*c)->inject_data_packet (pkt);
433 } 471 }
434} 472}
435 473
436void 474void
437vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 475vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
438{ 476{
439 unsigned int src = pkt->src (); 477 unsigned int src = pkt->src ();
440 unsigned int dst = pkt->dst (); 478 unsigned int dst = pkt->dst ();
441 479
442 slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d"), 480 slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d."),
443 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len); 481 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);
444 482
445 if (src == 0 || src > conns.size () 483 if (src == 0 || src > conns.size ()
446 || dst > conns.size () 484 || dst > conns.size ()
447 || pkt->typ () >= vpn_packet::PT_MAX) 485 || pkt->typ () >= vpn_packet::PT_MAX)
448 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), 486 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)."),
449 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 487 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
450 else if (dst > conns.size ()) 488 else if (dst > conns.size ())
451 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), 489 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)."),
452 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 490 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
453 else 491 else
454 { 492 {
455 connection *c = conns[src - 1]; 493 connection *c = conns[src - 1];
456 494
457 if (dst == 0) 495 if (dst == 0)
458 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"), 496 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)."),
459 c->conf->nodename, (const char *)rsi); 497 c->conf->nodename, (const char *)rsi);
460 else if (dst != THISNODE->id) 498 else if (dst != THISNODE->id)
461 { 499 {
462 if (THISNODE->routerprio) 500 if (THISNODE->routerprio)
463 // the tos setting gets lost here. who cares. 501 // the tos setting gets lost here. who cares.
464 conns[dst - 1]->inject_vpn_packet (pkt); 502 conns[dst - 1]->inject_vpn_packet (pkt);
465 else 503 else
466 slog (L_WARN, 504 slog (L_WARN,
467 _("%s(%s): forwarding request (=> %s), but we are no router"), 505 _("%s(%s): request to forward packet to %s, but we are no router (config mismatch?)."),
468 c->conf->nodename, (const char *)rsi, 506 c->conf->nodename, (const char *)rsi,
469 conns[dst - 1]->conf->nodename); 507 conns[dst - 1]->conf->nodename);
470 } 508 }
471 else 509 else
472 c->recv_vpn_packet (pkt, rsi); 510 c->recv_vpn_packet (pkt, rsi);
… …
495#if ENABLE_DNS 533#if ENABLE_DNS
496 case PROT_DNSv4: 534 case PROT_DNSv4:
497 return send_dnsv4_packet (pkt, si, tos); 535 return send_dnsv4_packet (pkt, si, tos);
498#endif 536#endif
499 default: 537 default:
500 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si); 538 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol."), (const char *)si);
501 } 539 }
502 540
503 return false; 541 return false;
504} 542}
505 543
506void 544inline void
507vpn::ipv4_ev (ev::io &w, int revents) 545vpn::ipv4_ev (ev::io &w, int revents)
508{ 546{
509 if (revents & EV_READ) 547 if (revents & EV_READ)
510 { 548 {
511 vpn_packet *pkt = new vpn_packet; 549 vpn_packet *pkt = new vpn_packet;
… …
527 recv_vpn_packet (pkt, si); 565 recv_vpn_packet (pkt, si);
528 } 566 }
529 else 567 else
530 { 568 {
531 // probably ECONNRESET or somesuch 569 // probably ECONNRESET or somesuch
532 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 570 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
533 } 571 }
534 572
535 delete pkt; 573 delete pkt;
536 } 574 }
537 else 575 else
538 { 576 {
539 slog (L_ERR, 577 slog (L_ERR,
540 _("FATAL: unknown revents %08x in socket, terminating\n"), 578 _("FATAL: unknown revents %08x in socket, exiting.\n"),
541 revents); 579 revents);
542 exit (EXIT_FAILURE); 580 exit (EXIT_FAILURE);
543 } 581 }
544} 582}
545 583
546#if ENABLE_ICMP 584#if ENABLE_ICMP
547void 585inline void
548vpn::icmpv4_ev (ev::io &w, int revents) 586vpn::icmpv4_ev (ev::io &w, int revents)
549{ 587{
550 if (revents & EV_READ) 588 if (revents & EV_READ)
551 { 589 {
552 vpn_packet *pkt = new vpn_packet; 590 vpn_packet *pkt = new vpn_packet;
… …
575 } 613 }
576 } 614 }
577 else 615 else
578 { 616 {
579 // probably ECONNRESET or somesuch 617 // probably ECONNRESET or somesuch
580 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 618 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
581 } 619 }
582 620
583 delete pkt; 621 delete pkt;
584 } 622 }
585 else 623 else
586 { 624 {
587 slog (L_ERR, 625 slog (L_ERR,
588 _("FATAL: unknown revents %08x in socket, terminating\n"), 626 _("FATAL: unknown revents %08x in socket, exiting.\n"),
589 revents); 627 revents);
590 exit (EXIT_FAILURE); 628 exit (EXIT_FAILURE);
591 } 629 }
592} 630}
593#endif 631#endif
594 632
595void 633inline void
596vpn::udpv4_ev (ev::io &w, int revents) 634vpn::udpv4_ev (ev::io &w, int revents)
597{ 635{
598 if (revents & EV_READ) 636 if (revents & EV_READ)
599 { 637 {
600 vpn_packet *pkt = new vpn_packet; 638 vpn_packet *pkt = new vpn_packet;
… …
613 recv_vpn_packet (pkt, si); 651 recv_vpn_packet (pkt, si);
614 } 652 }
615 else 653 else
616 { 654 {
617 // probably ECONNRESET or somesuch 655 // probably ECONNRESET or somesuch
618 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 656 slog (L_DEBUG, _("%s: fd %d, %s."), (const char *)si, w.fd, strerror (errno));
619 } 657 }
620 658
621 delete pkt; 659 delete pkt;
622 } 660 }
623 else 661 else
624 { 662 {
625 slog (L_ERR, 663 slog (L_ERR,
626 _("FATAL: unknown revents %08x in socket, terminating\n"), 664 _("FATAL: unknown revents %08x in socket, exiting.\n"),
627 revents); 665 revents);
628 exit (EXIT_FAILURE); 666 exit (EXIT_FAILURE);
629 } 667 }
630} 668}
631 669
632void 670inline void
633vpn::tap_ev (ev::io &w, int revents) 671vpn::tap_ev (ev::io &w, int revents)
634{ 672{
635 if (revents & EV_READ) 673 if (revents & EV_READ)
636 { 674 {
637 /* process data */ 675 /* process data */
… …
669 } 707 }
670 else 708 else
671 abort (); 709 abort ();
672} 710}
673 711
674void 712inline void
675vpn::event_cb (ev::timer &w, int) 713vpn::event_cb (ev::timer &w, int)
676{ 714{
677 if (events) 715 if (events)
678 { 716 {
679 if (events & EVENT_SHUTDOWN) 717 if (events & EVENT_SHUTDOWN)
680 { 718 {
681 slog (L_INFO, _("preparing shutdown...")); 719 slog (L_INFO, _("preparing shutdown..."));
682 720
683 shutdown_all (); 721 shutdown_all ();
684 remove_pid (conf.pidfilename); 722 remove_pid (conf.pidfilename);
685 slog (L_INFO, _("terminating")); 723 slog (L_INFO, _("exiting."));
686 exit (EXIT_SUCCESS); 724 exit (EXIT_SUCCESS);
687 } 725 }
688 726
689 if (events & EVENT_RECONNECT) 727 if (events & EVENT_RECONNECT)
690 { 728 {
691 slog (L_INFO, _("forced reconnect")); 729 slog (L_INFO, _("forced reconnect."));
692 730
693 reconnect_all (); 731 reconnect_all ();
694 } 732 }
695 733
696 events = 0; 734 events = 0;
… …
712 750
713 conns.clear (); 751 conns.clear ();
714 752
715 connection_init (); 753 connection_init ();
716 754
717 for (configuration::node_vector::iterator i = conf.nodes.begin (); 755 for (configuration::node_vector::iterator i = conf.nodes.begin (); i != conf.nodes.end (); ++i)
718 i != conf.nodes.end (); ++i) 756 conns.push_back (new connection (this, *i));
719 { 757
720 connection *conn = new connection (this, *i); 758 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
721 conns.push_back (conn);
722 conn->establish_connection (); 759 (*c)->establish_connection ();
723 }
724} 760}
725 761
726connection *vpn::find_router () 762bool vpn::can_direct (conf_node *src, conf_node *dst) const
727{ 763{
728 u32 prio = 1; 764 return src != dst
765 && src->may_direct (dst)
766 && dst->may_direct (src)
767 && (((src->protocols & dst->protocols) && src->connectmode == conf_node::C_ALWAYS)
768 || (src->protocols & dst->connectable_protocols ()));
769}
770
771// only works for indirect and routed connections: find a router
772// from THISNODE to dst
773connection *vpn::find_router_for (const connection *dst)
774{
729 connection *router = 0; 775 connection *router = 0;
730 776
777 // first try to find a router with a direct connection, route there
778 // regardless of any other considerations.
779 {
780 u32 prio = 1;
781
782 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
783 {
784 connection *c = *i;
785
786 if (c->conf->routerprio > prio
787 && c->conf != THISNODE
788 && can_direct (c->conf, dst->conf)
789 && c->ictx && c->octx)
790 {
791 prio = c->conf->routerprio;
792 router = c;
793 }
794 }
795 }
796
797 if (router)
798 return router;
799
800 // second try find the router with the highest priority, higher than ours
801 {
802 u32 prio = THISNODE->routerprio ? THISNODE->routerprio : 1;
803
804 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
805 {
806 connection *c = *i;
807
808 if (c->conf->routerprio > prio
809 && c != dst
810 && c->conf != THISNODE
811 && c->ictx && c->octx)
812 {
813 prio = c->conf->routerprio;
814 router = c;
815 }
816 }
817 }
818
819 return router;
820}
821
822void vpn::connection_established (connection *c)
823{
731 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 824 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
732 { 825 {
733 connection *c = *i; 826 connection *o = *i;
734 827
735 if (c->conf->routerprio > prio 828 if (!o->is_direct
736 && c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use 829 && o->si.valid ()
737 && c->ictx && c->octx 830 && c->si != o->si
738 && c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode 831 && c == find_router_for (o))
739 {
740 prio = c->conf->routerprio;
741 router = c;
742 } 832 {
833 slog (L_DEBUG, _("%s: can now route packets via %s, re-keying connection."),
834 o->conf->nodename, c->conf->nodename);
835 o->rekey ();
836 }
743 } 837 }
744
745 return router;
746} 838}
747 839
748void vpn::send_connect_request (int id) 840void vpn::send_connect_request (connection *c)
749{ 841{
750 connection *c = find_router (); 842 connection *r = find_router_for (c);
751 843
752 if (c) 844 if (r)
845 {
846 slog (L_TRACE, _("%s: no address known, sending mediated connection request via %s."),
847 c->conf->nodename, r->conf->nodename);
753 c->send_connect_request (id); 848 r->send_connect_request (c->conf->id);
849 }
754 else 850 else
755 // no router found, aggressively connect to all routers 851 slog (L_DEBUG, _("%s: no way to connect and no router found: unable to connect at this time."),
756 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 852 c->conf->nodename);
757 if ((*i)->conf->routerprio && (*i)->conf != THISNODE)
758 (*i)->establish_connection ();
759} 853}
760 854
761void 855void
762connection::dump_status () 856connection::dump_status ()
763{ 857{
764 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id); 858 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);
765 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"), 859 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),
766 connectmode, conf->connectmode, (const char *)si, (int)prot_minor); 860 connectmode, conf->connectmode, (const char *)si, (int)prot_minor);
767 slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"), 861 slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"),
768 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt); 862 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt);
769 slog (L_NOTICE, _(" establish_conn %ld / rekey %ld / keepalive %ld"),
770 (long)(establish_connection.at), (long)(rekey.at), (long)(keepalive.at));
771} 863}
772 864
773void 865void
774vpn::dump_status () 866vpn::dump_status ()
775{ 867{

Diff Legend

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