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.48 by pcg, Sat Aug 9 18:30:55 2008 UTC vs.
Revision 1.70 by root, Thu Oct 6 03:03:09 2022 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-2008 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008,2010,2011,2013 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 it 7 GVPE is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
… …
38#include <cstdlib> 38#include <cstdlib>
39 39
40#include <sys/types.h> 40#include <sys/types.h>
41#include <sys/socket.h> 41#include <sys/socket.h>
42#include <sys/wait.h> 42#include <sys/wait.h>
43#include <sys/stat.h>
43#include <errno.h> 44#include <errno.h>
44#include <time.h> 45#include <time.h>
45#include <unistd.h> 46#include <unistd.h>
46#include <fcntl.h> 47#include <fcntl.h>
47#include <sys/socket.h> 48#include <sys/socket.h>
… …
52 53
53#include "connection.h" 54#include "connection.h"
54#include "util.h" 55#include "util.h"
55#include "vpn.h" 56#include "vpn.h"
56 57
58using namespace std;
59
57vpn network; // THE vpn (bad design...) 60vpn network; // THE vpn (bad design...)
61
62/////////////////////////////////////////////////////////////////////////////
63
64// hopefully temporary workaround for rare buffer full conditions
65// if it happens, usually instantly retrying or retrying ~5ms later
66// is good enough with current network technologies/kernels
67
68static ssize_t
69xsendto (int fd, const void *buf, size_t len, int flags,
70 const struct sockaddr *sa, socklen_t salen)
71{
72 ssize_t res;
73
74 for (int retry = 0; retry <= 13; ++retry) // ~100ms
75 {
76 res = sendto (fd, buf, len, flags, sa, salen);
77
78 if (res >= 0 || errno != ENOBUFS)
79 break;
80
81 struct timespec ts = { 0, 1000 * retry };
82 nanosleep (&ts, 0);
83 }
84
85 return res;
86}
58 87
59///////////////////////////////////////////////////////////////////////////// 88/////////////////////////////////////////////////////////////////////////////
60 89
61static void inline 90static void inline
62set_tos (int fd, int &tos_prev, int tos) 91set_tos (int fd, int &tos_prev, int tos)
… …
75{ 104{
76 // the tunnel device mtu should be the physical mtu - overhead 105 // the tunnel device mtu should be the physical mtu - overhead
77 // the tricky part is rounding to the cipher key blocksize 106 // the tricky part is rounding to the cipher key blocksize
78 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD; 107 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
79 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 108 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
80 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 109 mtu -= mtu % BLOCK_SIZE (CIPHER); // round
81 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 110 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
82 111
83 char *env; 112 char *env;
84 asprintf (&env, "CONFBASE=%s", confbase); putenv (env); 113 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
85 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env); 114 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
… …
110inline const char * 139inline const char *
111vpn::script_if_up () 140vpn::script_if_up ()
112{ 141{
113 script_init_env (); 142 script_init_env ();
114 143
115 char *filename; 144 return conf.config_filename (::conf.script_if_up, "if-up");
116 asprintf (&filename, 145}
117 "%s/%s",
118 confbase,
119 ::conf.script_if_up ? ::conf.script_if_up : "if-up");
120 146
121 return filename; 147int
148vpn::setup_socket (u8 prot, int family, int type, int proto)
149{
150 int fd = socket (family, type, proto);
151
152 if (fd < 0)
153 {
154 slog (L_ERR, _("unable to create %s socket: %s."), strprotocol (prot), strerror (errno));
155 return fd;
156 }
157
158 fcntl (fd, F_SETFL, O_NONBLOCK);
159 fcntl (fd, F_SETFD, FD_CLOEXEC);
160
161#ifdef SO_MARK
162 if (::conf.nfmark)
163 if (setsockopt (fd, SOL_SOCKET, SO_MARK, &::conf.nfmark, sizeof ::conf.nfmark))
164 slog (L_WARN, _("unable to set nfmark on %s socket: %s"), strprotocol (prot), strerror (errno));
165#endif
166
167 return fd;
122} 168}
123 169
124int 170int
125vpn::setup () 171vpn::setup ()
126{ 172{
173 int success = 0;
174
127 ipv4_tos = -1; 175 ipv4_tos = -1;
128 ipv4_fd = -1; 176 ipv4_fd = -1;
129 177
130 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 178 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
131 { 179 {
132 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 180 ipv4_fd = setup_socket (PROT_IPv4, PF_INET, SOCK_RAW, ::conf.ip_proto);
133 181
134 if (ipv4_fd < 0) 182 if (ipv4_fd < 0)
135 return -1; 183 return -1;
136
137 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
138 fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
139 184
140#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 185#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
141 // this I really consider a linux bug. I am neither connected 186 // this I really consider a linux bug. I am neither connected
142 // nor do I fragment myself. Linux still sets DF and doesn't 187 // nor do I fragment myself. Linux still sets DF and doesn't
143 // fragment for me sometimes. 188 // fragment for me sometimes.
… …
149 194
150 sockinfo si (THISNODE, PROT_IPv4); 195 sockinfo si (THISNODE, PROT_IPv4);
151 196
152 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 197 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
153 { 198 {
154 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 199 slog (L_ERR, _("can't bind ipv4 socket on %s: %s, exiting."), (const char *)si, strerror (errno));
155 exit (EXIT_FAILURE); 200 return -1;
156 } 201 }
157 202
158 ipv4_ev_watcher.start (ipv4_fd, EV_READ); 203 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
204 ++success;
159 } 205 }
206 else
207 THISNODE->protocols &= ~PROT_IPv4;
160 208
161 udpv4_tos = -1; 209 udpv4_tos = -1;
162 udpv4_fd = -1; 210 udpv4_fd = -1;
163 211
164 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 212 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
165 { 213 {
166 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 214 udpv4_fd = setup_socket (PROT_UDPv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
167 215
168 if (udpv4_fd < 0) 216 if (udpv4_fd < 0)
169 return -1; 217 return -1;
170
171 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
172 fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
173 218
174 // standard daemon practise... 219 // standard daemon practise...
175 { 220 {
176 int oval = 1; 221 int oval = 1;
177 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 222 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
189 234
190 sockinfo si (THISNODE, PROT_UDPv4); 235 sockinfo si (THISNODE, PROT_UDPv4);
191 236
192 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 237 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
193 { 238 {
194 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 239 slog (L_ERR, _("can't bind udpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
195 exit (EXIT_FAILURE); 240 return -1;
196 } 241 }
197 242
198 udpv4_ev_watcher.start (udpv4_fd, EV_READ); 243 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
244 ++success;
199 } 245 }
246 else
247 THISNODE->protocols &= ~PROT_UDPv4;
200 248
201 icmpv4_tos = -1; 249 icmpv4_tos = -1;
202 icmpv4_fd = -1; 250 icmpv4_fd = -1;
203 251
204#if ENABLE_ICMP 252#if ENABLE_ICMP
205 if (THISNODE->protocols & PROT_ICMPv4) 253 if (THISNODE->protocols & PROT_ICMPv4)
206 { 254 {
207 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 255 icmpv4_fd = setup_socket (PROT_ICMPv4, PF_INET, SOCK_RAW, IPPROTO_ICMP);
208 256
209 if (icmpv4_fd < 0) 257 if (icmpv4_fd < 0)
210 return -1; 258 return -1;
211 259
212 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
213 fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
214
215#ifdef ICMP_FILTER 260#ifdef ICMP_FILTER
216 { 261 {
217 icmp_filter oval; 262 icmp_filter oval;
218 oval.data = 0xffffffff; 263 oval.data = 0;
219 if (::conf.icmp_type < 32) 264 if (::conf.icmp_type < 32)
220 oval.data &= ~(1 << ::conf.icmp_type); 265 oval.data |= 1 << ::conf.icmp_type;
266 oval.data = ~oval.data;
221 267
222 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval); 268 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
223 } 269 }
224#endif 270#endif
225 271
… …
235 281
236 sockinfo si (THISNODE, PROT_ICMPv4); 282 sockinfo si (THISNODE, PROT_ICMPv4);
237 283
238 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 284 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
239 { 285 {
240 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); 286 slog (L_ERR, _("can't bind icmpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
241 exit (EXIT_FAILURE); 287 return -1;
242 } 288 }
243 289
244 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ); 290 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
291 ++success;
245 } 292 }
246#endif 293#endif
247 294
248 tcpv4_fd = -1; 295 tcpv4_fd = -1;
249 296
250#if ENABLE_TCP 297#if ENABLE_TCP
251 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port) 298 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
252 { 299 {
253 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 300 tcpv4_fd = setup_socket (PROT_TCPv4, PF_INET, SOCK_STREAM, IPPROTO_TCP);
254 301
255 if (tcpv4_fd < 0) 302 if (tcpv4_fd < 0)
256 return -1; 303 return -1;
257 304
258 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
259 fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
260
261 // standard daemon practise... 305 // standard daemon practise...
262 { 306 {
263 int oval = 1; 307 int oval = 1;
264 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 308 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
265 } 309 }
266 310
267 sockinfo si (THISNODE, PROT_TCPv4); 311 sockinfo si (THISNODE, PROT_TCPv4);
268 312
269 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 313 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
270 { 314 {
271 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 315 slog (L_ERR, _("can't bind tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
272 exit (EXIT_FAILURE); 316 return -1;
273 } 317 }
274 318
275 if (listen (tcpv4_fd, 5)) 319 if (listen (tcpv4_fd, 5))
276 { 320 {
277 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 321 slog (L_ERR, _("can't listen tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
278 exit (EXIT_FAILURE); 322 return -1;
279 } 323 }
280 324
281 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ); 325 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
326 ++success;
282 } 327 }
328 else
329 THISNODE->protocols &= ~PROT_TCPv4;
283#endif 330#endif
284 331
285 dnsv4_tos = -1; 332 dnsv4_tos = -1;
286 dnsv4_fd = -1; 333 dnsv4_fd = -1;
287 334
288#if ENABLE_DNS 335#if ENABLE_DNS
289 if (THISNODE->protocols & PROT_DNSv4) 336 if (THISNODE->protocols & PROT_DNSv4)
290 { 337 {
291 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4); 338 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
292 339
293 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 340 dnsv4_fd = setup_socket (PROT_DNSv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
294 341
295 if (dnsv4_fd < 0) 342 if (dnsv4_fd < 0)
296 return -1; 343 return -1;
297
298 fcntl (dnsv4_fd, F_SETFL, O_NONBLOCK);
299 fcntl (dnsv4_fd, F_SETFD, FD_CLOEXEC);
300 344
301# if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 345# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
302 // this I really consider a linux bug. I am neither connected 346 // this I really consider a linux bug. I am neither connected
303 // nor do I fragment myself. Linux still sets DF and doesn't 347 // nor do I fragment myself. Linux still sets DF and doesn't
304 // fragment for me sometimes. 348 // fragment for me sometimes.
… …
318 THISNODE->dns_hostname ? THISNODE->dns_port : 0, 362 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
319 PROT_DNSv4); 363 PROT_DNSv4);
320 364
321 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ())) 365 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
322 { 366 {
323 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno)); 367 slog (L_ERR, _("can't bind dnsv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
324 exit (EXIT_FAILURE); 368 return -1;
325 } 369 }
326 370
327 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ); 371 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
372 ++success;
328 } 373 }
329#endif 374#endif
330 375
331 ///////////////////////////////////////////////////////////////////////////// 376 /////////////////////////////////////////////////////////////////////////////
377
378 if (!success)
379 {
380 slog (L_ERR, _("no protocols enabled."));
381 return -1;
382 }
332 383
333 reconnect_all (); 384 reconnect_all ();
334 385
335 ///////////////////////////////////////////////////////////////////////////// 386 /////////////////////////////////////////////////////////////////////////////
336 387
337 tap = new tap_device (); 388 tap = new tap_device ();
338 if (!tap) //D this, of course, never catches 389 if (!tap) //D this, of course, never catches
339 { 390 {
340 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 391 slog (L_ERR, _("cannot create network interface '%s'."), conf.ifname);
341 exit (EXIT_FAILURE); 392 return -1;
342 } 393 }
343 394
344 fcntl (tap->fd, F_SETFD, FD_CLOEXEC); 395 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
345 396
346 run_script_cb cb; 397 run_script_cb cb;
347 cb.set<vpn, &vpn::script_if_init> (this); 398 cb.set<vpn, &vpn::script_if_init> (this);
348 399
349 if (tap->if_up () && 400 if (tap->if_up () &&
350 !run_script (cb, true)) 401 !run_script (cb, true))
351 { 402 {
352 slog (L_ERR, _("interface initialization command '%s' failed, exiting."), 403 slog (L_ERR, _("interface initialization command '%s' failed."),
353 tap->if_up ()); 404 tap->if_up ());
354 exit (EXIT_FAILURE); 405 return -1;
355 } 406 }
356 407
357 cb.set<vpn, &vpn::script_if_up> (this); 408 cb.set<vpn, &vpn::script_if_up> (this);
358 if (!run_script (cb, true)) 409 if (!run_script (cb, true))
359 { 410 {
360 slog (L_ERR, _("if-up command execution failed, exiting.")); 411 slog (L_ERR, _("if-up command execution failed."));
361 exit (EXIT_FAILURE); 412 return -1;
362 } 413 }
363 414
364 tap_ev_watcher.start (tap->fd, EV_READ); 415 tap_ev_watcher.start (tap->fd, EV_READ);
365 416
366 return 0; 417 return 0;
418}
419
420bool
421vpn::drop_privileges ()
422{
423 if (::conf.change_root)
424 {
425 if (!strcmp (::conf.change_root, "/"))
426 {
427 char dir [L_tmpnam];
428 if (!tmpnam (dir))
429 {
430 slog (L_CRIT, _("unable to create anonymous root path."));
431 return false;
432 }
433
434 if (mkdir (dir, 0700))
435 {
436 slog (L_CRIT, _("unable to create anonymous root directory."));
437 return false;
438 }
439
440 if (chdir (dir))
441 {
442 slog (L_CRIT, _("unable to change to anonymous root directory."));
443 return false;
444 }
445
446 if (rmdir (dir))
447 slog (L_ERR, _("unable to remove anonymous root directory, continuing."));
448 }
449 else
450 {
451 if (chdir (::conf.change_root))
452 {
453 slog (L_CRIT, _("%s: unable to change to specified root directory."), ::conf.change_root);
454 return false;
455 }
456 }
457
458 if (chroot ("."))
459 {
460 slog (L_CRIT, _("unable to set new root directory."));
461 return false;
462 }
463
464 if (chdir ("/"))
465 {
466 slog (L_CRIT, _("unable to set cwd to new root directory."));
467 return false;
468 }
469 }
470
471 if (::conf.change_gid)
472 if (setgid (::conf.change_gid))
473 {
474 slog (L_CRIT, _("unable to change group id to %d."), ::conf.change_gid);
475 return false;
476 }
477
478 if (::conf.change_uid)
479 if (setuid (::conf.change_uid))
480 {
481 slog (L_CRIT, _("unable to change user id to %d."), ::conf.change_uid);
482 return false;
483 }
484
485 return true;
367} 486}
368 487
369bool 488bool
370vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 489vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
371{ 490{
372 set_tos (ipv4_fd, ipv4_tos, tos); 491 set_tos (ipv4_fd, ipv4_tos, tos);
373 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 492 xsendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
374 493
375 return true; 494 return true;
376} 495}
377 496
378static u16 497static u16
… …
409 hdr->code = 255; 528 hdr->code = 255;
410 hdr->checksum = 0; 529 hdr->checksum = 0;
411 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 530 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
412 531
413 set_tos (icmpv4_fd, icmpv4_tos, tos); 532 set_tos (icmpv4_fd, icmpv4_tos, tos);
414 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 533 xsendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
415 534
416 return true; 535 return true;
417} 536}
418#endif 537#endif
419 538
420bool 539bool
421vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 540vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
422{ 541{
423 set_tos (udpv4_fd, udpv4_tos, tos); 542 set_tos (udpv4_fd, udpv4_tos, tos);
424 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 543 xsendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
425 544
426 return true; 545 return true;
427} 546}
428 547
429void 548void
… …
449vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 568vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
450{ 569{
451 unsigned int src = pkt->src (); 570 unsigned int src = pkt->src ();
452 unsigned int dst = pkt->dst (); 571 unsigned int dst = pkt->dst ();
453 572
454 slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d"), 573 slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d."),
455 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len); 574 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);
456 575
457 if (src == 0 || src > conns.size () 576 if (src == 0 || src > conns.size ()
458 || dst > conns.size () 577 || dst > conns.size ()
459 || pkt->typ () >= vpn_packet::PT_MAX) 578 || pkt->typ () >= vpn_packet::PT_MAX)
460 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), 579 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)."),
461 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
462 else if (dst > conns.size ())
463 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
464 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 580 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
465 else 581 else
466 { 582 {
467 connection *c = conns[src - 1]; 583 connection *c = conns[src - 1];
468 584
469 if (dst == 0) 585 if (dst == 0)
470 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"), 586 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)."),
471 c->conf->nodename, (const char *)rsi); 587 c->conf->nodename, (const char *)rsi);
472 else if (dst != THISNODE->id) 588 else if (dst != THISNODE->id)
473 { 589 {
474 if (THISNODE->routerprio) 590 if (THISNODE->routerprio)
475 // the tos setting gets lost here. who cares. 591 // the tos setting gets lost here. who cares.
476 conns[dst - 1]->inject_vpn_packet (pkt); 592 conns[dst - 1]->inject_vpn_packet (pkt);
477 else 593 else
478 slog (L_WARN, 594 slog (L_WARN,
479 _("%s(%s): forwarding request (=> %s), but we are no router"), 595 _("%s(%s): request to forward packet to %s, but we are no router (config mismatch?)."),
480 c->conf->nodename, (const char *)rsi, 596 c->conf->nodename, (const char *)rsi,
481 conns[dst - 1]->conf->nodename); 597 conns[dst - 1]->conf->nodename);
482 } 598 }
483 else 599 else
484 c->recv_vpn_packet (pkt, rsi); 600 c->recv_vpn_packet (pkt, rsi);
… …
489vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 605vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
490{ 606{
491 switch (si.prot) 607 switch (si.prot)
492 { 608 {
493 case PROT_IPv4: 609 case PROT_IPv4:
494 return send_ipv4_packet (pkt, si, tos); 610 return send_ipv4_packet (pkt, si, tos);
495 611
496 case PROT_UDPv4: 612 case PROT_UDPv4:
497 return send_udpv4_packet (pkt, si, tos); 613 return send_udpv4_packet (pkt, si, tos);
498 614
499#if ENABLE_TCP 615#if ENABLE_TCP
500 case PROT_TCPv4: 616 case PROT_TCPv4:
501 return send_tcpv4_packet (pkt, si, tos); 617 return send_tcpv4_packet (pkt, si, tos);
502#endif 618#endif
503#if ENABLE_ICMP 619#if ENABLE_ICMP
504 case PROT_ICMPv4: 620 case PROT_ICMPv4:
505 return send_icmpv4_packet (pkt, si, tos); 621 return send_icmpv4_packet (pkt, si, tos);
506#endif 622#endif
507#if ENABLE_DNS 623#if ENABLE_DNS
508 case PROT_DNSv4: 624 case PROT_DNSv4:
509 return send_dnsv4_packet (pkt, si, tos); 625 return send_dnsv4_packet (pkt, si, tos);
510#endif 626#endif
511 default: 627 default:
512 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si); 628 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol."), (const char *)si);
513 } 629 }
514 630
515 return false; 631 return false;
516} 632}
517 633
… …
532 if (len > 0) 648 if (len > 0)
533 { 649 {
534 pkt->len = len; 650 pkt->len = len;
535 651
536 // raw sockets deliver the ipv4 header, but don't expect it on sends 652 // raw sockets deliver the ipv4 header, but don't expect it on sends
537 pkt->skip_hdr (IP_OVERHEAD); 653 pkt->skip_hdr (pkt->ipv4_hdr_len ());
538 654
539 recv_vpn_packet (pkt, si); 655 recv_vpn_packet (pkt, si);
540 } 656 }
541 else 657 else
542 { 658 {
543 // probably ECONNRESET or somesuch 659 // probably ECONNRESET or somesuch
544 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 660 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
545 } 661 }
546 662
547 delete pkt; 663 delete pkt;
548 } 664 }
549 else 665 else
550 { 666 {
551 slog (L_ERR, 667 slog (L_ERR,
552 _("FATAL: unknown revents %08x in socket, terminating\n"), 668 _("FATAL: unknown revents %08x in socket, exiting.\n"),
553 revents); 669 revents);
554 exit (EXIT_FAILURE); 670 exit (EXIT_FAILURE);
555 } 671 }
556} 672}
557 673
… …
579 if (hdr->type == ::conf.icmp_type 695 if (hdr->type == ::conf.icmp_type
580 && hdr->code == 255) 696 && hdr->code == 255)
581 { 697 {
582 // raw sockets deliver the ipv4, but don't expect it on sends 698 // raw sockets deliver the ipv4, but don't expect it on sends
583 // this is slow, but... 699 // this is slow, but...
584 pkt->skip_hdr (ICMP_OVERHEAD); 700 pkt->skip_hdr (pkt->ipv4_hdr_len () + (ICMP_OVERHEAD - IP_OVERHEAD));
585 701
586 recv_vpn_packet (pkt, si); 702 recv_vpn_packet (pkt, si);
587 } 703 }
588 } 704 }
589 else 705 else
590 { 706 {
591 // probably ECONNRESET or somesuch 707 // probably ECONNRESET or somesuch
592 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 708 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
593 } 709 }
594 710
595 delete pkt; 711 delete pkt;
596 } 712 }
597 else 713 else
598 { 714 {
599 slog (L_ERR, 715 slog (L_ERR,
600 _("FATAL: unknown revents %08x in socket, terminating\n"), 716 _("FATAL: unknown revents %08x in socket, exiting.\n"),
601 revents); 717 revents);
602 exit (EXIT_FAILURE); 718 exit (EXIT_FAILURE);
603 } 719 }
604} 720}
605#endif 721#endif
… …
625 recv_vpn_packet (pkt, si); 741 recv_vpn_packet (pkt, si);
626 } 742 }
627 else 743 else
628 { 744 {
629 // probably ECONNRESET or somesuch 745 // probably ECONNRESET or somesuch
630 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 746 slog (L_DEBUG, _("%s: fd %d, %s."), (const char *)si, w.fd, strerror (errno));
631 } 747 }
632 748
633 delete pkt; 749 delete pkt;
634 } 750 }
635 else 751 else
636 { 752 {
637 slog (L_ERR, 753 slog (L_ERR,
638 _("FATAL: unknown revents %08x in socket, terminating\n"), 754 _("FATAL: unknown revents %08x in socket, exiting.\n"),
639 revents); 755 revents);
640 exit (EXIT_FAILURE); 756 exit (EXIT_FAILURE);
641 } 757 }
642} 758}
643 759
… …
692 { 808 {
693 slog (L_INFO, _("preparing shutdown...")); 809 slog (L_INFO, _("preparing shutdown..."));
694 810
695 shutdown_all (); 811 shutdown_all ();
696 remove_pid (conf.pidfilename); 812 remove_pid (conf.pidfilename);
697 slog (L_INFO, _("terminating")); 813 slog (L_INFO, _("exiting."));
698 exit (EXIT_SUCCESS); 814 exit (EXIT_SUCCESS);
699 } 815 }
700 816
701 if (events & EVENT_RECONNECT) 817 if (events & EVENT_RECONNECT)
702 { 818 {
703 slog (L_INFO, _("forced reconnect")); 819 slog (L_INFO, _("forced reconnect."));
704 820
705 reconnect_all (); 821 reconnect_all ();
706 } 822 }
707 823
708 events = 0; 824 events = 0;
… …
724 840
725 conns.clear (); 841 conns.clear ();
726 842
727 connection_init (); 843 connection_init ();
728 844
729 for (configuration::node_vector::iterator i = conf.nodes.begin (); 845 for (configuration::node_vector::iterator i = conf.nodes.begin (); i != conf.nodes.end (); ++i)
730 i != conf.nodes.end (); ++i) 846 conns.push_back (new connection (this, *i));
731 { 847
732 connection *conn = new connection (this, *i); 848 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
733 conns.push_back (conn);
734 conn->establish_connection (); 849 (*c)->establish_connection ();
735 }
736} 850}
737 851
738connection *vpn::find_router () 852bool
853vpn::can_direct (conf_node *src, conf_node *dst) const
739{ 854{
740 u32 prio = 1; 855 return src != dst
856 && src->may_direct (dst)
857 && dst->may_direct (src)
858 && (((src->protocols & dst->protocols) && src->connectmode == conf_node::C_ALWAYS)
859 || (src->protocols & dst->connectable_protocols ()));
860}
861
862// only works for indirect and routed connections: find a router
863// from THISNODE to dst
864connection *
865vpn::find_router_for (const connection *dst)
866{
741 connection *router = 0; 867 connection *router = 0;
742 868
869 // first try to find a router with a direct connection, route there
870 // regardless of any other considerations.
871 {
872 u32 prio = 1;
873
874 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
875 {
876 connection *c = *i;
877
878 if (c->conf->routerprio > prio
879 && c->conf != THISNODE
880 && can_direct (c->conf, dst->conf)
881 && c->ictx && c->octx)
882 {
883 prio = c->conf->routerprio;
884 router = c;
885 }
886 }
887 }
888
889 if (router)
890 return router;
891
892 // second try find the router with the highest priority, higher than ours
893 {
894 u32 prio = THISNODE->routerprio ? THISNODE->routerprio : 1;
895
896 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
897 {
898 connection *c = *i;
899
900 if (c->conf->routerprio > prio
901 && c != dst
902 && c->conf != THISNODE
903 && c->ictx && c->octx)
904 {
905 prio = c->conf->routerprio;
906 router = c;
907 }
908 }
909 }
910
911 return router;
912}
913
914void
915vpn::connection_established (connection *c)
916{
743 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 917 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
744 { 918 {
745 connection *c = *i; 919 connection *o = *i;
746 920
747 if (c->conf->routerprio > prio 921 if (o->si.valid ()
748 && c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use 922 && c->si != o->si
749 && c->ictx && c->octx 923 && c == find_router_for (o)
750 && c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode 924 && !can_direct (THISNODE, o->conf))
751 {
752 prio = c->conf->routerprio;
753 router = c;
754 } 925 {
926 slog (L_DEBUG, _("%s: can now route packets via %s, re-keying connection."),
927 o->conf->nodename, c->conf->nodename);
928 o->rekey ();
929 }
755 } 930 }
756
757 return router;
758} 931}
759 932
933void
760void vpn::send_connect_request (int id) 934vpn::send_connect_request (connection *c)
761{ 935{
762 connection *c = find_router (); 936 connection *r = find_router_for (c);
763 937
764 if (c) 938 if (r)
939 {
940 slog (L_TRACE, _("%s: no address known, sending mediated connection request via %s."),
941 c->conf->nodename, r->conf->nodename);
765 c->send_connect_request (id); 942 r->send_connect_request (c->conf->id);
943 }
766 else 944 else
767 // no router found, aggressively connect to all routers 945 slog (L_DEBUG, _("%s: no way to connect and no router found: unable to connect at this time."),
768 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 946 c->conf->nodename);
769 if ((*i)->conf->routerprio && (*i)->conf != THISNODE)
770 (*i)->establish_connection ();
771} 947}
772 948
773void 949void
774connection::dump_status () 950connection::dump_status ()
775{ 951{

Diff Legend

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