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.17 by pcg, Wed Oct 15 06:06:41 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-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/wait.h> 42#include <sys/wait.h>
30#include <errno.h> 43#include <errno.h>
39 52
40#include "connection.h" 53#include "connection.h"
41#include "util.h" 54#include "util.h"
42#include "vpn.h" 55#include "vpn.h"
43 56
57vpn network; // THE vpn (bad design...)
58
44///////////////////////////////////////////////////////////////////////////// 59/////////////////////////////////////////////////////////////////////////////
45 60
46const 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 ()
47{ 75{
48 // the tunnel device mtu should be the physical mtu - overhead 76 // the tunnel device mtu should be the physical mtu - overhead
49 // the tricky part is rounding to the cipher key blocksize 77 // the tricky part is rounding to the cipher key blocksize
50 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD; 78 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
51 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 79 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
52 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 80 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
53 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 81 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
54 82
55 char *env; 83 char *env;
56 asprintf (&env, "CONFBASE=%s", confbase); 84 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
57 putenv (env);
58 asprintf (&env, "NODENAME=%s", THISNODE->nodename);
59 putenv (env);
60 asprintf (&env, "NODEID=%d", THISNODE->id);
61 putenv (env);
62 asprintf (&env, "IFNAME=%s", tap->interface ()); 85 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
63 putenv (env); 86 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
87 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
64 asprintf (&env, "MTU=%d", mtu); 88 asprintf (&env, "MTU=%d", mtu); putenv (env);
65 putenv (env); 89 asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
66 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 90 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
67 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
68 THISNODE->id & 0xff);
69 putenv (env);
70 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,
71 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;
72} 145}
73 146
74int 147int
75vpn::setup () 148vpn::setup ()
76{ 149{
150 int success = 0;
151
152#if 1//D2
153 ipv42_tos = -1;
77 ipv4_fd = -1; 154 ipv42_fd = -1;
78 155
79 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 156 if (THISNODE->protocols & PROT_IPv42 && ::conf.ip_proto)
80 { 157 {
81 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 158 ipv42_fd = setup_socket (PROT_IPv42, PF_INET, SOCK_RAW, ::conf.ip2_proto);
82 159
83 if (ipv4_fd < 0) 160 if (ipv42_fd < 0)
84 return -1; 161 return -1;
85
86 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
87 162
88#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 163#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
89 // this I really consider a linux bug. I am neither connected 164 // this I really consider a linux bug. I am neither connected
90 // 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
91 // fragment for me sometimes. 166 // fragment for me sometimes.
92 { 167 {
93 int oval = IP_PMTUDISC_DONT; 168 int oval = IP_PMTUDISC_DONT;
94 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 169 setsockopt (ipv42_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
95 } 170 }
96#endif 171#endif
97 172
98 sockinfo si (THISNODE, PROT_IPv4); 173 sockinfo si (THISNODE, PROT_IPv42);
99 174
100 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 175 if (bind (ipv42_fd, si.sav4 (), si.salenv4 ()))
101 { 176 {
102 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));
103 exit (1); 178 return -1;
104 } 179 }
105 180
106 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 181 ipv42_ev_watcher.start (ipv42_fd, EV_READ);
182 ++success;
107 } 183 }
184 else
185 THISNODE->protocols &= ~PROT_IPv42;
186#endif
108 187
188 ipv4_tos = -1;
109 udpv4_fd = -1; 189 ipv4_fd = -1;
110 190
111 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 191 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
112 { 192 {
113 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 193 ipv4_fd = setup_socket (PROT_IPv4, PF_INET, SOCK_RAW, ::conf.ip_proto);
114 194
115 if (udpv4_fd < 0) 195 if (ipv4_fd < 0)
116 return -1; 196 return -1;
117
118 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
119
120 // standard daemon practise...
121 {
122 int oval = 1;
123 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
124 }
125 197
126#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 198#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
127 // this I really consider a linux bug. I am neither connected 199 // this I really consider a linux bug. I am neither connected
128 // 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
129 // fragment for me sometimes. 201 // fragment for me sometimes.
130 { 202 {
131 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;
132 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 244 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
133 } 245 }
134#endif 246#endif
135 247
136 sockinfo si (THISNODE, PROT_UDPv4); 248 sockinfo si (THISNODE, PROT_UDPv4);
137 249
138 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 250 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
139 { 251 {
140 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));
141 exit (1); 253 return -1;
142 } 254 }
143 255
144 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 256 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
257 ++success;
145 } 258 }
259 else
260 THISNODE->protocols &= ~PROT_UDPv4;
146 261
262 icmpv4_tos = -1;
147 icmpv4_fd = -1; 263 icmpv4_fd = -1;
148 264
149#if ENABLE_ICMP 265#if ENABLE_ICMP
150 if (THISNODE->protocols & PROT_ICMPv4) 266 if (THISNODE->protocols & PROT_ICMPv4)
151 { 267 {
152 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 268 icmpv4_fd = setup_socket (PROT_ICMPv4, PF_INET, SOCK_RAW, IPPROTO_ICMP);
153 269
154 if (icmpv4_fd < 0) 270 if (icmpv4_fd < 0)
155 return -1; 271 return -1;
156
157 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
158 272
159#ifdef ICMP_FILTER 273#ifdef ICMP_FILTER
160 { 274 {
161 icmp_filter oval; 275 icmp_filter oval;
162 oval.data = 0xffffffff; 276 oval.data = 0xffffffff;
171 // this I really consider a linux bug. I am neither connected 285 // this I really consider a linux bug. I am neither connected
172 // 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
173 // fragment for me sometimes. 287 // fragment for me sometimes.
174 { 288 {
175 int oval = IP_PMTUDISC_DONT; 289 int oval = IP_PMTUDISC_DONT;
176 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 290 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
177 } 291 }
178#endif 292#endif
179 293
180 sockinfo si (THISNODE, PROT_ICMPv4); 294 sockinfo si (THISNODE, PROT_ICMPv4);
181 295
182 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 296 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
183 { 297 {
184 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));
185 exit (1); 299 return -1;
186 } 300 }
187 301
188 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); 302 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
303 ++success;
189 } 304 }
190#endif 305#endif
191 306
192 tcpv4_fd = -1; 307 tcpv4_fd = -1;
193 308
194#if ENABLE_TCP 309#if ENABLE_TCP
195 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port) 310 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
196 { 311 {
197 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 312 tcpv4_fd = setup_socket (PROT_TCPv4, PF_INET, SOCK_STREAM, IPPROTO_TCP);
198 313
199 if (tcpv4_fd < 0) 314 if (tcpv4_fd < 0)
200 return -1; 315 return -1;
201 316
202 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
203
204 // standard daemon practise... 317 // standard daemon practise...
205 { 318 {
206 int oval = 1; 319 int oval = 1;
207 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 320 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
208 } 321 }
209 322
210 sockinfo si (THISNODE, PROT_TCPv4); 323 sockinfo si (THISNODE, PROT_TCPv4);
211 324
212 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 325 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
213 { 326 {
214 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));
215 exit (1); 328 return -1;
216 } 329 }
217 330
218 if (listen (tcpv4_fd, 5)) 331 if (listen (tcpv4_fd, 5))
219 { 332 {
220 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));
221 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);
222 } 364 }
223
224 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
225 }
226#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 /////////////////////////////////////////////////////////////////////////////
227 399
228 tap = new tap_device (); 400 tap = new tap_device ();
229 if (!tap) //D this, of course, never catches 401 if (!tap) //D this, of course, never catches
230 { 402 {
231 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 403 slog (L_ERR, _("cannot create network interface '%s'."), conf.ifname);
232 exit (1); 404 return -1;
233 } 405 }
234 406
235 run_script (run_script_cb (this, &vpn::script_if_up), true); 407 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
236 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
237 tap_ev_watcher.start (tap->fd, POLLIN); 427 tap_ev_watcher.start (tap->fd, EV_READ);
238
239 reconnect_all ();
240 428
241 return 0; 429 return 0;
242}
243
244// send a vpn packet out to other hosts
245bool
246vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
247{
248 switch (si.prot)
249 {
250 case PROT_IPv4:
251 return send_ipv4_packet (pkt, si, tos);
252
253 case PROT_UDPv4:
254 return send_udpv4_packet (pkt, si, tos);
255
256#if ENABLE_TCP
257 case PROT_TCPv4:
258 return send_tcpv4_packet (pkt, si, tos);
259#endif
260
261#if ENABLE_ICMP
262 case PROT_ICMPv4:
263 return send_icmpv4_packet (pkt, si, tos);
264#endif
265
266 default:
267 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
268 return false;
269 }
270} 430}
271 431
272bool 432bool
273vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 433vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
274{ 434{
275#if defined(SOL_IP) && defined(IP_TOS) 435 set_tos (ipv4_fd, ipv4_tos, tos);
276 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
277#endif
278 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 ());
279 437
280 return true; 438 return true;
281} 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
282 451
283static u16 452static u16
284ipv4_checksum (u16 *data, unsigned int len) 453ipv4_checksum (u16 *data, unsigned int len)
285{ 454{
286 // 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
305 474
306#if ENABLE_ICMP 475#if ENABLE_ICMP
307bool 476bool
308vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 477vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
309{ 478{
310#if defined(SOL_IP) && defined(IP_TOS)
311 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
312#endif
313
314 pkt->unshift_hdr (4); 479 pkt->unshift_hdr (4);
315 480
316 icmp_header *hdr = (icmp_header *)&((*pkt)[0]); 481 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
317 hdr->type = ::conf.icmp_type; 482 hdr->type = ::conf.icmp_type;
318 hdr->code = 255; 483 hdr->code = 255;
319 hdr->checksum = 0; 484 hdr->checksum = 0;
320 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 485 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
321 486
487 set_tos (icmpv4_fd, icmpv4_tos, tos);
322 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 ());
323 489
324 return true; 490 return true;
325} 491}
326#endif 492#endif
327 493
328bool 494bool
329vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 495vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
330{ 496{
331#if defined(SOL_IP) && defined(IP_TOS) 497 set_tos (udpv4_fd, udpv4_tos, tos);
332 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
333#endif
334 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 ());
335 499
336 return true; 500 return true;
501}
502
503void
504vpn::inject_data_packet (tap_packet *pkt, int dst)
505{
506 if (dst)
507 {
508 // unicast
509 if (dst != THISNODE->id)
510 conns[dst - 1]->inject_data_packet (pkt);
511 }
512 else
513 {
514 // broadcast, this is ugly, but due to the security policy
515 // we have to connect to all hosts...
516 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
517 if ((*c)->conf != THISNODE)
518 (*c)->inject_data_packet (pkt);
519 }
337} 520}
338 521
339void 522void
340vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 523vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
341{ 524{
342 unsigned int src = pkt->src (); 525 unsigned int src = pkt->src ();
343 unsigned int dst = pkt->dst (); 526 unsigned int dst = pkt->dst ();
344 527
345 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."),
346 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len); 529 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);
347 530
348 if (src == 0 || src > conns.size () 531 if (src == 0 || src > conns.size ()
349 || dst > conns.size () 532 || dst > conns.size ()
350 || pkt->typ () >= vpn_packet::PT_MAX) 533 || pkt->typ () >= vpn_packet::PT_MAX)
351 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)."),
352 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 535 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
353 else if (dst > conns.size ())
354 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
355 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
356 else 536 else
357 { 537 {
358 connection *c = conns[src - 1]; 538 connection *c = conns[src - 1];
359 539
360 if (dst == 0) 540 if (dst == 0)
361 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"), 541 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)."),
362 c->conf->nodename, (const char *)rsi); 542 c->conf->nodename, (const char *)rsi);
363 else if (dst != 0 && dst != THISNODE->id) 543 else if (dst != THISNODE->id)
364 { 544 {
365 if (THISNODE->routerprio) 545 if (THISNODE->routerprio)
366 // the tos setting gets lost here. who cares. 546 // the tos setting gets lost here. who cares.
367 conns[dst - 1]->inject_vpn_packet (pkt); 547 conns[dst - 1]->inject_vpn_packet (pkt);
368 else 548 else
369 slog (L_WARN, 549 slog (L_WARN,
370 _("%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?)."),
371 c->conf->nodename, (const char *)rsi, 551 c->conf->nodename, (const char *)rsi,
372 conns[dst - 1]->conf->nodename); 552 conns[dst - 1]->conf->nodename);
373 } 553 }
374 else 554 else
375 c->recv_vpn_packet (pkt, rsi); 555 c->recv_vpn_packet (pkt, rsi);
376 } 556 }
377} 557}
378 558
379void 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
380vpn::ipv4_ev (io_watcher &w, short revents) 596vpn::ipv42_ev (ev::io &w, int revents)
381{ 597{
382 if (revents & (POLLIN | POLLERR)) 598 if (revents & EV_READ)
383 { 599 {
384 vpn_packet *pkt = new vpn_packet; 600 vpn_packet *pkt = new vpn_packet;
385 struct sockaddr_in sa; 601 struct sockaddr_in sa;
386 socklen_t sa_len = sizeof (sa); 602 socklen_t sa_len = sizeof (sa);
387 int len; 603 int len;
388 604
389 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);
390 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
391 sockinfo si(sa, PROT_IPv4); 648 sockinfo si(sa, PROT_IPv4);
392 649
393 if (len > 0) 650 if (len > 0)
394 { 651 {
395 pkt->len = len; 652 pkt->len = len;
396 653
397 // 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
398 // this is slow, but... 655 pkt->skip_hdr (pkt->ipv4_hdr_len ());
399 pkt->skip_hdr (IP_OVERHEAD);
400 656
401 recv_vpn_packet (pkt, si); 657 recv_vpn_packet (pkt, si);
402 } 658 }
403 else 659 else
404 { 660 {
405 // probably ECONNRESET or somesuch 661 // probably ECONNRESET or somesuch
406 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 662 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
407 } 663 }
408 664
409 delete pkt; 665 delete pkt;
410 } 666 }
411 else if (revents & POLLHUP)
412 {
413 // this cannot ;) happen on udp sockets
414 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
415 exit (1);
416 }
417 else 667 else
418 { 668 {
419 slog (L_ERR, 669 slog (L_ERR,
420 _("FATAL: unknown revents %08x in socket, terminating\n"), 670 _("FATAL: unknown revents %08x in socket, exiting.\n"),
421 revents); 671 revents);
422 exit (1); 672 exit (EXIT_FAILURE);
423 } 673 }
424} 674}
425 675
426#if ENABLE_ICMP 676#if ENABLE_ICMP
427void 677inline void
428vpn::icmpv4_ev (io_watcher &w, short revents) 678vpn::icmpv4_ev (ev::io &w, int revents)
429{ 679{
430 if (revents & (POLLIN | POLLERR)) 680 if (revents & EV_READ)
431 { 681 {
432 vpn_packet *pkt = new vpn_packet; 682 vpn_packet *pkt = new vpn_packet;
433 struct sockaddr_in sa; 683 struct sockaddr_in sa;
434 socklen_t sa_len = sizeof (sa); 684 socklen_t sa_len = sizeof (sa);
435 int len; 685 int len;
447 if (hdr->type == ::conf.icmp_type 697 if (hdr->type == ::conf.icmp_type
448 && hdr->code == 255) 698 && hdr->code == 255)
449 { 699 {
450 // 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
451 // this is slow, but... 701 // this is slow, but...
452 pkt->skip_hdr (ICMP_OVERHEAD); 702 pkt->skip_hdr (pkt->ipv4_hdr_len () + (ICMP_OVERHEAD - IP_OVERHEAD));
453 703
454 recv_vpn_packet (pkt, si); 704 recv_vpn_packet (pkt, si);
455 } 705 }
456 } 706 }
457 else 707 else
458 { 708 {
459 // probably ECONNRESET or somesuch 709 // probably ECONNRESET or somesuch
460 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 710 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
461 } 711 }
462 712
463 delete pkt; 713 delete pkt;
464 } 714 }
465 else if (revents & POLLHUP)
466 {
467 // this cannot ;) happen on udp sockets
468 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
469 exit (1);
470 }
471 else 715 else
472 { 716 {
473 slog (L_ERR, 717 slog (L_ERR,
474 _("FATAL: unknown revents %08x in socket, terminating\n"), 718 _("FATAL: unknown revents %08x in socket, exiting.\n"),
475 revents); 719 revents);
476 exit (1); 720 exit (EXIT_FAILURE);
477 } 721 }
478} 722}
479#endif 723#endif
480 724
481void 725inline void
482vpn::udpv4_ev (io_watcher &w, short revents) 726vpn::udpv4_ev (ev::io &w, int revents)
483{ 727{
484 if (revents & (POLLIN | POLLERR)) 728 if (revents & EV_READ)
485 { 729 {
486 vpn_packet *pkt = new vpn_packet; 730 vpn_packet *pkt = new vpn_packet;
487 struct sockaddr_in sa; 731 struct sockaddr_in sa;
488 socklen_t sa_len = sizeof (sa); 732 socklen_t sa_len = sizeof (sa);
489 int len; 733 int len;
499 recv_vpn_packet (pkt, si); 743 recv_vpn_packet (pkt, si);
500 } 744 }
501 else 745 else
502 { 746 {
503 // probably ECONNRESET or somesuch 747 // probably ECONNRESET or somesuch
504 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));
505 } 749 }
506 750
507 delete pkt; 751 delete pkt;
508 } 752 }
509 else if (revents & POLLHUP)
510 {
511 // this cannot ;) happen on udp sockets
512 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
513 exit (1);
514 }
515 else 753 else
516 { 754 {
517 slog (L_ERR, 755 slog (L_ERR,
518 _("FATAL: unknown revents %08x in socket, terminating\n"), 756 _("FATAL: unknown revents %08x in socket, exiting.\n"),
519 revents); 757 revents);
520 exit (1); 758 exit (EXIT_FAILURE);
521 } 759 }
522} 760}
523 761
524void 762inline void
525vpn::tap_ev (io_watcher &w, short revents) 763vpn::tap_ev (ev::io &w, int revents)
526{ 764{
527 if (revents & POLLIN) 765 if (revents & EV_READ)
528 { 766 {
529 /* process data */ 767 /* process data */
530 tap_packet *pkt; 768 tap_packet *pkt;
531 769
532 pkt = tap->recv (); 770 pkt = tap->recv ();
539 int dst = mac2id (pkt->dst); 777 int dst = mac2id (pkt->dst);
540 int src = mac2id (pkt->src); 778 int src = mac2id (pkt->src);
541 779
542 if (src != THISNODE->id) 780 if (src != THISNODE->id)
543 { 781 {
544 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."));
545 exit (1); 783 exit (EXIT_FAILURE);
546 } 784 }
547 785
548 if (dst == THISNODE->id) 786 if (dst == THISNODE->id)
549 { 787 {
550 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."));
551 exit (1); 789 exit (EXIT_FAILURE);
552 } 790 }
553 791
554 if (dst > conns.size ()) 792 if (dst > conns.size ())
555 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);
556 else 794 else
557 {
558 if (dst)
559 {
560 // unicast
561 if (dst != THISNODE->id)
562 conns[dst - 1]->inject_data_packet (pkt);
563 }
564 else
565 {
566 // broadcast, this is ugly, but due to the security policy
567 // we have to connect to all hosts...
568 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
569 if ((*c)->conf != THISNODE)
570 (*c)->inject_data_packet (pkt); 795 inject_data_packet (pkt, dst);
571 }
572 }
573 } 796 }
574 797
575 delete pkt; 798 delete pkt;
576 } 799 }
577 else if (revents & (POLLHUP | POLLERR))
578 {
579 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
580 exit (1);
581 }
582 else 800 else
583 abort (); 801 abort ();
584} 802}
585 803
586void 804inline void
587vpn::event_cb (time_watcher &w) 805vpn::event_cb (ev::timer &w, int)
588{ 806{
589 if (events) 807 if (events)
590 { 808 {
591 if (events & EVENT_SHUTDOWN) 809 if (events & EVENT_SHUTDOWN)
592 { 810 {
593 slog (L_INFO, _("preparing shutdown...")); 811 slog (L_INFO, _("preparing shutdown..."));
594 812
595 shutdown_all (); 813 shutdown_all ();
596
597 remove_pid (pidfilename); 814 remove_pid (conf.pidfilename);
598
599 slog (L_INFO, _("terminating")); 815 slog (L_INFO, _("exiting."));
600 816 exit (EXIT_SUCCESS);
601 exit (0);
602 } 817 }
603 818
604 if (events & EVENT_RECONNECT) 819 if (events & EVENT_RECONNECT)
605 { 820 {
606 slog (L_INFO, _("forced reconnect")); 821 slog (L_INFO, _("forced reconnect."));
607 822
608 reconnect_all (); 823 reconnect_all ();
609 } 824 }
610 825
611 events = 0; 826 events = 0;
612 } 827 }
613
614 w.at = TSTAMP_CANCEL;
615} 828}
616 829
617void 830void
618vpn::shutdown_all () 831vpn::shutdown_all ()
619{ 832{
629 842
630 conns.clear (); 843 conns.clear ();
631 844
632 connection_init (); 845 connection_init ();
633 846
634 for (configuration::node_vector::iterator i = conf.nodes.begin (); 847 for (configuration::node_vector::iterator i = conf.nodes.begin (); i != conf.nodes.end (); ++i)
635 i != conf.nodes.end (); ++i) 848 conns.push_back (new connection (this, *i));
636 {
637 connection *conn = new connection (this);
638 849
639 conn->conf = *i; 850 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
640 conns.push_back (conn);
641
642 conn->establish_connection (); 851 (*c)->establish_connection ();
643 }
644} 852}
645 853
646connection *vpn::find_router () 854bool
855vpn::can_direct (conf_node *src, conf_node *dst) const
647{ 856{
648 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{
649 connection *router = 0; 869 connection *router = 0;
650 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{
651 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 919 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
652 { 920 {
653 connection *c = *i; 921 connection *o = *i;
654 922
655 if (c->conf->routerprio > prio 923 if (!o->is_direct
656 && c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use 924 && o->si.valid ()
657 && c->ictx && c->octx 925 && c->si != o->si
658 && c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode 926 && c == find_router_for (o))
659 {
660 prio = c->conf->routerprio;
661 router = c;
662 } 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 }
663 } 932 }
664
665 return router;
666} 933}
667 934
935void
668void vpn::send_connect_request (int id) 936vpn::send_connect_request (connection *c)
669{ 937{
670 connection *c = find_router (); 938 connection *r = find_router_for (c);
671 939
672 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);
673 c->send_connect_request (id); 944 r->send_connect_request (c->conf->id);
945 }
674 else 946 else
675 // 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."),
676 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 948 c->conf->nodename);
677 if ((*i)->conf->routerprio && (*i)->conf != THISNODE)
678 (*i)->establish_connection ();
679} 949}
680 950
681void 951void
682connection::dump_status () 952connection::dump_status ()
683{ 953{
684 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id); 954 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);
685 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"), 955 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),
686 connectmode, conf->connectmode, (const char *)si, (int)prot_minor); 956 connectmode, conf->connectmode, (const char *)si, (int)prot_minor);
687 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"),
688 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt); 958 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt);
689 slog (L_NOTICE, _(" establish_conn %ld / rekey %ld / keepalive %ld"),
690 (long)(establish_connection.at), (long)(rekey.at), (long)(keepalive.at));
691} 959}
692 960
693void 961void
694vpn::dump_status () 962vpn::dump_status ()
695{ 963{
696 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 964 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
697 965
698 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 966 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
699 (*c)->dump_status (); 967 (*c)->dump_status ();
700 968
701 slog (L_NOTICE, _("END status dump")); 969 slog (L_NOTICE, _("END status dump"));
702} 970}
703 971
704vpn::vpn (void) 972vpn::vpn (void)
973{
705: event (this, &vpn::event_cb) 974 event .set<vpn, &vpn::event_cb > (this);
706, udpv4_ev_watcher (this, &vpn::udpv4_ev) 975 udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
707, 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
708#if ENABLE_TCP 980#if ENABLE_TCP
709, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 981 tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
710#endif 982#endif
711#if ENABLE_ICMP 983#if ENABLE_ICMP
712, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 984 icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
713#endif 985#endif
714, tap_ev_watcher (this, &vpn::tap_ev) 986#if ENABLE_DNS
715{ 987 dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
988#endif
989 tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
716} 990}
717 991
718vpn::~vpn () 992vpn::~vpn ()
719{ 993{
720} 994}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines