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.4 by pcg, Fri Apr 4 05:26:45 2003 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,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#ifdef ICMP_FILTER
261 {
262 icmp_filter oval;
263 oval.data = 0;
264 if (::conf.icmp_type < 32)
265 oval.data |= 1 << ::conf.icmp_type;
266 oval.data = ~oval.data;
267
268 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
269 }
270#endif
271
272#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
273 // this I really consider a linux bug. I am neither connected
274 // nor do I fragment myself. Linux still sets DF and doesn't
275 // fragment for me sometimes.
276 {
277 int oval = IP_PMTUDISC_DONT;
141 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 278 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
279 }
280#endif
281
282 sockinfo si (THISNODE, PROT_ICMPv4);
283
284 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
285 {
286 slog (L_ERR, _("can't bind icmpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
287 return -1;
142 } 288 }
143#endif
144 289
145 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 290 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
291 ++success;
146 } 292 }
293#endif
294
295 tcpv4_fd = -1;
147 296
148#if ENABLE_TCP 297#if ENABLE_TCP
149 if (THISNODE->protocols & PROT_TCPv4) 298 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
150 { 299 {
151 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 300 tcpv4_fd = setup_socket (PROT_TCPv4, PF_INET, SOCK_STREAM, IPPROTO_TCP);
152 301
153 if (tcpv4_fd < 0) 302 if (tcpv4_fd < 0)
154 return -1; 303 return -1;
155 304
156 // standard daemon practise... 305 // standard daemon practise...
161 310
162 sockinfo si (THISNODE, PROT_TCPv4); 311 sockinfo si (THISNODE, PROT_TCPv4);
163 312
164 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 313 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
165 { 314 {
166 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));
167 exit (1); 316 return -1;
168 } 317 }
169 318
170 if (listen (tcpv4_fd, 5)) 319 if (listen (tcpv4_fd, 5))
171 { 320 {
172 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));
173 exit (1); 322 return -1;
323 }
324
325 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
326 ++success;
327 }
328 else
329 THISNODE->protocols &= ~PROT_TCPv4;
330#endif
331
332 dnsv4_tos = -1;
333 dnsv4_fd = -1;
334
335#if ENABLE_DNS
336 if (THISNODE->protocols & PROT_DNSv4)
337 {
338 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
339
340 dnsv4_fd = setup_socket (PROT_DNSv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
341
342 if (dnsv4_fd < 0)
343 return -1;
344
345# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
346 // this I really consider a linux bug. I am neither connected
347 // nor do I fragment myself. Linux still sets DF and doesn't
348 // fragment for me sometimes.
349 {
350 int oval = IP_PMTUDISC_DONT;
351 setsockopt (dnsv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
174 } 352 }
175
176 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
177 }
178#endif 353# endif
354
355 // standard daemon practise...
356 {
357 int oval = 1;
358 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
359 }
360
361 sockinfo si (THISNODE->dns_hostname,
362 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
363 PROT_DNSv4);
364
365 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
366 {
367 slog (L_ERR, _("can't bind dnsv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
368 return -1;
369 }
370
371 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
372 ++success;
373 }
374#endif
375
376 /////////////////////////////////////////////////////////////////////////////
377
378 if (!success)
379 {
380 slog (L_ERR, _("no protocols enabled."));
381 return -1;
382 }
383
384 reconnect_all ();
385
386 /////////////////////////////////////////////////////////////////////////////
179 387
180 tap = new tap_device (); 388 tap = new tap_device ();
181 if (!tap) //D this, of course, never catches 389 if (!tap) //D this, of course, never catches
182 { 390 {
183 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 391 slog (L_ERR, _("cannot create network interface '%s'."), conf.ifname);
184 exit (1); 392 return -1;
185 } 393 }
186 394
187 run_script (run_script_cb (this, &vpn::script_if_up), true); 395 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
188 396
397 run_script_cb cb;
398 cb.set<vpn, &vpn::script_if_init> (this);
399
400 if (tap->if_up () &&
401 !run_script (cb, true))
402 {
403 slog (L_ERR, _("interface initialization command '%s' failed."),
404 tap->if_up ());
405 return -1;
406 }
407
408 cb.set<vpn, &vpn::script_if_up> (this);
409 if (!run_script (cb, true))
410 {
411 slog (L_ERR, _("if-up command execution failed."));
412 return -1;
413 }
414
189 tap_ev_watcher.start (tap->fd, POLLIN); 415 tap_ev_watcher.start (tap->fd, EV_READ);
190
191 reconnect_all ();
192 416
193 return 0; 417 return 0;
194} 418}
195 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;
486}
487
488bool
489vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
490{
491 set_tos (ipv4_fd, ipv4_tos, tos);
492 xsendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
493
494 return true;
495}
496
497static u16
498ipv4_checksum (u16 *data, unsigned int len)
499{
500 // use 32 bit accumulator and fold back carry bits at the end
501 u32 sum = 0;
502
503 while (len > 1)
504 {
505 sum += *data++;
506 len -= 2;
507 }
508
509 // odd byte left?
510 if (len)
511 sum += *(u8 *)data;
512
513 // add back carry bits
514 sum = (sum >> 16) + (sum & 0xffff); // lo += hi
515 sum += (sum >> 16); // carry
516
517 return ~sum;
518}
519
520#if ENABLE_ICMP
521bool
522vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
523{
524 pkt->unshift_hdr (4);
525
526 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
527 hdr->type = ::conf.icmp_type;
528 hdr->code = 255;
529 hdr->checksum = 0;
530 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
531
532 set_tos (icmpv4_fd, icmpv4_tos, tos);
533 xsendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
534
535 return true;
536}
537#endif
538
539bool
540vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
541{
542 set_tos (udpv4_fd, udpv4_tos, tos);
543 xsendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
544
545 return true;
546}
547
196void 548void
197vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 549vpn::inject_data_packet (tap_packet *pkt, int dst)
198{ 550{
199 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 551 if (dst)
200 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 552 {
201} 553 // unicast
202 554 if (dst != THISNODE->id)
203void 555 conns[dst - 1]->inject_data_packet (pkt);
204vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 556 }
205{ 557 else
206 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 558 {
207 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 559 // broadcast, this is ugly, but due to the security policy
560 // we have to connect to all hosts...
561 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
562 if ((*c)->conf != THISNODE)
563 (*c)->inject_data_packet (pkt);
564 }
208} 565}
209 566
210void 567void
211vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 568vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
212{ 569{
213 unsigned int src = pkt->src (); 570 unsigned int src = pkt->src ();
214 unsigned int dst = pkt->dst (); 571 unsigned int dst = pkt->dst ();
215 572
216 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."),
217 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len); 574 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);
218 575
219 if (src == 0 || src > conns.size () 576 if (src == 0 || src > conns.size ()
220 || dst > conns.size () 577 || dst > conns.size ()
221 || pkt->typ () >= vpn_packet::PT_MAX) 578 || pkt->typ () >= vpn_packet::PT_MAX)
222 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)."),
223 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 580 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
224 else 581 else
225 { 582 {
226 connection *c = conns[src - 1]; 583 connection *c = conns[src - 1];
227 584
228 if (dst == 0 && !THISNODE->routerprio) 585 if (dst == 0)
229 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), 586 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)."),
230 c->conf->nodename, (const char *)rsi); 587 c->conf->nodename, (const char *)rsi);
231 else if (dst != 0 && dst != THISNODE->id) 588 else if (dst != THISNODE->id)
232 // FORWARDING NEEDED ;) 589 {
590 if (THISNODE->routerprio)
591 // the tos setting gets lost here. who cares.
592 conns[dst - 1]->inject_vpn_packet (pkt);
593 else
233 slog (L_WARN, 594 slog (L_WARN,
234 _("received frame for node %d ('%s') from %s, but this is node %d ('%s')"), 595 _("%s(%s): request to forward packet to %s, but we are no router (config mismatch?)."),
596 c->conf->nodename, (const char *)rsi,
235 dst, conns[dst - 1]->conf->nodename, 597 conns[dst - 1]->conf->nodename);
236 (const char *)rsi, 598 }
237 THISNODE->id, THISNODE->nodename);
238 else 599 else
239 c->recv_vpn_packet (pkt, rsi); 600 c->recv_vpn_packet (pkt, rsi);
240 } 601 }
241} 602}
242 603
243void 604bool
244vpn::udpv4_ev (io_watcher &w, short revents) 605vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
245{ 606{
246 if (revents & (POLLIN | POLLERR)) 607 switch (si.prot)
608 {
609 case PROT_IPv4:
610 return send_ipv4_packet (pkt, si, tos);
611
612 case PROT_UDPv4:
613 return send_udpv4_packet (pkt, si, tos);
614
615#if ENABLE_TCP
616 case PROT_TCPv4:
617 return send_tcpv4_packet (pkt, si, tos);
618#endif
619#if ENABLE_ICMP
620 case PROT_ICMPv4:
621 return send_icmpv4_packet (pkt, si, tos);
622#endif
623#if ENABLE_DNS
624 case PROT_DNSv4:
625 return send_dnsv4_packet (pkt, si, tos);
626#endif
627 default:
628 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol."), (const char *)si);
629 }
630
631 return false;
632}
633
634inline void
635vpn::ipv4_ev (ev::io &w, int revents)
636{
637 if (revents & EV_READ)
247 { 638 {
248 vpn_packet *pkt = new vpn_packet; 639 vpn_packet *pkt = new vpn_packet;
249 struct sockaddr_in sa; 640 struct sockaddr_in sa;
250 socklen_t sa_len = sizeof (sa); 641 socklen_t sa_len = sizeof (sa);
251 int len; 642 int len;
252 643
253 len = recvfrom (w.p->fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 644 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
254 645
255 sockinfo si(sa); 646 sockinfo si(sa, PROT_IPv4);
256 647
257 if (len > 0) 648 if (len > 0)
258 { 649 {
259 pkt->len = len; 650 pkt->len = len;
260 651
652 // raw sockets deliver the ipv4 header, but don't expect it on sends
653 pkt->skip_hdr (pkt->ipv4_hdr_len ());
654
261 recv_vpn_packet (pkt, si); 655 recv_vpn_packet (pkt, si);
262 } 656 }
263 else 657 else
264 { 658 {
265 // probably ECONNRESET or somesuch 659 // probably ECONNRESET or somesuch
266 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 660 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
267 } 661 }
268 662
269 delete pkt; 663 delete pkt;
270 } 664 }
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 665 else
278 { 666 {
279 slog (L_ERR, 667 slog (L_ERR,
280 _("FATAL: unknown revents %08x in socket, terminating\n"), 668 _("FATAL: unknown revents %08x in socket, exiting.\n"),
281 revents); 669 revents);
282 exit (1); 670 exit (EXIT_FAILURE);
283 } 671 }
284} 672}
285 673
286void 674#if ENABLE_ICMP
675inline void
287vpn::ipv4_ev (io_watcher &w, short revents) 676vpn::icmpv4_ev (ev::io &w, int revents)
288{ 677{
289 if (revents & (POLLIN | POLLERR)) 678 if (revents & EV_READ)
290 { 679 {
291 vpn_packet *pkt = new vpn_packet; 680 vpn_packet *pkt = new vpn_packet;
292 struct sockaddr_in sa; 681 struct sockaddr_in sa;
293 socklen_t sa_len = sizeof (sa); 682 socklen_t sa_len = sizeof (sa);
294 int len; 683 int len;
295 684
296 len = recvfrom (w.p->fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 685 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
297 686
298 sockinfo si(sa, PROT_IPv4); 687 sockinfo si(sa, PROT_ICMPv4);
299 688
300 if (len > 0) 689 if (len > 0)
301 { 690 {
302 pkt->len = len; 691 pkt->len = len;
303 692
693 icmp_header *hdr = (icmp_header *)&((*pkt)[IP_OVERHEAD]);
694
695 if (hdr->type == ::conf.icmp_type
696 && hdr->code == 255)
697 {
304 // 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
305 // this is slow, but... 699 // this is slow, but...
306 pkt->skip_hdr (IP_OVERHEAD); 700 pkt->skip_hdr (pkt->ipv4_hdr_len () + (ICMP_OVERHEAD - IP_OVERHEAD));
307 701
308 recv_vpn_packet (pkt, si); 702 recv_vpn_packet (pkt, si);
703 }
309 } 704 }
310 else 705 else
311 { 706 {
312 // probably ECONNRESET or somesuch 707 // probably ECONNRESET or somesuch
313 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 708 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
314 } 709 }
315 710
316 delete pkt; 711 delete pkt;
317 } 712 }
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 713 else
325 { 714 {
326 slog (L_ERR, 715 slog (L_ERR,
327 _("FATAL: unknown revents %08x in socket, terminating\n"), 716 _("FATAL: unknown revents %08x in socket, exiting.\n"),
328 revents); 717 revents);
329 exit (1); 718 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 vpn_packet *r_pkt;
362 u32 r_len, r_ofs;
363
364 void tcpv4_ev (io_watcher &w, short revents);
365
366 operator tcp_si_map::value_type()
367 {
368 return tcp_si_map::value_type (&si, this);
369 }
370
371 tcp_connection (int fd, const sockinfo &si_, vpn &v_)
372 : v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev)
373 {
374 last_activity = NOW;
375 ok = false;
376 r_pkt = 0;
377 start (fd, POLLOUT);
378 }
379
380 ~tcp_connection () { if (p) close (p->fd); }
381};
382
383void tcp_si_map::cleaner_cb (time_watcher &w)
384{
385 w.at = NOW + 600;
386 tstamp to = NOW - ::conf.keepalive - 30;
387
388 for (iterator i = begin (); i != end(); )
389 if (i->second->last_activity >= to)
390 ++i;
391 else
392 {
393 erase (i);
394 i = begin ();
395 } 719 }
396} 720}
721#endif
397 722
398void 723inline void
399vpn::send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 724vpn::udpv4_ev (ev::io &w, int revents)
400{ 725{
401 tcp_si_map::iterator info = tcp_si.find (&si); 726 if (revents & EV_READ)
402
403 if (info == tcp_si.end ())
404 {
405 // woaw, the first lost packet ;)
406 int fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
407
408 if (fd >= 0)
409 {
410 fcntl (fd, F_SETFL, O_NONBLOCK);
411
412 if (connect (fd, si.sav4 (), si.salenv4 ()) >= 0
413 || errno == EINPROGRESS)
414 {
415 tcp_connection *i = new tcp_connection (fd, si, *this);
416
417 tcp_si.insert (*i);
418 }
419 else
420 close (fd);
421 }
422 } 727 {
423 else
424 {
425 tcp_connection *i = info->second;
426
427 i->last_activity = NOW;
428
429 if (i->ok)
430 {
431 setsockopt (i->p->fd, SOL_IP, IP_TOS, &tos, sizeof tos);
432
433 // we use none of the advantages of tcp
434 write (i->p->fd, (void *)pkt, pkt->len + sizeof (u32)) != pkt->len + sizeof (u32);
435 }
436 }
437
438#if 0
439 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
440 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
441#endif
442}
443
444void
445tcp_connection::tcpv4_ev (io_watcher &w, short revents)
446{
447 last_activity = NOW;
448
449 if (!ok) // just established?
450 {
451 ok = true;
452 set (POLLIN);
453 }
454
455 if (revents & (POLLIN | POLLERR))
456 {
457 u32 len;
458
459 if (sizeof (len) == read (p->fd, &len, sizeof (len)))
460 {
461 vpn_packet *pkt = new vpn_packet; 728 vpn_packet *pkt = new vpn_packet;
462
463 if (len == read (p->fd, &((*pkt)[0]), len))
464 {
465 pkt->len = len;
466
467 v.recv_vpn_packet (pkt, si);
468 return;
469 }
470
471 delete pkt;
472 }
473
474 tcp_si.erase (&si);
475
476 set (0);//D
477 }
478}
479
480void
481vpn::tcpv4_ev (io_watcher &w, short revents)
482{
483 if (revents & (POLLIN | POLLERR))
484 {
485 struct sockaddr_in sa; 729 struct sockaddr_in sa;
486 socklen_t sa_len = sizeof (sa); 730 socklen_t sa_len = sizeof (sa);
487 int len; 731 int len;
488 732
489 int fd = accept (w.p->fd, (sockaddr *)&sa, &sa_len); 733 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
490 734
491 if (fd >= 0)
492 {
493 fcntl (fd, F_SETFL, O_NONBLOCK);
494
495 sockinfo si(sa, PROT_TCPv4); 735 sockinfo si(sa, PROT_UDPv4);
496 tcp_connection *i = new tcp_connection (fd, si, *this);
497 736
498 slog (L_DEBUG, _("accepted tcp connection from %s\n"), (const char *)si);//D 737 if (len > 0)
499
500 tcp_si.insert (*i);
501 } 738 {
739 pkt->len = len;
740
741 recv_vpn_packet (pkt, si);
742 }
743 else
744 {
745 // probably ECONNRESET or somesuch
746 slog (L_DEBUG, _("%s: fd %d, %s."), (const char *)si, w.fd, strerror (errno));
747 }
748
749 delete pkt;
750 }
751 else
502 } 752 {
753 slog (L_ERR,
754 _("FATAL: unknown revents %08x in socket, exiting.\n"),
755 revents);
756 exit (EXIT_FAILURE);
757 }
503} 758}
504 759
505#endif 760inline void
506
507void
508vpn::tap_ev (io_watcher &w, short revents) 761vpn::tap_ev (ev::io &w, int revents)
509{ 762{
510 if (revents & POLLIN) 763 if (revents & EV_READ)
511 { 764 {
512 /* process data */ 765 /* process data */
513 tap_packet *pkt; 766 tap_packet *pkt;
514 767
515 pkt = tap->recv (); 768 pkt = tap->recv ();
516 769
770 if (!pkt)
771 return;
772
773 if (pkt->len > 14)
774 {
517 int dst = mac2id (pkt->dst); 775 int dst = mac2id (pkt->dst);
518 int src = mac2id (pkt->src); 776 int src = mac2id (pkt->src);
519 777
520 if (src != THISNODE->id) 778 if (src != THISNODE->id)
521 {
522 slog (L_ERR, _("FATAL: tap packet not originating on current node received, terminating."));
523 exit (1);
524 }
525
526 if (dst == THISNODE->id)
527 {
528 slog (L_ERR, _("FATAL: tap packet destined for current node received, terminating."));
529 exit (1);
530 }
531
532 if (dst > conns.size ())
533 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
534 else
535 {
536 if (dst)
537 { 779 {
538 // unicast 780 slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
539 if (dst != THISNODE->id) 781 exit (EXIT_FAILURE);
540 conns[dst - 1]->inject_data_packet (pkt);
541 } 782 }
783
784 if (dst == THISNODE->id)
785 {
786 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
787 exit (EXIT_FAILURE);
788 }
789
790 if (dst > conns.size ())
791 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
542 else 792 else
543 {
544 // broadcast, first check router, then self, then english
545 connection *router = find_router ();
546
547 if (router)
548 router->inject_data_packet (pkt, true); 793 inject_data_packet (pkt, dst);
549 else
550 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
551 if ((*c)->conf != THISNODE)
552 (*c)->inject_data_packet (pkt);
553 }
554 } 794 }
555 795
556 delete pkt; 796 delete pkt;
557 }
558 else if (revents & (POLLHUP | POLLERR))
559 {
560 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
561 exit (1);
562 } 797 }
563 else 798 else
564 abort (); 799 abort ();
565} 800}
566 801
567void 802inline void
568vpn::event_cb (time_watcher &w) 803vpn::event_cb (ev::timer &w, int)
569{ 804{
570 if (events) 805 if (events)
571 { 806 {
572 if (events & EVENT_SHUTDOWN) 807 if (events & EVENT_SHUTDOWN)
573 { 808 {
574 slog (L_INFO, _("preparing shutdown...")); 809 slog (L_INFO, _("preparing shutdown..."));
575 810
576 shutdown_all (); 811 shutdown_all ();
577
578 remove_pid (pidfilename); 812 remove_pid (conf.pidfilename);
579
580 slog (L_INFO, _("terminating")); 813 slog (L_INFO, _("exiting."));
581 814 exit (EXIT_SUCCESS);
582 exit (0);
583 } 815 }
584 816
585 if (events & EVENT_RECONNECT) 817 if (events & EVENT_RECONNECT)
586 { 818 {
587 slog (L_INFO, _("forced reconnect")); 819 slog (L_INFO, _("forced reconnect."));
588 820
589 reconnect_all (); 821 reconnect_all ();
590 } 822 }
591 823
592 events = 0; 824 events = 0;
593 } 825 }
594
595 w.at = TSTAMP_CANCEL;
596} 826}
597 827
598void 828void
599vpn::shutdown_all () 829vpn::shutdown_all ()
600{ 830{
610 840
611 conns.clear (); 841 conns.clear ();
612 842
613 connection_init (); 843 connection_init ();
614 844
615 for (configuration::node_vector::iterator i = conf.nodes.begin (); 845 for (configuration::node_vector::iterator i = conf.nodes.begin (); i != conf.nodes.end (); ++i)
616 i != conf.nodes.end (); ++i) 846 conns.push_back (new connection (this, *i));
617 {
618 connection *conn = new connection (this);
619 847
620 conn->conf = *i; 848 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
621 conns.push_back (conn);
622
623 conn->establish_connection (); 849 (*c)->establish_connection ();
624 }
625} 850}
626 851
627connection *vpn::find_router () 852bool
853vpn::can_direct (conf_node *src, conf_node *dst) const
628{ 854{
629 u32 prio = 0; 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{
630 connection *router = 0; 867 connection *router = 0;
631 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{
632 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 917 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
633 { 918 {
634 connection *c = *i; 919 connection *o = *i;
635 920
636 if (c->conf->routerprio > prio 921 if (o->si.valid ()
637 && c->connectmode == conf_node::C_ALWAYS 922 && c->si != o->si
638 && c->conf != THISNODE 923 && c == find_router_for (o)
639 && c->ictx && c->octx) 924 && !can_direct (THISNODE, o->conf))
640 {
641 prio = c->conf->routerprio;
642 router = c;
643 } 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 }
644 } 930 }
645
646 return router;
647} 931}
648 932
649void vpn::connect_request (int id) 933void
934vpn::send_connect_request (connection *c)
650{ 935{
651 connection *c = find_router (); 936 connection *r = find_router_for (c);
652 937
653 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);
654 c->connect_request (id); 942 r->send_connect_request (c->conf->id);
655 //else // does not work, because all others must connect to the same router 943 }
656 // // no router found, aggressively connect to all routers 944 else
657 // for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 945 slog (L_DEBUG, _("%s: no way to connect and no router found: unable to connect at this time."),
658 // if ((*i)->conf->routerprio) 946 c->conf->nodename);
659 // (*i)->establish_connection ();
660} 947}
661 948
662void 949void
663connection::dump_status () 950connection::dump_status ()
664{ 951{
665 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id); 952 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);
666 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"), 953 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),
667 connectmode, conf->connectmode, (const char *)si, (int)prot_minor); 954 connectmode, conf->connectmode, (const char *)si, (int)prot_minor);
668 slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"), 955 slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"),
669 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt); 956 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt);
670 slog (L_NOTICE, _(" establish_conn %ld / rekey %ld / keepalive %ld"),
671 (long)(establish_connection.at), (long)(rekey.at), (long)(keepalive.at));
672} 957}
673 958
674void 959void
675vpn::dump_status () 960vpn::dump_status ()
676{ 961{
677 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 962 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
678 963
679 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 964 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
680 (*c)->dump_status (); 965 (*c)->dump_status ();
681 966
682 slog (L_NOTICE, _("END status dump")); 967 slog (L_NOTICE, _("END status dump"));
683} 968}
684 969
685vpn::vpn (void) 970vpn::vpn (void)
686: event(this, &vpn::event_cb) 971{
972 event .set<vpn, &vpn::event_cb > (this);
687, udpv4_ev_watcher(this, &vpn::udpv4_ev) 973 udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
688, ipv4_ev_watcher (this, &vpn::ipv4_ev) 974 ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
689, tap_ev_watcher (this, &vpn::tap_ev)
690#if ENABLE_TCP 975#if ENABLE_TCP
691, tcpv4_ev_watcher(this, &vpn::tcpv4_ev) 976 tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
692#endif 977#endif
693{ 978#if ENABLE_ICMP
979 icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
980#endif
981#if ENABLE_DNS
982 dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
983#endif
984 tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
694} 985}
695 986
696vpn::~vpn () 987vpn::~vpn ()
697{ 988{
698} 989}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines