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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines