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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines