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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines