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.9 by pcg, Tue Apr 8 02:00:54 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>
43#include <sys/stat.h>
31#include <errno.h> 44#include <errno.h>
32#include <time.h> 45#include <time.h>
33#include <unistd.h> 46#include <unistd.h>
34#include <arpa/inet.h> 47#include <fcntl.h>
35#include <netinet/in.h> 48#include <sys/socket.h>
36#include <netinet/icmp.h> 49
50#include "netcompat.h"
37 51
38#include "pidfile.h" 52#include "pidfile.h"
39 53
40#include "connection.h" 54#include "connection.h"
41#include "util.h" 55#include "util.h"
42#include "vpn.h" 56#include "vpn.h"
43 57
58using namespace std;
59
60vpn network; // THE vpn (bad design...)
61
44///////////////////////////////////////////////////////////////////////////// 62/////////////////////////////////////////////////////////////////////////////
45 63
46const 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 ()
47{ 104{
48 // the tunnel device mtu should be the physical mtu - overhead 105 // the tunnel device mtu should be the physical mtu - overhead
49 // the tricky part is rounding to the cipher key blocksize 106 // the tricky part is rounding to the cipher key blocksize
50 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD; 107 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
51 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 108 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
52 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 109 mtu -= mtu % BLOCK_SIZE (CIPHER); // round
53 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 110 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
54 111
55 char *env; 112 char *env;
56 asprintf (&env, "CONFBASE=%s", confbase); 113 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
57 putenv (env);
58 asprintf (&env, "NODENAME=%s", THISNODE->nodename);
59 putenv (env);
60 asprintf (&env, "NODEID=%d", THISNODE->id);
61 putenv (env);
62 asprintf (&env, "IFNAME=%s", tap->interface ()); 114 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
63 putenv (env); 115 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
116 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
64 asprintf (&env, "MTU=%d", mtu); 117 asprintf (&env, "MTU=%d", mtu); putenv (env);
65 putenv (env); 118 asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
66 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 119 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
67 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
68 THISNODE->id & 0xff);
69 putenv (env);
70 120
71 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;
72} 168}
73 169
74int 170int
75vpn::setup () 171vpn::setup ()
76{ 172{
173 int success = 0;
174
175 ipv4_tos = -1;
77 ipv4_fd = -1; 176 ipv4_fd = -1;
78 177
79 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 178 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
80 { 179 {
81 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 180 ipv4_fd = setup_socket (PROT_IPv4, PF_INET, SOCK_RAW, ::conf.ip_proto);
82 181
83 if (ipv4_fd < 0) 182 if (ipv4_fd < 0)
84 return -1; 183 return -1;
85 184
86#ifdef IP_MTU_DISCOVER 185#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
87 // this I really consider a linux bug. I am neither connected 186 // this I really consider a linux bug. I am neither connected
88 // 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
89 // fragment for me sometimes. 188 // fragment for me sometimes.
90 { 189 {
91 int oval = IP_PMTUDISC_DONT; 190 int oval = IP_PMTUDISC_DONT;
95 194
96 sockinfo si (THISNODE, PROT_IPv4); 195 sockinfo si (THISNODE, PROT_IPv4);
97 196
98 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 197 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
99 { 198 {
100 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 199 slog (L_ERR, _("can't bind ipv4 socket on %s: %s, exiting."), (const char *)si, strerror (errno));
101 exit (1); 200 return -1;
102 } 201 }
103 202
104 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 203 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
204 ++success;
105 } 205 }
206 else
207 THISNODE->protocols &= ~PROT_IPv4;
106 208
209 udpv4_tos = -1;
107 udpv4_fd = -1; 210 udpv4_fd = -1;
108 211
109 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 212 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
110 { 213 {
111 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 214 udpv4_fd = setup_socket (PROT_UDPv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
112 215
113 if (udpv4_fd < 0) 216 if (udpv4_fd < 0)
114 return -1; 217 return -1;
115 218
116 // standard daemon practise... 219 // standard daemon practise...
117 { 220 {
118 int oval = 1; 221 int oval = 1;
119 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 222 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
120 } 223 }
121 224
122#ifdef IP_MTU_DISCOVER 225#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
123 // this I really consider a linux bug. I am neither connected 226 // this I really consider a linux bug. I am neither connected
124 // 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
125 // fragment for me sometimes. 228 // fragment for me sometimes.
126 { 229 {
127 int oval = IP_PMTUDISC_DONT; 230 int oval = IP_PMTUDISC_DONT;
131 234
132 sockinfo si (THISNODE, PROT_UDPv4); 235 sockinfo si (THISNODE, PROT_UDPv4);
133 236
134 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 237 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
135 { 238 {
136 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 239 slog (L_ERR, _("can't bind udpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
137 exit (1); 240 return -1;
138 } 241 }
139 242
140 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 243 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
244 ++success;
141 } 245 }
246 else
247 THISNODE->protocols &= ~PROT_UDPv4;
142 248
249 icmpv4_tos = -1;
143 icmpv4_fd = -1; 250 icmpv4_fd = -1;
144 251
145#if ENABLE_ICMP 252#if ENABLE_ICMP
146 if (THISNODE->protocols & PROT_ICMPv4) 253 if (THISNODE->protocols & PROT_ICMPv4)
147 { 254 {
148 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 255 icmpv4_fd = setup_socket (PROT_ICMPv4, PF_INET, SOCK_RAW, IPPROTO_ICMP);
149 256
150 if (icmpv4_fd < 0) 257 if (icmpv4_fd < 0)
151 return -1; 258 return -1;
152 259
260// no clue where trhis is actually defined
261#if !defined(ICMP_FILTER) && defined(__linux)
262 #define ICMP_FILTER 1
263#endif
264
153#ifdef ICMP_FILTER 265#ifdef ICMP_FILTER
154 { 266 {
155 icmp_filter oval; 267 uint32_t oval;
156 oval.data = 0xffffffff; 268 oval = 0;
157 if (::conf.icmp_type < 32) 269 if (::conf.icmp_type < 32)
158 oval.data &= ~(1 << ::conf.icmp_type); 270 oval |= 1 << ::conf.icmp_type;
271 oval = ~oval;
159 272
160 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval); 273 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
161 } 274 }
162#endif 275#endif
163 276
164#ifdef IP_MTU_DISCOVER 277#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
165 // this I really consider a linux bug. I am neither connected 278 // this I really consider a linux bug. I am neither connected
166 // nor do I fragment myself. Linux still sets DF and doesn't 279 // nor do I fragment myself. Linux still sets DF and doesn't
167 // fragment for me sometimes. 280 // fragment for me sometimes.
168 { 281 {
169 int oval = IP_PMTUDISC_DONT; 282 int oval = IP_PMTUDISC_DONT;
170 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 283 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
171 } 284 }
172#endif 285#endif
173 286
174 sockinfo si (THISNODE, PROT_ICMPv4); 287 sockinfo si (THISNODE, PROT_ICMPv4);
175 288
176 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 289 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
177 { 290 {
178 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); 291 slog (L_ERR, _("can't bind icmpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
179 exit (1); 292 return -1;
180 } 293 }
181 294
182 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); 295 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
296 ++success;
183 } 297 }
184#endif 298#endif
185 299
186 tcpv4_fd = -1; 300 tcpv4_fd = -1;
187 301
188#if ENABLE_TCP 302#if ENABLE_TCP
189 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port) 303 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
190 { 304 {
191 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 305 tcpv4_fd = setup_socket (PROT_TCPv4, PF_INET, SOCK_STREAM, IPPROTO_TCP);
192 306
193 if (tcpv4_fd < 0) 307 if (tcpv4_fd < 0)
194 return -1; 308 return -1;
195 309
196 // standard daemon practise... 310 // standard daemon practise...
201 315
202 sockinfo si (THISNODE, PROT_TCPv4); 316 sockinfo si (THISNODE, PROT_TCPv4);
203 317
204 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 318 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
205 { 319 {
206 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));
207 exit (1); 321 return -1;
208 } 322 }
209 323
210 if (listen (tcpv4_fd, 5)) 324 if (listen (tcpv4_fd, 5))
211 { 325 {
212 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));
213 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);
214 } 357 }
215
216 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
217 }
218#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 /////////////////////////////////////////////////////////////////////////////
219 392
220 tap = new tap_device (); 393 tap = new tap_device ();
221 if (!tap) //D this, of course, never catches 394 if (!tap) //D this, of course, never catches
222 { 395 {
223 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 396 slog (L_ERR, _("cannot create network interface '%s'."), conf.ifname);
224 exit (1); 397 return -1;
225 } 398 }
226 399
227 run_script (run_script_cb (this, &vpn::script_if_up), true); 400 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
228 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
229 tap_ev_watcher.start (tap->fd, POLLIN); 420 tap_ev_watcher.start (tap->fd, EV_READ);
230
231 reconnect_all ();
232 421
233 return 0; 422 return 0;
234} 423}
235 424
236// send a vpn packet out to other hosts
237bool 425bool
238vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 426vpn::drop_privileges ()
239{ 427{
240 switch (si.prot) 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))
241 { 478 {
242 case PROT_IPv4: 479 slog (L_CRIT, _("unable to change group id to %d."), ::conf.change_gid);
243 return send_ipv4_packet (pkt, si, tos);
244
245 case PROT_UDPv4:
246 return send_udpv4_packet (pkt, si, tos);
247
248#if ENABLE_TCP
249 case PROT_TCPv4:
250 return send_tcpv4_packet (pkt, si, tos);
251#endif
252
253#if ENABLE_ICMP
254 case PROT_ICMPv4:
255 return send_icmpv4_packet (pkt, si, tos);
256#endif
257
258 default:
259 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
260 return false; 480 return false;
261 } 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;
262} 491}
263 492
264bool 493bool
265vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 494vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
266{ 495{
267 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 496 set_tos (ipv4_fd, ipv4_tos, tos);
268 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 497 xsendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
269 498
270 return true; 499 return true;
271} 500}
272 501
273static u16 502static u16
291 sum += (sum >> 16); // carry 520 sum += (sum >> 16); // carry
292 521
293 return ~sum; 522 return ~sum;
294} 523}
295 524
525#if ENABLE_ICMP
296bool 526bool
297vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 527vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
298{ 528{
299 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
300
301 pkt->unshift_hdr (4); 529 pkt->unshift_hdr (4);
302 530
303 icmphdr *hdr = (icmphdr *)&((*pkt)[0]); 531 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
304 hdr->type = ::conf.icmp_type; 532 hdr->type = ::conf.icmp_type;
305 hdr->code = 255; 533 hdr->code = 255;
306 hdr->checksum = 0; 534 hdr->checksum = 0;
307 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 535 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
308 536
537 set_tos (icmpv4_fd, icmpv4_tos, tos);
309 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 538 xsendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
310 539
311 return true; 540 return true;
312} 541}
542#endif
313 543
314bool 544bool
315vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 545vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
316{ 546{
317 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 547 set_tos (udpv4_fd, udpv4_tos, tos);
318 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 548 xsendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
319 549
320 return true; 550 return true;
551}
552
553void
554vpn::inject_data_packet (tap_packet *pkt, int dst)
555{
556 if (dst)
557 {
558 // unicast
559 if (dst != THISNODE->id)
560 conns[dst - 1]->inject_data_packet (pkt);
561 }
562 else
563 {
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 }
321} 570}
322 571
323void 572void
324vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 573vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
325{ 574{
326 unsigned int src = pkt->src (); 575 unsigned int src = pkt->src ();
327 unsigned int dst = pkt->dst (); 576 unsigned int dst = pkt->dst ();
328 577
329 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."),
330 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len); 579 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);
331 580
332 if (src == 0 || src > conns.size () 581 if (src == 0 || src > conns.size ()
333 || dst > conns.size () 582 || dst > conns.size ()
334 || pkt->typ () >= vpn_packet::PT_MAX) 583 || pkt->typ () >= vpn_packet::PT_MAX)
335 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)."),
336 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
337 else if (dst > conns.size ())
338 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
339 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 585 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
340 else 586 else
341 { 587 {
342 connection *c = conns[src - 1]; 588 connection *c = conns[src - 1];
343 589
344 if (dst == 0 && !THISNODE->routerprio) 590 if (dst == 0)
345 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), 591 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)."),
346 c->conf->nodename, (const char *)rsi); 592 c->conf->nodename, (const char *)rsi);
347 else if (dst != 0 && dst != THISNODE->id) 593 else if (dst != THISNODE->id)
348 { 594 {
349 if (THISNODE->routerprio) 595 if (THISNODE->routerprio)
350 // the tos setting gets lost here. who cares. 596 // the tos setting gets lost here. who cares.
351 conns[dst - 1]->inject_vpn_packet (pkt); 597 conns[dst - 1]->inject_vpn_packet (pkt);
352 else 598 else
353 slog (L_WARN, 599 slog (L_WARN,
354 _("%s(%s): forwarding request (=> %s), but we are no router"), 600 _("%s(%s): request to forward packet to %s, but we are no router (config mismatch?)."),
355 c->conf->nodename, (const char *)rsi, 601 c->conf->nodename, (const char *)rsi,
356 conns[dst - 1]->conf->nodename); 602 conns[dst - 1]->conf->nodename);
357 } 603 }
358 else 604 else
359 c->recv_vpn_packet (pkt, rsi); 605 c->recv_vpn_packet (pkt, rsi);
360 } 606 }
361} 607}
362 608
363void 609bool
610vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
611{
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
364vpn::ipv4_ev (io_watcher &w, short revents) 640vpn::ipv4_ev (ev::io &w, int revents)
365{ 641{
366 if (revents & (POLLIN | POLLERR)) 642 if (revents & EV_READ)
367 { 643 {
368 vpn_packet *pkt = new vpn_packet; 644 vpn_packet *pkt = new vpn_packet;
369 struct sockaddr_in sa; 645 struct sockaddr_in sa;
370 socklen_t sa_len = sizeof (sa); 646 socklen_t sa_len = sizeof (sa);
371 int len; 647 int len;
376 652
377 if (len > 0) 653 if (len > 0)
378 { 654 {
379 pkt->len = len; 655 pkt->len = len;
380 656
381 // raw sockets deliver the ipv4, but don't expect it on sends 657 // raw sockets deliver the ipv4 header, but don't expect it on sends
382 // this is slow, but... 658 pkt->skip_hdr (pkt->ipv4_hdr_len ());
383 pkt->skip_hdr (IP_OVERHEAD);
384 659
385 recv_vpn_packet (pkt, si); 660 recv_vpn_packet (pkt, si);
386 } 661 }
387 else 662 else
388 { 663 {
389 // probably ECONNRESET or somesuch 664 // probably ECONNRESET or somesuch
390 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 665 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
391 } 666 }
392 667
393 delete pkt; 668 delete pkt;
394 } 669 }
395 else if (revents & POLLHUP)
396 {
397 // this cannot ;) happen on udp sockets
398 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
399 exit (1);
400 }
401 else 670 else
402 { 671 {
403 slog (L_ERR, 672 slog (L_ERR,
404 _("FATAL: unknown revents %08x in socket, terminating\n"), 673 _("FATAL: unknown revents %08x in socket, exiting.\n"),
405 revents); 674 revents);
406 exit (1); 675 exit (EXIT_FAILURE);
407 } 676 }
408} 677}
409 678
410void 679#if ENABLE_ICMP
680inline void
411vpn::icmpv4_ev (io_watcher &w, short revents) 681vpn::icmpv4_ev (ev::io &w, int revents)
412{ 682{
413 if (revents & (POLLIN | POLLERR)) 683 if (revents & EV_READ)
414 { 684 {
415 vpn_packet *pkt = new vpn_packet; 685 vpn_packet *pkt = new vpn_packet;
416 struct sockaddr_in sa; 686 struct sockaddr_in sa;
417 socklen_t sa_len = sizeof (sa); 687 socklen_t sa_len = sizeof (sa);
418 int len; 688 int len;
423 693
424 if (len > 0) 694 if (len > 0)
425 { 695 {
426 pkt->len = len; 696 pkt->len = len;
427 697
428 icmphdr *hdr = (icmphdr *)&((*pkt)[IP_OVERHEAD]); 698 icmp_header *hdr = (icmp_header *)&((*pkt)[IP_OVERHEAD]);
429 699
430 if (hdr->type == ::conf.icmp_type 700 if (hdr->type == ::conf.icmp_type
431 && hdr->code == 255) 701 && hdr->code == 255)
432 { 702 {
433 // 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
434 // this is slow, but... 704 // this is slow, but...
435 pkt->skip_hdr (ICMP_OVERHEAD); 705 pkt->skip_hdr (pkt->ipv4_hdr_len () + (ICMP_OVERHEAD - IP_OVERHEAD));
436 706
437 recv_vpn_packet (pkt, si); 707 recv_vpn_packet (pkt, si);
438 } 708 }
439 } 709 }
440 else 710 else
441 { 711 {
442 // probably ECONNRESET or somesuch 712 // probably ECONNRESET or somesuch
443 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 713 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
444 } 714 }
445 715
446 delete pkt; 716 delete pkt;
447 } 717 }
448 else if (revents & POLLHUP)
449 {
450 // this cannot ;) happen on udp sockets
451 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
452 exit (1);
453 }
454 else 718 else
455 { 719 {
456 slog (L_ERR, 720 slog (L_ERR,
457 _("FATAL: unknown revents %08x in socket, terminating\n"), 721 _("FATAL: unknown revents %08x in socket, exiting.\n"),
458 revents); 722 revents);
459 exit (1); 723 exit (EXIT_FAILURE);
460 } 724 }
461} 725}
726#endif
462 727
463void 728inline void
464vpn::udpv4_ev (io_watcher &w, short revents) 729vpn::udpv4_ev (ev::io &w, int revents)
465{ 730{
466 if (revents & (POLLIN | POLLERR)) 731 if (revents & EV_READ)
467 { 732 {
468 vpn_packet *pkt = new vpn_packet; 733 vpn_packet *pkt = new vpn_packet;
469 struct sockaddr_in sa; 734 struct sockaddr_in sa;
470 socklen_t sa_len = sizeof (sa); 735 socklen_t sa_len = sizeof (sa);
471 int len; 736 int len;
481 recv_vpn_packet (pkt, si); 746 recv_vpn_packet (pkt, si);
482 } 747 }
483 else 748 else
484 { 749 {
485 // probably ECONNRESET or somesuch 750 // probably ECONNRESET or somesuch
486 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 751 slog (L_DEBUG, _("%s: fd %d, %s."), (const char *)si, w.fd, strerror (errno));
487 } 752 }
488 753
489 delete pkt; 754 delete pkt;
490 } 755 }
491 else if (revents & POLLHUP)
492 {
493 // this cannot ;) happen on udp sockets
494 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
495 exit (1);
496 }
497 else 756 else
498 { 757 {
499 slog (L_ERR, 758 slog (L_ERR,
500 _("FATAL: unknown revents %08x in socket, terminating\n"), 759 _("FATAL: unknown revents %08x in socket, exiting.\n"),
501 revents); 760 revents);
502 exit (1); 761 exit (EXIT_FAILURE);
503 } 762 }
504} 763}
505 764
506void 765inline void
507vpn::tap_ev (io_watcher &w, short revents) 766vpn::tap_ev (ev::io &w, int revents)
508{ 767{
509 if (revents & POLLIN) 768 if (revents & EV_READ)
510 { 769 {
511 /* process data */ 770 /* process data */
512 tap_packet *pkt; 771 tap_packet *pkt;
513 772
514 pkt = tap->recv (); 773 pkt = tap->recv ();
515 774
775 if (!pkt)
776 return;
777
778 if (pkt->len > 14)
779 {
516 int dst = mac2id (pkt->dst); 780 int dst = mac2id (pkt->dst);
517 int src = mac2id (pkt->src); 781 int src = mac2id (pkt->src);
518 782
519 if (src != THISNODE->id) 783 if (src != THISNODE->id)
520 {
521 slog (L_ERR, _("FATAL: tap packet not originating on current node received, terminating."));
522 exit (1);
523 }
524
525 if (dst == THISNODE->id)
526 {
527 slog (L_ERR, _("FATAL: tap packet destined for current node received, terminating."));
528 exit (1);
529 }
530
531 if (dst > conns.size ())
532 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
533 else
534 {
535 if (dst)
536 { 784 {
537 // unicast 785 slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
538 if (dst != THISNODE->id) 786 exit (EXIT_FAILURE);
539 conns[dst - 1]->inject_data_packet (pkt);
540 } 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);
541 else 797 else
542 {
543 // broadcast, first check router, then self, then english
544 connection *router = find_router ();
545
546 if (router)
547 router->inject_data_packet (pkt, true); 798 inject_data_packet (pkt, dst);
548 else
549 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
550 if ((*c)->conf != THISNODE)
551 (*c)->inject_data_packet (pkt);
552 }
553 } 799 }
554 800
555 delete pkt; 801 delete pkt;
556 }
557 else if (revents & (POLLHUP | POLLERR))
558 {
559 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
560 exit (1);
561 } 802 }
562 else 803 else
563 abort (); 804 abort ();
564} 805}
565 806
566void 807inline void
567vpn::event_cb (time_watcher &w) 808vpn::event_cb (ev::timer &w, int)
568{ 809{
569 if (events) 810 if (events)
570 { 811 {
571 if (events & EVENT_SHUTDOWN) 812 if (events & EVENT_SHUTDOWN)
572 { 813 {
573 slog (L_INFO, _("preparing shutdown...")); 814 slog (L_INFO, _("preparing shutdown..."));
574 815
575 shutdown_all (); 816 shutdown_all ();
576
577 remove_pid (pidfilename); 817 remove_pid (conf.pidfilename);
578
579 slog (L_INFO, _("terminating")); 818 slog (L_INFO, _("exiting."));
580 819 exit (EXIT_SUCCESS);
581 exit (0);
582 } 820 }
583 821
584 if (events & EVENT_RECONNECT) 822 if (events & EVENT_RECONNECT)
585 { 823 {
586 slog (L_INFO, _("forced reconnect")); 824 slog (L_INFO, _("forced reconnect."));
587 825
588 reconnect_all (); 826 reconnect_all ();
589 } 827 }
590 828
591 events = 0; 829 events = 0;
592 } 830 }
593
594 w.at = TSTAMP_CANCEL;
595} 831}
596 832
597void 833void
598vpn::shutdown_all () 834vpn::shutdown_all ()
599{ 835{
609 845
610 conns.clear (); 846 conns.clear ();
611 847
612 connection_init (); 848 connection_init ();
613 849
614 for (configuration::node_vector::iterator i = conf.nodes.begin (); 850 for (configuration::node_vector::iterator i = conf.nodes.begin (); i != conf.nodes.end (); ++i)
615 i != conf.nodes.end (); ++i) 851 conns.push_back (new connection (this, *i));
616 {
617 connection *conn = new connection (this);
618 852
619 conn->conf = *i; 853 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
620 conns.push_back (conn);
621
622 conn->establish_connection (); 854 (*c)->establish_connection ();
623 }
624} 855}
625 856
626connection *vpn::find_router () 857bool
858vpn::can_direct (conf_node *src, conf_node *dst) const
627{ 859{
628 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{
629 connection *router = 0; 872 connection *router = 0;
630 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{
631 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 922 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
632 { 923 {
633 connection *c = *i; 924 connection *o = *i;
634 925
635 if (c->conf->routerprio > prio 926 if (o->si.valid ()
636 && c->connectmode == conf_node::C_ALWAYS 927 && c->si != o->si
637 && c->conf != THISNODE 928 && c == find_router_for (o)
638 && c->ictx && c->octx) 929 && !can_direct (THISNODE, o->conf))
639 {
640 prio = c->conf->routerprio;
641 router = c;
642 } 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 }
643 } 935 }
644
645 return router;
646} 936}
647 937
938void
648void vpn::send_connect_request (int id) 939vpn::send_connect_request (connection *c)
649{ 940{
650 connection *c = find_router (); 941 connection *r = find_router_for (c);
651 942
652 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);
653 c->send_connect_request (id); 947 r->send_connect_request (c->conf->id);
948 }
654 else 949 else
655 // no router found, aggressively connect to all routers 950 slog (L_DEBUG, _("%s: no way to connect and no router found: unable to connect at this time."),
656 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 951 c->conf->nodename);
657 if ((*i)->conf->routerprio)
658 (*i)->establish_connection ();
659} 952}
660 953
661void 954void
662connection::dump_status () 955connection::dump_status ()
663{ 956{
664 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id); 957 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);
665 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"), 958 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),
666 connectmode, conf->connectmode, (const char *)si, (int)prot_minor); 959 connectmode, conf->connectmode, (const char *)si, (int)prot_minor);
667 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"),
668 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt); 961 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt);
669 slog (L_NOTICE, _(" establish_conn %ld / rekey %ld / keepalive %ld"),
670 (long)(establish_connection.at), (long)(rekey.at), (long)(keepalive.at));
671} 962}
672 963
673void 964void
674vpn::dump_status () 965vpn::dump_status ()
675{ 966{
676 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 967 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
677 968
678 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 969 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
679 (*c)->dump_status (); 970 (*c)->dump_status ();
680 971
681 slog (L_NOTICE, _("END status dump")); 972 slog (L_NOTICE, _("END status dump"));
682} 973}
683 974
684vpn::vpn (void) 975vpn::vpn (void)
976{
685: event (this, &vpn::event_cb) 977 event .set<vpn, &vpn::event_cb > (this);
686, udpv4_ev_watcher (this, &vpn::udpv4_ev) 978 udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
687, ipv4_ev_watcher (this, &vpn::ipv4_ev) 979 ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
688#if ENABLE_TCP 980#if ENABLE_TCP
689, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 981 tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
690#endif 982#endif
691#if ENABLE_ICMP 983#if ENABLE_ICMP
692, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 984 icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
693#endif 985#endif
694, tap_ev_watcher (this, &vpn::tap_ev) 986#if ENABLE_DNS
695{ 987 dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
988#endif
989 tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
696} 990}
697 991
698vpn::~vpn () 992vpn::~vpn ()
699{ 993{
700} 994}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines