ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/vpn.C
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines