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.3 by pcg, Wed Apr 2 21:02:25 2003 UTC vs.
Revision 1.71 by root, Thu Oct 6 03:25:54 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,2010,2011,2013 Marc Lehmann <gvpe@schmorp.de>
3 4
5 This file is part of GVPE.
6
4 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
5 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
6 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
7 (at your option) any later version. 10 option) any later version.
8 11
9 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
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
12 GNU General Public License for more details. 15 Public License for more details.
13 16
14 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
15 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
16 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 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.
17*/ 30*/
18 31
19#include "config.h" 32#include "config.h"
20 33
21#include <list> 34#include <list>
22 35
36#include <cstdio>
37#include <cstring>
23#include <cstdlib> 38#include <cstdlib>
24#include <cstring>
25#include <cstdio>
26 39
27#include <sys/types.h> 40#include <sys/types.h>
28#include <sys/socket.h> 41#include <sys/socket.h>
29#include <sys/poll.h>
30#include <sys/wait.h> 42#include <sys/wait.h>
31#include <netinet/in.h> 43#include <sys/stat.h>
32#include <arpa/inet.h>
33#include <errno.h> 44#include <errno.h>
34#include <time.h> 45#include <time.h>
35#include <unistd.h> 46#include <unistd.h>
47#include <fcntl.h>
48#include <sys/socket.h>
49
50#include "netcompat.h"
36 51
37#include "pidfile.h" 52#include "pidfile.h"
38 53
39#include "connection.h" 54#include "connection.h"
40#include "util.h" 55#include "util.h"
41#include "vpn.h" 56#include "vpn.h"
42 57
43#if ENABLE_TCP 58using namespace std;
44# include <map> 59
45# include <unistd.h> 60vpn network; // THE vpn (bad design...)
46# include <fcntl.h>
47# include <sys/poll.h>
48#endif
49 61
50///////////////////////////////////////////////////////////////////////////// 62/////////////////////////////////////////////////////////////////////////////
51 63
52const char *vpn::script_if_up () 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}
87
88/////////////////////////////////////////////////////////////////////////////
89
90static void inline
91set_tos (int fd, int &tos_prev, int tos)
92{
93#if defined(SOL_IP) && defined(IP_TOS)
94 if (tos_prev == tos)
95 return;
96
97 tos_prev = tos;
98 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
99#endif
100}
101
102void
103vpn::script_init_env ()
53{ 104{
54 // the tunnel device mtu should be the physical mtu - overhead 105 // the tunnel device mtu should be the physical mtu - overhead
55 // the tricky part is rounding to the cipher key blocksize 106 // the tricky part is rounding to the cipher key blocksize
56 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD; 107 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
57 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 108 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
58 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 109 mtu -= mtu % BLOCK_SIZE (CIPHER); // round
59 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 110 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
60 111
61 char *env; 112 char *env;
62 asprintf (&env, "CONFBASE=%s", confbase); 113 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
63 putenv (env);
64 asprintf (&env, "NODENAME=%s", THISNODE->nodename);
65 putenv (env);
66 asprintf (&env, "NODEID=%d", THISNODE->id);
67 putenv (env);
68 asprintf (&env, "IFNAME=%s", tap->interface ()); 114 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
69 putenv (env); 115 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
116 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
70 asprintf (&env, "MTU=%d", mtu); 117 asprintf (&env, "MTU=%d", mtu); putenv (env);
71 putenv (env); 118 asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
72 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 119 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
73 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
74 THISNODE->id & 0xff);
75 putenv (env);
76 120
77 return ::conf.script_if_up ? ::conf.script_if_up : "if-up"; 121 conns [THISNODE->id - 1]->script_init_env ("");
122
123 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
124 {
125 char ext[16];
126 snprintf (ext, 16, "_%d", (*c)->conf->id);
127 (*c)->script_init_env (ext);
128 }
129}
130
131inline const char *
132vpn::script_if_init ()
133{
134 script_init_env ();
135
136 return tap->if_up ();
137}
138
139inline const char *
140vpn::script_if_up ()
141{
142 script_init_env ();
143
144 return conf.config_filename (::conf.script_if_up, "if-up");
145}
146
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;
78} 168}
79 169
80int 170int
81vpn::setup () 171vpn::setup ()
82{ 172{
173 int success = 0;
174
175 ipv4_tos = -1;
83 udpv4_fd = -1; 176 ipv4_fd = -1;
84 177
85 if (THISNODE->protocols & PROT_UDPv4) 178 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
86 { 179 {
87 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 180 ipv4_fd = setup_socket (PROT_IPv4, PF_INET, SOCK_RAW, ::conf.ip_proto);
88 181
89 if (udpv4_fd < 0) 182 if (ipv4_fd < 0)
90 return -1; 183 return -1;
91 184
92 // standard daemon practise... 185#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
93 {
94 int oval = 1;
95 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
96 }
97
98 sockinfo si (THISNODE, PROT_UDPv4);
99
100 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
101 {
102 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
103 exit (1);
104 }
105
106#ifdef IP_MTU_DISCOVER
107 // this I really consider a linux bug. I am neither connected 186 // this I really consider a linux bug. I am neither connected
108 // 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
109 // fragment for me sometimes. 188 // fragment for me sometimes.
110 { 189 {
111 int oval = IP_PMTUDISC_DONT; 190 int oval = IP_PMTUDISC_DONT;
112 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 191 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
192 }
193#endif
194
195 sockinfo si (THISNODE, PROT_IPv4);
196
197 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
198 {
199 slog (L_ERR, _("can't bind ipv4 socket on %s: %s, exiting."), (const char *)si, strerror (errno));
200 return -1;
113 } 201 }
114#endif
115 202
116 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 203 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
204 ++success;
117 } 205 }
206 else
207 THISNODE->protocols &= ~PROT_IPv4;
118 208
209 udpv4_tos = -1;
119 ipv4_fd = -1; 210 udpv4_fd = -1;
120 if (THISNODE->protocols & PROT_IPv4)
121 {
122 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
123 211
212 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
213 {
214 udpv4_fd = setup_socket (PROT_UDPv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
215
124 if (ipv4_fd < 0) 216 if (udpv4_fd < 0)
125 return -1; 217 return -1;
126 218
127 sockinfo si (THISNODE, PROT_IPv4); 219 // standard daemon practise...
128
129 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
130 { 220 {
131 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 221 int oval = 1;
132 exit (1); 222 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
133 } 223 }
134 224
135#ifdef IP_MTU_DISCOVER 225#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
136 // this I really consider a linux bug. I am neither connected 226 // this I really consider a linux bug. I am neither connected
137 // nor do I fragment myself. Linux still sets DF and doesn't 227 // nor do I fragment myself. Linux still sets DF and doesn't
138 // fragment for me sometimes. 228 // fragment for me sometimes.
139 { 229 {
140 int oval = IP_PMTUDISC_DONT; 230 int oval = IP_PMTUDISC_DONT;
231 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
232 }
233#endif
234
235 sockinfo si (THISNODE, PROT_UDPv4);
236
237 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
238 {
239 slog (L_ERR, _("can't bind udpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
240 return -1;
241 }
242
243 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
244 ++success;
245 }
246 else
247 THISNODE->protocols &= ~PROT_UDPv4;
248
249 icmpv4_tos = -1;
250 icmpv4_fd = -1;
251
252#if ENABLE_ICMP
253 if (THISNODE->protocols & PROT_ICMPv4)
254 {
255 icmpv4_fd = setup_socket (PROT_ICMPv4, PF_INET, SOCK_RAW, IPPROTO_ICMP);
256
257 if (icmpv4_fd < 0)
258 return -1;
259
260// no clue where trhis is actually defined
261#if !defined(ICMP_FILTER) && defined(__linux)
262 #define ICMP_FILTER 1
263#endif
264
265#ifdef ICMP_FILTER
266 {
267 uint32_t oval;
268 oval = 0;
269 if (::conf.icmp_type < 32)
270 oval |= 1 << ::conf.icmp_type;
271 oval = ~oval;
272
273 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
274 }
275#endif
276
277#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
278 // this I really consider a linux bug. I am neither connected
279 // nor do I fragment myself. Linux still sets DF and doesn't
280 // fragment for me sometimes.
281 {
282 int oval = IP_PMTUDISC_DONT;
141 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 283 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
284 }
285#endif
286
287 sockinfo si (THISNODE, PROT_ICMPv4);
288
289 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
290 {
291 slog (L_ERR, _("can't bind icmpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
292 return -1;
142 } 293 }
143#endif
144 294
145 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 295 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
296 ++success;
146 } 297 }
298#endif
299
300 tcpv4_fd = -1;
147 301
148#if ENABLE_TCP 302#if ENABLE_TCP
149 if (THISNODE->protocols & PROT_TCPv4) 303 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
150 { 304 {
151 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 305 tcpv4_fd = setup_socket (PROT_TCPv4, PF_INET, SOCK_STREAM, IPPROTO_TCP);
152 306
153 if (tcpv4_fd < 0) 307 if (tcpv4_fd < 0)
154 return -1; 308 return -1;
155 309
156 // standard daemon practise... 310 // standard daemon practise...
161 315
162 sockinfo si (THISNODE, PROT_TCPv4); 316 sockinfo si (THISNODE, PROT_TCPv4);
163 317
164 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 318 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
165 { 319 {
166 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 320 slog (L_ERR, _("can't bind tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
167 exit (1); 321 return -1;
168 } 322 }
169 323
170 if (listen (tcpv4_fd, 5)) 324 if (listen (tcpv4_fd, 5))
171 { 325 {
172 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 326 slog (L_ERR, _("can't listen tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
173 exit (1); 327 return -1;
328 }
329
330 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
331 ++success;
332 }
333 else
334 THISNODE->protocols &= ~PROT_TCPv4;
335#endif
336
337 dnsv4_tos = -1;
338 dnsv4_fd = -1;
339
340#if ENABLE_DNS
341 if (THISNODE->protocols & PROT_DNSv4)
342 {
343 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
344
345 dnsv4_fd = setup_socket (PROT_DNSv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
346
347 if (dnsv4_fd < 0)
348 return -1;
349
350# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
351 // this I really consider a linux bug. I am neither connected
352 // nor do I fragment myself. Linux still sets DF and doesn't
353 // fragment for me sometimes.
354 {
355 int oval = IP_PMTUDISC_DONT;
356 setsockopt (dnsv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
174 } 357 }
175
176 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
177 }
178#endif 358# endif
359
360 // standard daemon practise...
361 {
362 int oval = 1;
363 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
364 }
365
366 sockinfo si (THISNODE->dns_hostname,
367 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
368 PROT_DNSv4);
369
370 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
371 {
372 slog (L_ERR, _("can't bind dnsv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
373 return -1;
374 }
375
376 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
377 ++success;
378 }
379#endif
380
381 /////////////////////////////////////////////////////////////////////////////
382
383 if (!success)
384 {
385 slog (L_ERR, _("no protocols enabled."));
386 return -1;
387 }
388
389 reconnect_all ();
390
391 /////////////////////////////////////////////////////////////////////////////
179 392
180 tap = new tap_device (); 393 tap = new tap_device ();
181 if (!tap) //D this, of course, never catches 394 if (!tap) //D this, of course, never catches
182 { 395 {
183 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 396 slog (L_ERR, _("cannot create network interface '%s'."), conf.ifname);
184 exit (1); 397 return -1;
185 } 398 }
186 399
187 run_script (run_script_cb (this, &vpn::script_if_up), true); 400 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
188 401
402 run_script_cb cb;
403 cb.set<vpn, &vpn::script_if_init> (this);
404
405 if (tap->if_up () &&
406 !run_script (cb, true))
407 {
408 slog (L_ERR, _("interface initialization command '%s' failed."),
409 tap->if_up ());
410 return -1;
411 }
412
413 cb.set<vpn, &vpn::script_if_up> (this);
414 if (!run_script (cb, true))
415 {
416 slog (L_ERR, _("if-up command execution failed."));
417 return -1;
418 }
419
189 tap_ev_watcher.start (tap->fd, POLLIN); 420 tap_ev_watcher.start (tap->fd, EV_READ);
190
191 reconnect_all ();
192 421
193 return 0; 422 return 0;
194} 423}
195 424
425bool
426vpn::drop_privileges ()
427{
428 if (::conf.change_root)
429 {
430 if (!strcmp (::conf.change_root, "/"))
431 {
432 char dir [L_tmpnam];
433 if (!tmpnam (dir))
434 {
435 slog (L_CRIT, _("unable to create anonymous root path."));
436 return false;
437 }
438
439 if (mkdir (dir, 0700))
440 {
441 slog (L_CRIT, _("unable to create anonymous root directory."));
442 return false;
443 }
444
445 if (chdir (dir))
446 {
447 slog (L_CRIT, _("unable to change to anonymous root directory."));
448 return false;
449 }
450
451 if (rmdir (dir))
452 slog (L_ERR, _("unable to remove anonymous root directory, continuing."));
453 }
454 else
455 {
456 if (chdir (::conf.change_root))
457 {
458 slog (L_CRIT, _("%s: unable to change to specified root directory."), ::conf.change_root);
459 return false;
460 }
461 }
462
463 if (chroot ("."))
464 {
465 slog (L_CRIT, _("unable to set new root directory."));
466 return false;
467 }
468
469 if (chdir ("/"))
470 {
471 slog (L_CRIT, _("unable to set cwd to new root directory."));
472 return false;
473 }
474 }
475
476 if (::conf.change_gid)
477 if (setgid (::conf.change_gid))
478 {
479 slog (L_CRIT, _("unable to change group id to %d."), ::conf.change_gid);
480 return false;
481 }
482
483 if (::conf.change_uid)
484 if (setuid (::conf.change_uid))
485 {
486 slog (L_CRIT, _("unable to change user id to %d."), ::conf.change_uid);
487 return false;
488 }
489
490 return true;
491}
492
493bool
494vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
495{
496 set_tos (ipv4_fd, ipv4_tos, tos);
497 xsendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
498
499 return true;
500}
501
502static u16
503ipv4_checksum (u16 *data, unsigned int len)
504{
505 // use 32 bit accumulator and fold back carry bits at the end
506 u32 sum = 0;
507
508 while (len > 1)
509 {
510 sum += *data++;
511 len -= 2;
512 }
513
514 // odd byte left?
515 if (len)
516 sum += *(u8 *)data;
517
518 // add back carry bits
519 sum = (sum >> 16) + (sum & 0xffff); // lo += hi
520 sum += (sum >> 16); // carry
521
522 return ~sum;
523}
524
525#if ENABLE_ICMP
526bool
527vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
528{
529 pkt->unshift_hdr (4);
530
531 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
532 hdr->type = ::conf.icmp_type;
533 hdr->code = 255;
534 hdr->checksum = 0;
535 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
536
537 set_tos (icmpv4_fd, icmpv4_tos, tos);
538 xsendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
539
540 return true;
541}
542#endif
543
544bool
545vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
546{
547 set_tos (udpv4_fd, udpv4_tos, tos);
548 xsendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
549
550 return true;
551}
552
196void 553void
197vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 554vpn::inject_data_packet (tap_packet *pkt, int dst)
198{ 555{
199 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 556 if (dst)
200 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 557 {
201} 558 // unicast
202 559 if (dst != THISNODE->id)
203void 560 conns[dst - 1]->inject_data_packet (pkt);
204vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 561 }
205{ 562 else
206 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 563 {
207 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 564 // broadcast, this is ugly, but due to the security policy
565 // we have to connect to all hosts...
566 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
567 if ((*c)->conf != THISNODE)
568 (*c)->inject_data_packet (pkt);
569 }
208} 570}
209 571
210void 572void
211vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 573vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
212{ 574{
213 unsigned int src = pkt->src (); 575 unsigned int src = pkt->src ();
214 unsigned int dst = pkt->dst (); 576 unsigned int dst = pkt->dst ();
215 577
216 slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d"), 578 slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d."),
217 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len); 579 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);
218 580
219 if (src == 0 || src > conns.size () 581 if (src == 0 || src > conns.size ()
220 || dst > conns.size () 582 || dst > conns.size ()
221 || pkt->typ () >= vpn_packet::PT_MAX) 583 || pkt->typ () >= vpn_packet::PT_MAX)
222 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), 584 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)."),
223 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 585 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
224 else 586 else
225 { 587 {
226 connection *c = conns[src - 1]; 588 connection *c = conns[src - 1];
227 589
228 if (dst == 0 && !THISNODE->routerprio) 590 if (dst == 0)
229 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), 591 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)."),
230 c->conf->nodename, (const char *)rsi); 592 c->conf->nodename, (const char *)rsi);
231 else if (dst != 0 && dst != THISNODE->id) 593 else if (dst != THISNODE->id)
232 // FORWARDING NEEDED ;) 594 {
595 if (THISNODE->routerprio)
596 // the tos setting gets lost here. who cares.
597 conns[dst - 1]->inject_vpn_packet (pkt);
598 else
233 slog (L_WARN, 599 slog (L_WARN,
234 _("received frame for node %d ('%s') from %s, but this is node %d ('%s')"), 600 _("%s(%s): request to forward packet to %s, but we are no router (config mismatch?)."),
601 c->conf->nodename, (const char *)rsi,
235 dst, conns[dst - 1]->conf->nodename, 602 conns[dst - 1]->conf->nodename);
236 (const char *)rsi, 603 }
237 THISNODE->id, THISNODE->nodename);
238 else 604 else
239 c->recv_vpn_packet (pkt, rsi); 605 c->recv_vpn_packet (pkt, rsi);
240 } 606 }
241} 607}
242 608
243void 609bool
244vpn::udpv4_ev (io_watcher &w, short revents) 610vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
245{ 611{
246 if (revents & (POLLIN | POLLERR)) 612 switch (si.prot)
613 {
614 case PROT_IPv4:
615 return send_ipv4_packet (pkt, si, tos);
616
617 case PROT_UDPv4:
618 return send_udpv4_packet (pkt, si, tos);
619
620#if ENABLE_TCP
621 case PROT_TCPv4:
622 return send_tcpv4_packet (pkt, si, tos);
623#endif
624#if ENABLE_ICMP
625 case PROT_ICMPv4:
626 return send_icmpv4_packet (pkt, si, tos);
627#endif
628#if ENABLE_DNS
629 case PROT_DNSv4:
630 return send_dnsv4_packet (pkt, si, tos);
631#endif
632 default:
633 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol."), (const char *)si);
634 }
635
636 return false;
637}
638
639inline void
640vpn::ipv4_ev (ev::io &w, int revents)
641{
642 if (revents & EV_READ)
247 { 643 {
248 vpn_packet *pkt = new vpn_packet; 644 vpn_packet *pkt = new vpn_packet;
249 struct sockaddr_in sa; 645 struct sockaddr_in sa;
250 socklen_t sa_len = sizeof (sa); 646 socklen_t sa_len = sizeof (sa);
251 int len; 647 int len;
252 648
253 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 649 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
254 650
255 sockinfo si(sa); 651 sockinfo si(sa, PROT_IPv4);
256 652
257 if (len > 0) 653 if (len > 0)
258 { 654 {
259 pkt->len = len; 655 pkt->len = len;
260 656
657 // raw sockets deliver the ipv4 header, but don't expect it on sends
658 pkt->skip_hdr (pkt->ipv4_hdr_len ());
659
261 recv_vpn_packet (pkt, si); 660 recv_vpn_packet (pkt, si);
262 } 661 }
263 else 662 else
264 { 663 {
265 // probably ECONNRESET or somesuch 664 // probably ECONNRESET or somesuch
266 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 665 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
267 } 666 }
268 667
269 delete pkt; 668 delete pkt;
270 } 669 }
271 else if (revents & POLLHUP)
272 {
273 // this cannot ;) happen on udp sockets
274 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
275 exit (1);
276 }
277 else 670 else
278 { 671 {
279 slog (L_ERR, 672 slog (L_ERR,
280 _("FATAL: unknown revents %08x in socket, terminating\n"), 673 _("FATAL: unknown revents %08x in socket, exiting.\n"),
281 revents); 674 revents);
282 exit (1); 675 exit (EXIT_FAILURE);
283 } 676 }
284} 677}
285 678
286void 679#if ENABLE_ICMP
680inline void
287vpn::ipv4_ev (io_watcher &w, short revents) 681vpn::icmpv4_ev (ev::io &w, int revents)
288{ 682{
289 if (revents & (POLLIN | POLLERR)) 683 if (revents & EV_READ)
290 { 684 {
291 vpn_packet *pkt = new vpn_packet; 685 vpn_packet *pkt = new vpn_packet;
292 struct sockaddr_in sa; 686 struct sockaddr_in sa;
293 socklen_t sa_len = sizeof (sa); 687 socklen_t sa_len = sizeof (sa);
294 int len; 688 int len;
295 689
296 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 690 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
297 691
298 sockinfo si(sa, PROT_IPv4); 692 sockinfo si(sa, PROT_ICMPv4);
299 693
300 if (len > 0) 694 if (len > 0)
301 { 695 {
302 pkt->len = len; 696 pkt->len = len;
303 697
698 icmp_header *hdr = (icmp_header *)&((*pkt)[IP_OVERHEAD]);
699
700 if (hdr->type == ::conf.icmp_type
701 && hdr->code == 255)
702 {
304 // raw sockets deliver the ipv4, but don't expect it on sends 703 // raw sockets deliver the ipv4, but don't expect it on sends
305 // this is slow, but... 704 // this is slow, but...
306 pkt->skip_hdr (IP_OVERHEAD); 705 pkt->skip_hdr (pkt->ipv4_hdr_len () + (ICMP_OVERHEAD - IP_OVERHEAD));
307 706
308 recv_vpn_packet (pkt, si); 707 recv_vpn_packet (pkt, si);
708 }
309 } 709 }
310 else 710 else
311 { 711 {
312 // probably ECONNRESET or somesuch 712 // probably ECONNRESET or somesuch
313 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 713 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
314 } 714 }
315 715
316 delete pkt; 716 delete pkt;
317 } 717 }
318 else if (revents & POLLHUP)
319 {
320 // this cannot ;) happen on udp sockets
321 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
322 exit (1);
323 }
324 else 718 else
325 { 719 {
326 slog (L_ERR, 720 slog (L_ERR,
327 _("FATAL: unknown revents %08x in socket, terminating\n"), 721 _("FATAL: unknown revents %08x in socket, exiting.\n"),
328 revents); 722 revents);
329 exit (1); 723 exit (EXIT_FAILURE);
330 }
331}
332
333#if ENABLE_TCP
334
335struct tcp_connection;
336
337struct lt_sockinfo
338{
339 bool operator()(const sockinfo *a, const sockinfo *b) const
340 {
341 return *a < *b;
342 }
343};
344
345struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> {
346 void cleaner_cb (time_watcher &w); time_watcher cleaner;
347
348 tcp_si_map ()
349 : cleaner(this, &tcp_si_map::cleaner_cb)
350 {
351 cleaner.start (0);
352 }
353} tcp_si;
354
355struct tcp_connection : io_watcher {
356 tstamp last_activity;
357 const sockinfo si;
358 vpn &v;
359 bool ok;
360
361 void tcpv4_ev (io_watcher &w, short revents);
362
363 operator tcp_si_map::value_type()
364 {
365 return tcp_si_map::value_type (&si, this);
366 }
367
368 tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
369 : v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev), ok(false)
370 {
371 last_activity = NOW;
372 start (fd_, POLLOUT);
373 }
374
375 ~tcp_connection () { close (fd); }
376};
377
378void tcp_si_map::cleaner_cb (time_watcher &w)
379{
380 w.at = NOW + 600;
381 tstamp to = NOW - ::conf.keepalive - 30;
382
383 for (iterator i = begin (); i != end(); )
384 if (i->second->last_activity >= to)
385 ++i;
386 else
387 {
388 erase (i);
389 i = begin ();
390 } 724 }
391} 725}
726#endif
392 727
393void 728inline void
394vpn::send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 729vpn::udpv4_ev (ev::io &w, int revents)
395{ 730{
396 tcp_si_map::iterator info = tcp_si.find (&si); 731 if (revents & EV_READ)
397
398 if (info == tcp_si.end ())
399 {
400 // woaw, the first lost packet ;)
401 int fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
402
403 if (fd >= 0)
404 {
405 fcntl (fd, F_SETFL, O_NONBLOCK);
406
407 if (connect (fd, si.sav4 (), si.salenv4 ()) >= 0
408 || errno == EINPROGRESS)
409 {
410 tcp_connection *i = new tcp_connection (fd, si, *this);
411
412 tcp_si.insert (*i);
413 }
414 else
415 close (fd);
416 }
417 } 732 {
418 else
419 {
420 tcp_connection *i = info->second;
421
422 i->last_activity = NOW;
423
424 if (i->ok)
425 {
426 setsockopt (i->fd, SOL_IP, IP_TOS, &tos, sizeof tos);
427
428 // we use none of the advantages of tcp
429 write (i->fd, (void *)pkt, pkt->len + sizeof (u32)) != pkt->len + sizeof (u32);
430 }
431 }
432
433#if 0
434 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
435 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
436#endif
437}
438
439void
440tcp_connection::tcpv4_ev (io_watcher &w, short revents)
441{
442 last_activity = NOW;
443
444 if (!ok) // just established?
445 {
446 ok = true;
447 fcntl (fd, F_SETFL, 0);
448 stop ();
449 start (fd, POLLIN);
450 }
451
452 if (revents & (POLLIN | POLLERR))
453 {
454 u32 len;
455
456 if (sizeof (len) == read (fd, &len, sizeof (len)))
457 {
458 vpn_packet *pkt = new vpn_packet; 733 vpn_packet *pkt = new vpn_packet;
459
460 if (len == read (fd, &((*pkt)[0]), len))
461 {
462 pkt->len = len;
463
464 v.recv_vpn_packet (pkt, si);
465 return;
466 }
467
468 delete pkt;
469 }
470
471 tcp_si.erase (&si);
472 stop ();
473 }
474}
475
476void
477vpn::tcpv4_ev (io_watcher &w, short revents)
478{
479 if (revents & (POLLIN | POLLERR))
480 {
481 struct sockaddr_in sa; 734 struct sockaddr_in sa;
482 socklen_t sa_len = sizeof (sa); 735 socklen_t sa_len = sizeof (sa);
483 int len; 736 int len;
484 737
485 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); 738 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
486 739
487 if (fd >= 0)
488 {
489 fcntl (fd, F_SETFL, O_NONBLOCK);
490
491 sockinfo si(sa, PROT_TCPv4); 740 sockinfo si(sa, PROT_UDPv4);
492 tcp_connection *i = new tcp_connection (fd, si, *this);
493 741
494 slog (L_ERR, "accepted %d\n", fd);//D 742 if (len > 0)
495
496 tcp_si.insert (*i);
497 } 743 {
744 pkt->len = len;
745
746 recv_vpn_packet (pkt, si);
747 }
748 else
749 {
750 // probably ECONNRESET or somesuch
751 slog (L_DEBUG, _("%s: fd %d, %s."), (const char *)si, w.fd, strerror (errno));
752 }
753
754 delete pkt;
755 }
756 else
498 } 757 {
758 slog (L_ERR,
759 _("FATAL: unknown revents %08x in socket, exiting.\n"),
760 revents);
761 exit (EXIT_FAILURE);
762 }
499} 763}
500 764
501#endif 765inline void
502
503void
504vpn::tap_ev (io_watcher &w, short revents) 766vpn::tap_ev (ev::io &w, int revents)
505{ 767{
506 if (revents & POLLIN) 768 if (revents & EV_READ)
507 { 769 {
508 /* process data */ 770 /* process data */
509 tap_packet *pkt; 771 tap_packet *pkt;
510 772
511 pkt = tap->recv (); 773 pkt = tap->recv ();
512 774
775 if (!pkt)
776 return;
777
778 if (pkt->len > 14)
779 {
513 int dst = mac2id (pkt->dst); 780 int dst = mac2id (pkt->dst);
514 int src = mac2id (pkt->src); 781 int src = mac2id (pkt->src);
515 782
516 if (src != THISNODE->id) 783 if (src != THISNODE->id)
517 {
518 slog (L_ERR, _("FATAL: tap packet not originating on current node received, terminating."));
519 exit (1);
520 }
521
522 if (dst == THISNODE->id)
523 {
524 slog (L_ERR, _("FATAL: tap packet destined for current node received, terminating."));
525 exit (1);
526 }
527
528 if (dst > conns.size ())
529 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
530 else
531 {
532 if (dst)
533 { 784 {
534 // unicast 785 slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
535 if (dst != THISNODE->id) 786 exit (EXIT_FAILURE);
536 conns[dst - 1]->inject_data_packet (pkt);
537 } 787 }
788
789 if (dst == THISNODE->id)
790 {
791 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
792 exit (EXIT_FAILURE);
793 }
794
795 if (dst > conns.size ())
796 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
538 else 797 else
539 {
540 // broadcast, first check router, then self, then english
541 connection *router = find_router ();
542
543 if (router)
544 router->inject_data_packet (pkt, true); 798 inject_data_packet (pkt, dst);
545 else
546 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
547 if ((*c)->conf != THISNODE)
548 (*c)->inject_data_packet (pkt);
549 }
550 } 799 }
551 800
552 delete pkt; 801 delete pkt;
553 }
554 else if (revents & (POLLHUP | POLLERR))
555 {
556 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
557 exit (1);
558 } 802 }
559 else 803 else
560 abort (); 804 abort ();
561} 805}
562 806
563void 807inline void
564vpn::event_cb (time_watcher &w) 808vpn::event_cb (ev::timer &w, int)
565{ 809{
566 if (events) 810 if (events)
567 { 811 {
568 if (events & EVENT_SHUTDOWN) 812 if (events & EVENT_SHUTDOWN)
569 { 813 {
570 slog (L_INFO, _("preparing shutdown...")); 814 slog (L_INFO, _("preparing shutdown..."));
571 815
572 shutdown_all (); 816 shutdown_all ();
573
574 remove_pid (pidfilename); 817 remove_pid (conf.pidfilename);
575
576 slog (L_INFO, _("terminating")); 818 slog (L_INFO, _("exiting."));
577 819 exit (EXIT_SUCCESS);
578 exit (0);
579 } 820 }
580 821
581 if (events & EVENT_RECONNECT) 822 if (events & EVENT_RECONNECT)
582 { 823 {
583 slog (L_INFO, _("forced reconnect")); 824 slog (L_INFO, _("forced reconnect."));
584 825
585 reconnect_all (); 826 reconnect_all ();
586 } 827 }
587 828
588 events = 0; 829 events = 0;
589 } 830 }
590
591 w.at = TSTAMP_CANCEL;
592} 831}
593 832
594void 833void
595vpn::shutdown_all () 834vpn::shutdown_all ()
596{ 835{
606 845
607 conns.clear (); 846 conns.clear ();
608 847
609 connection_init (); 848 connection_init ();
610 849
611 for (configuration::node_vector::iterator i = conf.nodes.begin (); 850 for (configuration::node_vector::iterator i = conf.nodes.begin (); i != conf.nodes.end (); ++i)
612 i != conf.nodes.end (); ++i) 851 conns.push_back (new connection (this, *i));
613 {
614 connection *conn = new connection (this);
615 852
616 conn->conf = *i; 853 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
617 conns.push_back (conn);
618
619 conn->establish_connection (); 854 (*c)->establish_connection ();
620 }
621} 855}
622 856
623connection *vpn::find_router () 857bool
858vpn::can_direct (conf_node *src, conf_node *dst) const
624{ 859{
625 u32 prio = 0; 860 return src != dst
861 && src->may_direct (dst)
862 && dst->may_direct (src)
863 && (((src->protocols & dst->protocols) && src->connectmode == conf_node::C_ALWAYS)
864 || (src->protocols & dst->connectable_protocols ()));
865}
866
867// only works for indirect and routed connections: find a router
868// from THISNODE to dst
869connection *
870vpn::find_router_for (const connection *dst)
871{
626 connection *router = 0; 872 connection *router = 0;
627 873
874 // first try to find a router with a direct connection, route there
875 // regardless of any other considerations.
876 {
877 u32 prio = 1;
878
879 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
880 {
881 connection *c = *i;
882
883 if (c->conf->routerprio > prio
884 && c->conf != THISNODE
885 && can_direct (c->conf, dst->conf)
886 && c->ictx && c->octx)
887 {
888 prio = c->conf->routerprio;
889 router = c;
890 }
891 }
892 }
893
894 if (router)
895 return router;
896
897 // second try find the router with the highest priority, higher than ours
898 {
899 u32 prio = THISNODE->routerprio ? THISNODE->routerprio : 1;
900
901 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
902 {
903 connection *c = *i;
904
905 if (c->conf->routerprio > prio
906 && c != dst
907 && c->conf != THISNODE
908 && c->ictx && c->octx)
909 {
910 prio = c->conf->routerprio;
911 router = c;
912 }
913 }
914 }
915
916 return router;
917}
918
919void
920vpn::connection_established (connection *c)
921{
628 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 922 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
629 { 923 {
630 connection *c = *i; 924 connection *o = *i;
631 925
632 if (c->conf->routerprio > prio 926 if (o->si.valid ()
633 && c->connectmode == conf_node::C_ALWAYS 927 && c->si != o->si
634 && c->conf != THISNODE 928 && c == find_router_for (o)
635 && c->ictx && c->octx) 929 && !can_direct (THISNODE, o->conf))
636 {
637 prio = c->conf->routerprio;
638 router = c;
639 } 930 {
931 slog (L_DEBUG, _("%s: can now route packets via %s, re-keying connection."),
932 o->conf->nodename, c->conf->nodename);
933 o->rekey ();
934 }
640 } 935 }
641
642 return router;
643} 936}
644 937
645void vpn::connect_request (int id) 938void
939vpn::send_connect_request (connection *c)
646{ 940{
647 connection *c = find_router (); 941 connection *r = find_router_for (c);
648 942
649 if (c) 943 if (r)
944 {
945 slog (L_TRACE, _("%s: no address known, sending mediated connection request via %s."),
946 c->conf->nodename, r->conf->nodename);
650 c->connect_request (id); 947 r->send_connect_request (c->conf->id);
651 //else // does not work, because all others must connect to the same router 948 }
652 // // no router found, aggressively connect to all routers 949 else
653 // for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 950 slog (L_DEBUG, _("%s: no way to connect and no router found: unable to connect at this time."),
654 // if ((*i)->conf->routerprio) 951 c->conf->nodename);
655 // (*i)->establish_connection ();
656} 952}
657 953
658void 954void
659connection::dump_status () 955connection::dump_status ()
660{ 956{
661 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id); 957 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);
662 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"), 958 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),
663 connectmode, conf->connectmode, (const char *)si, (int)prot_minor); 959 connectmode, conf->connectmode, (const char *)si, (int)prot_minor);
664 slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"), 960 slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"),
665 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt); 961 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt);
666 slog (L_NOTICE, _(" establish_conn %ld / rekey %ld / keepalive %ld"),
667 (long)(establish_connection.at), (long)(rekey.at), (long)(keepalive.at));
668} 962}
669 963
670void 964void
671vpn::dump_status () 965vpn::dump_status ()
672{ 966{
673 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 967 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
674 968
675 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 969 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
676 (*c)->dump_status (); 970 (*c)->dump_status ();
677 971
678 slog (L_NOTICE, _("END status dump")); 972 slog (L_NOTICE, _("END status dump"));
679} 973}
680 974
681vpn::vpn (void) 975vpn::vpn (void)
682: event(this, &vpn::event_cb) 976{
977 event .set<vpn, &vpn::event_cb > (this);
683, udpv4_ev_watcher(this, &vpn::udpv4_ev) 978 udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
684, ipv4_ev_watcher (this, &vpn::ipv4_ev) 979 ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
685, tap_ev_watcher (this, &vpn::tap_ev)
686#if ENABLE_TCP 980#if ENABLE_TCP
687, tcpv4_ev_watcher(this, &vpn::tcpv4_ev) 981 tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
688#endif 982#endif
689{ 983#if ENABLE_ICMP
984 icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
985#endif
986#if ENABLE_DNS
987 dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
988#endif
989 tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
690} 990}
691 991
692vpn::~vpn () 992vpn::~vpn ()
693{ 993{
694} 994}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines