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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines