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.70 by root, Thu Oct 6 03:03:09 2022 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines