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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines