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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines