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.15 by pcg, Tue Oct 14 15:48:15 2003 UTC vs.
Revision 1.71 by root, Thu Oct 6 03:25:54 2022 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines