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.52 by pcg, Sun Aug 10 22:18:58 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{
… …
129 ipv4_tos = -1; 175 ipv4_tos = -1;
130 ipv4_fd = -1; 176 ipv4_fd = -1;
131 177
132 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 178 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
133 { 179 {
134 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 180 ipv4_fd = setup_socket (PROT_IPv4, PF_INET, SOCK_RAW, ::conf.ip_proto);
135 181
136 if (ipv4_fd < 0) 182 if (ipv4_fd < 0)
137 return -1; 183 return -1;
138
139 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
140 fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
141 184
142#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 185#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
143 // this I really consider a linux bug. I am neither connected 186 // this I really consider a linux bug. I am neither connected
144 // 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
145 // fragment for me sometimes. 188 // fragment for me sometimes.
… …
152 sockinfo si (THISNODE, PROT_IPv4); 195 sockinfo si (THISNODE, PROT_IPv4);
153 196
154 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 197 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
155 { 198 {
156 slog (L_ERR, _("can't bind ipv4 socket on %s: %s, exiting."), (const char *)si, strerror (errno)); 199 slog (L_ERR, _("can't bind ipv4 socket on %s: %s, exiting."), (const char *)si, strerror (errno));
157 exit (EXIT_FAILURE); 200 return -1;
158 } 201 }
159 202
160 ipv4_ev_watcher.start (ipv4_fd, EV_READ); 203 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
161 ++success; 204 ++success;
162 } 205 }
… …
166 udpv4_tos = -1; 209 udpv4_tos = -1;
167 udpv4_fd = -1; 210 udpv4_fd = -1;
168 211
169 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 212 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
170 { 213 {
171 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 214 udpv4_fd = setup_socket (PROT_UDPv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
172 215
173 if (udpv4_fd < 0) 216 if (udpv4_fd < 0)
174 return -1; 217 return -1;
175
176 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
177 fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
178 218
179 // standard daemon practise... 219 // standard daemon practise...
180 { 220 {
181 int oval = 1; 221 int oval = 1;
182 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 222 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
195 sockinfo si (THISNODE, PROT_UDPv4); 235 sockinfo si (THISNODE, PROT_UDPv4);
196 236
197 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 237 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
198 { 238 {
199 slog (L_ERR, _("can't bind udpv4 on %s: %s, exiting."), (const char *)si, strerror (errno)); 239 slog (L_ERR, _("can't bind udpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
200 exit (EXIT_FAILURE); 240 return -1;
201 } 241 }
202 242
203 udpv4_ev_watcher.start (udpv4_fd, EV_READ); 243 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
204 ++success; 244 ++success;
205 } 245 }
… …
210 icmpv4_fd = -1; 250 icmpv4_fd = -1;
211 251
212#if ENABLE_ICMP 252#if ENABLE_ICMP
213 if (THISNODE->protocols & PROT_ICMPv4) 253 if (THISNODE->protocols & PROT_ICMPv4)
214 { 254 {
215 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 255 icmpv4_fd = setup_socket (PROT_ICMPv4, PF_INET, SOCK_RAW, IPPROTO_ICMP);
216 256
217 if (icmpv4_fd < 0) 257 if (icmpv4_fd < 0)
218 return -1; 258 return -1;
219 259
220 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
221 fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
222
223#ifdef ICMP_FILTER 260#ifdef ICMP_FILTER
224 { 261 {
225 icmp_filter oval; 262 icmp_filter oval;
226 oval.data = 0xffffffff; 263 oval.data = 0;
227 if (::conf.icmp_type < 32) 264 if (::conf.icmp_type < 32)
228 oval.data &= ~(1 << ::conf.icmp_type); 265 oval.data |= 1 << ::conf.icmp_type;
266 oval.data = ~oval.data;
229 267
230 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval); 268 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
231 } 269 }
232#endif 270#endif
233 271
… …
244 sockinfo si (THISNODE, PROT_ICMPv4); 282 sockinfo si (THISNODE, PROT_ICMPv4);
245 283
246 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 284 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
247 { 285 {
248 slog (L_ERR, _("can't bind icmpv4 on %s: %s, exiting."), (const char *)si, strerror (errno)); 286 slog (L_ERR, _("can't bind icmpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
249 exit (EXIT_FAILURE); 287 return -1;
250 } 288 }
251 289
252 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ); 290 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
253 ++success; 291 ++success;
254 } 292 }
… …
257 tcpv4_fd = -1; 295 tcpv4_fd = -1;
258 296
259#if ENABLE_TCP 297#if ENABLE_TCP
260 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port) 298 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
261 { 299 {
262 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 300 tcpv4_fd = setup_socket (PROT_TCPv4, PF_INET, SOCK_STREAM, IPPROTO_TCP);
263 301
264 if (tcpv4_fd < 0) 302 if (tcpv4_fd < 0)
265 return -1; 303 return -1;
266 304
267 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
268 fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
269
270 // standard daemon practise... 305 // standard daemon practise...
271 { 306 {
272 int oval = 1; 307 int oval = 1;
273 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 308 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
274 } 309 }
… …
276 sockinfo si (THISNODE, PROT_TCPv4); 311 sockinfo si (THISNODE, PROT_TCPv4);
277 312
278 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 313 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
279 { 314 {
280 slog (L_ERR, _("can't bind tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno)); 315 slog (L_ERR, _("can't bind tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
281 exit (EXIT_FAILURE); 316 return -1;
282 } 317 }
283 318
284 if (listen (tcpv4_fd, 5)) 319 if (listen (tcpv4_fd, 5))
285 { 320 {
286 slog (L_ERR, _("can't listen tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno)); 321 slog (L_ERR, _("can't listen tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
287 exit (EXIT_FAILURE); 322 return -1;
288 } 323 }
289 324
290 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ); 325 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
291 ++success; 326 ++success;
292 } 327 }
… …
300#if ENABLE_DNS 335#if ENABLE_DNS
301 if (THISNODE->protocols & PROT_DNSv4) 336 if (THISNODE->protocols & PROT_DNSv4)
302 { 337 {
303 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);
304 339
305 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 340 dnsv4_fd = setup_socket (PROT_DNSv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
306 341
307 if (dnsv4_fd < 0) 342 if (dnsv4_fd < 0)
308 return -1; 343 return -1;
309
310 fcntl (dnsv4_fd, F_SETFL, O_NONBLOCK);
311 fcntl (dnsv4_fd, F_SETFD, FD_CLOEXEC);
312 344
313# if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 345# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
314 // this I really consider a linux bug. I am neither connected 346 // this I really consider a linux bug. I am neither connected
315 // 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
316 // fragment for me sometimes. 348 // fragment for me sometimes.
… …
331 PROT_DNSv4); 363 PROT_DNSv4);
332 364
333 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ())) 365 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
334 { 366 {
335 slog (L_ERR, _("can't bind dnsv4 on %s: %s, exiting."), (const char *)si, strerror (errno)); 367 slog (L_ERR, _("can't bind dnsv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
336 exit (EXIT_FAILURE); 368 return -1;
337 } 369 }
338 370
339 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ); 371 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
340 ++success; 372 ++success;
341 } 373 }
… …
343 375
344 ///////////////////////////////////////////////////////////////////////////// 376 /////////////////////////////////////////////////////////////////////////////
345 377
346 if (!success) 378 if (!success)
347 { 379 {
348 slog (L_ERR, _("no protocols enabled, exiting.")); 380 slog (L_ERR, _("no protocols enabled."));
349 exit (EXIT_FAILURE); 381 return -1;
350 } 382 }
351 383
352 reconnect_all (); 384 reconnect_all ();
353 385
354 ///////////////////////////////////////////////////////////////////////////// 386 /////////////////////////////////////////////////////////////////////////////
355 387
356 tap = new tap_device (); 388 tap = new tap_device ();
357 if (!tap) //D this, of course, never catches 389 if (!tap) //D this, of course, never catches
358 { 390 {
359 slog (L_ERR, _("cannot create network interface '%s', exiting."), conf.ifname); 391 slog (L_ERR, _("cannot create network interface '%s'."), conf.ifname);
360 exit (EXIT_FAILURE); 392 return -1;
361 } 393 }
362 394
363 fcntl (tap->fd, F_SETFD, FD_CLOEXEC); 395 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
364 396
365 run_script_cb cb; 397 run_script_cb cb;
366 cb.set<vpn, &vpn::script_if_init> (this); 398 cb.set<vpn, &vpn::script_if_init> (this);
367 399
368 if (tap->if_up () && 400 if (tap->if_up () &&
369 !run_script (cb, true)) 401 !run_script (cb, true))
370 { 402 {
371 slog (L_ERR, _("interface initialization command '%s' failed, exiting."), 403 slog (L_ERR, _("interface initialization command '%s' failed."),
372 tap->if_up ()); 404 tap->if_up ());
373 exit (EXIT_FAILURE); 405 return -1;
374 } 406 }
375 407
376 cb.set<vpn, &vpn::script_if_up> (this); 408 cb.set<vpn, &vpn::script_if_up> (this);
377 if (!run_script (cb, true)) 409 if (!run_script (cb, true))
378 { 410 {
379 slog (L_ERR, _("if-up command execution failed, exiting.")); 411 slog (L_ERR, _("if-up command execution failed."));
380 exit (EXIT_FAILURE); 412 return -1;
381 } 413 }
382 414
383 tap_ev_watcher.start (tap->fd, EV_READ); 415 tap_ev_watcher.start (tap->fd, EV_READ);
384 416
385 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;
386} 486}
387 487
388bool 488bool
389vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 489vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
390{ 490{
391 set_tos (ipv4_fd, ipv4_tos, tos); 491 set_tos (ipv4_fd, ipv4_tos, tos);
392 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 ());
393 493
394 return true; 494 return true;
395} 495}
396 496
397static u16 497static u16
… …
428 hdr->code = 255; 528 hdr->code = 255;
429 hdr->checksum = 0; 529 hdr->checksum = 0;
430 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 530 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
431 531
432 set_tos (icmpv4_fd, icmpv4_tos, tos); 532 set_tos (icmpv4_fd, icmpv4_tos, tos);
433 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 ());
434 534
435 return true; 535 return true;
436} 536}
437#endif 537#endif
438 538
439bool 539bool
440vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 540vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
441{ 541{
442 set_tos (udpv4_fd, udpv4_tos, tos); 542 set_tos (udpv4_fd, udpv4_tos, tos);
443 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 ());
444 544
445 return true; 545 return true;
446} 546}
447 547
448void 548void
… …
474 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len); 574 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);
475 575
476 if (src == 0 || src > conns.size () 576 if (src == 0 || src > conns.size ()
477 || dst > conns.size () 577 || dst > conns.size ()
478 || pkt->typ () >= vpn_packet::PT_MAX) 578 || pkt->typ () >= vpn_packet::PT_MAX)
479 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)."),
480 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
481 else if (dst > conns.size ())
482 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)."),
483 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 580 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
484 else 581 else
485 { 582 {
486 connection *c = conns[src - 1]; 583 connection *c = conns[src - 1];
… …
508vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 605vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
509{ 606{
510 switch (si.prot) 607 switch (si.prot)
511 { 608 {
512 case PROT_IPv4: 609 case PROT_IPv4:
513 return send_ipv4_packet (pkt, si, tos); 610 return send_ipv4_packet (pkt, si, tos);
514 611
515 case PROT_UDPv4: 612 case PROT_UDPv4:
516 return send_udpv4_packet (pkt, si, tos); 613 return send_udpv4_packet (pkt, si, tos);
517 614
518#if ENABLE_TCP 615#if ENABLE_TCP
519 case PROT_TCPv4: 616 case PROT_TCPv4:
520 return send_tcpv4_packet (pkt, si, tos); 617 return send_tcpv4_packet (pkt, si, tos);
521#endif 618#endif
522#if ENABLE_ICMP 619#if ENABLE_ICMP
523 case PROT_ICMPv4: 620 case PROT_ICMPv4:
524 return send_icmpv4_packet (pkt, si, tos); 621 return send_icmpv4_packet (pkt, si, tos);
525#endif 622#endif
526#if ENABLE_DNS 623#if ENABLE_DNS
527 case PROT_DNSv4: 624 case PROT_DNSv4:
528 return send_dnsv4_packet (pkt, si, tos); 625 return send_dnsv4_packet (pkt, si, tos);
529#endif 626#endif
530 default: 627 default:
531 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);
532 } 629 }
533 630
… …
551 if (len > 0) 648 if (len > 0)
552 { 649 {
553 pkt->len = len; 650 pkt->len = len;
554 651
555 // 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
556 pkt->skip_hdr (IP_OVERHEAD); 653 pkt->skip_hdr (pkt->ipv4_hdr_len ());
557 654
558 recv_vpn_packet (pkt, si); 655 recv_vpn_packet (pkt, si);
559 } 656 }
560 else 657 else
561 { 658 {
… …
598 if (hdr->type == ::conf.icmp_type 695 if (hdr->type == ::conf.icmp_type
599 && hdr->code == 255) 696 && hdr->code == 255)
600 { 697 {
601 // 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
602 // this is slow, but... 699 // this is slow, but...
603 pkt->skip_hdr (ICMP_OVERHEAD); 700 pkt->skip_hdr (pkt->ipv4_hdr_len () + (ICMP_OVERHEAD - IP_OVERHEAD));
604 701
605 recv_vpn_packet (pkt, si); 702 recv_vpn_packet (pkt, si);
606 } 703 }
607 } 704 }
608 else 705 else
… …
750 847
751 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 848 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
752 (*c)->establish_connection (); 849 (*c)->establish_connection ();
753} 850}
754 851
852bool
755bool vpn::can_direct (conf_node *src, conf_node *dst) const 853vpn::can_direct (conf_node *src, conf_node *dst) const
756{ 854{
757 return src != dst 855 return src != dst
758 && src->may_direct (dst) 856 && src->may_direct (dst)
759 && dst->may_direct (src) 857 && dst->may_direct (src)
760 && (((src->protocols & dst->protocols) && src->connectmode == conf_node::C_ALWAYS) 858 && (((src->protocols & dst->protocols) && src->connectmode == conf_node::C_ALWAYS)
761 || (src->protocols & dst->connectable_protocols ())); 859 || (src->protocols & dst->connectable_protocols ()));
762} 860}
763 861
764// only works for indirect and routed connections: find a router 862// only works for indirect and routed connections: find a router
765// from THISNODE to dst 863// from THISNODE to dst
864connection *
766connection *vpn::find_router_for (const connection *dst) 865vpn::find_router_for (const connection *dst)
767{ 866{
768 connection *router = 0; 867 connection *router = 0;
769 868
770 // first try to find a router with a direct connection, route there 869 // first try to find a router with a direct connection, route there
771 // regardless of any other considerations. 870 // regardless of any other considerations.
… …
810 } 909 }
811 910
812 return router; 911 return router;
813} 912}
814 913
914void
815void vpn::connection_established (connection *c) 915vpn::connection_established (connection *c)
816{ 916{
817 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 917 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
818 { 918 {
819 connection *o = *i; 919 connection *o = *i;
820 920
821 if (!o->is_direct
822 && o->si.valid () 921 if (o->si.valid ()
823 && c->si != o->si 922 && c->si != o->si
824 && c == find_router_for (o)) 923 && c == find_router_for (o)
924 && !can_direct (THISNODE, o->conf))
825 { 925 {
826 slog (L_DEBUG, _("%s: can now route packets via %s, re-keying connection."), 926 slog (L_DEBUG, _("%s: can now route packets via %s, re-keying connection."),
827 o->conf->nodename, c->conf->nodename); 927 o->conf->nodename, c->conf->nodename);
828 o->rekey (); 928 o->rekey ();
829 } 929 }
830 } 930 }
831} 931}
832 932
933void
833void vpn::send_connect_request (connection *c) 934vpn::send_connect_request (connection *c)
834{ 935{
835 connection *r = find_router_for (c); 936 connection *r = find_router_for (c);
836 937
837 if (r) 938 if (r)
838 { 939 {
839 slog (L_TRACE, _("%s: no way to connect, sending mediated connection request via %s."), 940 slog (L_TRACE, _("%s: no address known, sending mediated connection request via %s."),
840 c->conf->nodename, r->conf->nodename); 941 c->conf->nodename, r->conf->nodename);
841 r->send_connect_request (c->conf->id); 942 r->send_connect_request (c->conf->id);
842 } 943 }
843 else 944 else
844 slog (L_DEBUG, _("%s: no way to connect and no router found: unable to connect."), 945 slog (L_DEBUG, _("%s: no way to connect and no router found: unable to connect at this time."),
845 c->conf->nodename); 946 c->conf->nodename);
846} 947}
847 948
848void 949void
849connection::dump_status () 950connection::dump_status ()

Diff Legend

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