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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines