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.10 by pcg, Tue Apr 8 03:25:35 2003 UTC vs.
Revision 1.70 by root, Thu Oct 6 03:03:09 2022 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines