ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/vpn.C
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines