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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines