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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines