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.31 by pcg, Sat Mar 5 19:13:16 2005 UTC vs.
Revision 1.44 by pcg, Tue Dec 4 17:17:20 2007 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-2005 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2007 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
… …
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 15 GNU General Public License for more details.
16 16
17 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
18 along with gvpe; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20*/ 20*/
21 21
22#include "config.h" 22#include "config.h"
23 23
24#include <list> 24#include <list>
… …
46 46
47vpn network; // THE vpn (bad design...) 47vpn network; // THE vpn (bad design...)
48 48
49///////////////////////////////////////////////////////////////////////////// 49/////////////////////////////////////////////////////////////////////////////
50 50
51const char *vpn::script_if_up () 51static void inline
52set_tos (int fd, int &tos_prev, int tos)
53{
54#if defined(SOL_IP) && defined(IP_TOS)
55 if (tos_prev == tos)
56 return;
57
58 tos_prev = tos;
59 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
60#endif
61}
62
63void
64vpn::script_init_env ()
52{ 65{
53 // the tunnel device mtu should be the physical mtu - overhead 66 // the tunnel device mtu should be the physical mtu - overhead
54 // the tricky part is rounding to the cipher key blocksize 67 // the tricky part is rounding to the cipher key blocksize
55 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD; 68 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
56 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 69 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
57 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 70 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
58 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 71 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
59 72
60 char *env; 73 char *env;
61 asprintf (&env, "CONFBASE=%s", confbase); putenv (env); 74 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
62 asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
63 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
64 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env); 75 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
65 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env); 76 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
66 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env); 77 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
67 asprintf (&env, "MTU=%d", mtu); putenv (env); 78 asprintf (&env, "MTU=%d", mtu); putenv (env);
68 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 79 asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
69 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8, 80 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
70 THISNODE->id & 0xff);
71 putenv (env);
72 81
82 conns [THISNODE->id - 1]->script_init_env ("");
83
84 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
85 {
86 char ext[16];
87 snprintf (ext, 16, "_%d", (*c)->conf->id);
88 (*c)->script_init_env (ext);
89 }
90}
91
92const char *vpn::script_if_init ()
93{
94 script_init_env ();
95
96 return tap->if_up ();
97}
98
99const char *vpn::script_if_up ()
100{
101 script_init_env ();
102
103 char *filename;
104 asprintf (&filename,
105 "%s/%s",
106 confbase,
73 return ::conf.script_if_up ? ::conf.script_if_up : "if-up"; 107 ::conf.script_if_up ? ::conf.script_if_up : "if-up");
108
109 return filename;
74} 110}
75 111
76int 112int
77vpn::setup () 113vpn::setup ()
78{ 114{
115 ipv4_tos = -1;
79 ipv4_fd = -1; 116 ipv4_fd = -1;
80 117
81 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 118 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
82 { 119 {
83 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 120 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
84 121
85 if (ipv4_fd < 0) 122 if (ipv4_fd < 0)
86 return -1; 123 return -1;
87 124
88 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); 125 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
126 fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
89 127
90#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 128#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
91 // this I really consider a linux bug. I am neither connected 129 // this I really consider a linux bug. I am neither connected
92 // nor do I fragment myself. Linux still sets DF and doesn't 130 // nor do I fragment myself. Linux still sets DF and doesn't
93 // fragment for me sometimes. 131 // fragment for me sometimes.
… …
103 { 141 {
104 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 142 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
105 exit (EXIT_FAILURE); 143 exit (EXIT_FAILURE);
106 } 144 }
107 145
108 ipv4_ev_watcher.start (ipv4_fd, EVENT_READ); 146 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
109 } 147 }
110 148
149 udpv4_tos = -1;
111 udpv4_fd = -1; 150 udpv4_fd = -1;
112 151
113 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 152 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
114 { 153 {
115 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 154 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
116 155
117 if (udpv4_fd < 0) 156 if (udpv4_fd < 0)
118 return -1; 157 return -1;
119 158
120 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK); 159 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
160 fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
121 161
122 // standard daemon practise... 162 // standard daemon practise...
123 { 163 {
124 int oval = 1; 164 int oval = 1;
125 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 165 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
141 { 181 {
142 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 182 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
143 exit (EXIT_FAILURE); 183 exit (EXIT_FAILURE);
144 } 184 }
145 185
146 udpv4_ev_watcher.start (udpv4_fd, EVENT_READ); 186 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
147 } 187 }
148 188
189 icmpv4_tos = -1;
149 icmpv4_fd = -1; 190 icmpv4_fd = -1;
150 191
151#if ENABLE_ICMP 192#if ENABLE_ICMP
152 if (THISNODE->protocols & PROT_ICMPv4) 193 if (THISNODE->protocols & PROT_ICMPv4)
153 { 194 {
154 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 195 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
155 196
156 if (icmpv4_fd < 0) 197 if (icmpv4_fd < 0)
157 return -1; 198 return -1;
158 199
159 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK); 200 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
201 fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
160 202
161#ifdef ICMP_FILTER 203#ifdef ICMP_FILTER
162 { 204 {
163 icmp_filter oval; 205 icmp_filter oval;
164 oval.data = 0xffffffff; 206 oval.data = 0xffffffff;
… …
173 // this I really consider a linux bug. I am neither connected 215 // this I really consider a linux bug. I am neither connected
174 // nor do I fragment myself. Linux still sets DF and doesn't 216 // nor do I fragment myself. Linux still sets DF and doesn't
175 // fragment for me sometimes. 217 // fragment for me sometimes.
176 { 218 {
177 int oval = IP_PMTUDISC_DONT; 219 int oval = IP_PMTUDISC_DONT;
178 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 220 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
179 } 221 }
180#endif 222#endif
181 223
182 sockinfo si (THISNODE, PROT_ICMPv4); 224 sockinfo si (THISNODE, PROT_ICMPv4);
183 225
… …
185 { 227 {
186 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); 228 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
187 exit (EXIT_FAILURE); 229 exit (EXIT_FAILURE);
188 } 230 }
189 231
190 icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ); 232 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
191 } 233 }
192#endif 234#endif
193 235
194 tcpv4_fd = -1; 236 tcpv4_fd = -1;
195 237
… …
200 242
201 if (tcpv4_fd < 0) 243 if (tcpv4_fd < 0)
202 return -1; 244 return -1;
203 245
204 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK); 246 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
247 fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
205 248
206 // standard daemon practise... 249 // standard daemon practise...
207 { 250 {
208 int oval = 1; 251 int oval = 1;
209 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 252 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
221 { 264 {
222 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 265 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
223 exit (EXIT_FAILURE); 266 exit (EXIT_FAILURE);
224 } 267 }
225 268
226 tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ); 269 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
227 } 270 }
228#endif 271#endif
272
273 dnsv4_tos = -1;
274 dnsv4_fd = -1;
229 275
230#if ENABLE_DNS 276#if ENABLE_DNS
231 if (THISNODE->protocols & PROT_DNSv4) 277 if (THISNODE->protocols & PROT_DNSv4)
232 { 278 {
233 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4); 279 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
234 280
235 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 281 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
236 282
237 if (dnsv4_fd < 0) 283 if (dnsv4_fd < 0)
238 return -1; 284 return -1;
285
286 fcntl (dnsv4_fd, F_SETFL, O_NONBLOCK);
287 fcntl (dnsv4_fd, F_SETFD, FD_CLOEXEC);
288
289# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
290 // this I really consider a linux bug. I am neither connected
291 // nor do I fragment myself. Linux still sets DF and doesn't
292 // fragment for me sometimes.
293 {
294 int oval = IP_PMTUDISC_DONT;
295 setsockopt (dnsv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
296 }
297# endif
239 298
240 // standard daemon practise... 299 // standard daemon practise...
241 { 300 {
242 int oval = 1; 301 int oval = 1;
243 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 302 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
251 { 310 {
252 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno)); 311 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
253 exit (EXIT_FAILURE); 312 exit (EXIT_FAILURE);
254 } 313 }
255 314
256 dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ); 315 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
257 } 316 }
258#endif 317#endif
318
319 /////////////////////////////////////////////////////////////////////////////
320
321 reconnect_all ();
322
323 /////////////////////////////////////////////////////////////////////////////
259 324
260 tap = new tap_device (); 325 tap = new tap_device ();
261 if (!tap) //D this, of course, never catches 326 if (!tap) //D this, of course, never catches
262 { 327 {
263 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 328 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
264 exit (EXIT_FAILURE); 329 exit (EXIT_FAILURE);
265 } 330 }
266 331
267 run_script (run_script_cb (this, &vpn::script_if_up), true); 332 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
268 333
334 run_script_cb cb;
335 cb.set<vpn, &vpn::script_if_init> (this);
336
337 if (tap->if_up () &&
338 !run_script (cb, true))
339 {
340 slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
341 tap->if_up ());
342 exit (EXIT_FAILURE);
343 }
344
345 cb.set<vpn, &vpn::script_if_up> (this);
346 if (!run_script (cb, true))
347 {
348 slog (L_ERR, _("if-up command execution failed, exiting."));
349 exit (EXIT_FAILURE);
350 }
351
269 tap_ev_watcher.start (tap->fd, EVENT_READ); 352 tap_ev_watcher.start (tap->fd, EV_READ);
270
271 reconnect_all ();
272 353
273 return 0; 354 return 0;
274} 355}
275 356
276bool 357bool
277vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 358vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
278{ 359{
279#if defined(SOL_IP) && defined(IP_TOS) 360 set_tos (ipv4_fd, ipv4_tos, tos);
280 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
281#endif
282 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 361 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
283 362
284 return true; 363 return true;
285} 364}
286 365
… …
309 388
310#if ENABLE_ICMP 389#if ENABLE_ICMP
311bool 390bool
312vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 391vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
313{ 392{
314#if defined(SOL_IP) && defined(IP_TOS)
315 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
316#endif
317
318 pkt->unshift_hdr (4); 393 pkt->unshift_hdr (4);
319 394
320 icmp_header *hdr = (icmp_header *)&((*pkt)[0]); 395 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
321 hdr->type = ::conf.icmp_type; 396 hdr->type = ::conf.icmp_type;
322 hdr->code = 255; 397 hdr->code = 255;
323 hdr->checksum = 0; 398 hdr->checksum = 0;
324 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 399 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
325 400
401 set_tos (icmpv4_fd, icmpv4_tos, tos);
326 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 402 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
327 403
328 return true; 404 return true;
329} 405}
330#endif 406#endif
331 407
332bool 408bool
333vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 409vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
334{ 410{
335#if defined(SOL_IP) && defined(IP_TOS) 411 set_tos (udpv4_fd, udpv4_tos, tos);
336 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
337#endif
338 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 412 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
339 413
340 return true; 414 return true;
341} 415}
342 416
… …
404{ 478{
405 switch (si.prot) 479 switch (si.prot)
406 { 480 {
407 case PROT_IPv4: 481 case PROT_IPv4:
408 return send_ipv4_packet (pkt, si, tos); 482 return send_ipv4_packet (pkt, si, tos);
483
409 case PROT_UDPv4: 484 case PROT_UDPv4:
410 return send_udpv4_packet (pkt, si, tos); 485 return send_udpv4_packet (pkt, si, tos);
486
411#if ENABLE_TCP 487#if ENABLE_TCP
412 case PROT_TCPv4: 488 case PROT_TCPv4:
413 return send_tcpv4_packet (pkt, si, tos); 489 return send_tcpv4_packet (pkt, si, tos);
414#endif 490#endif
415#if ENABLE_ICMP 491#if ENABLE_ICMP
… …
418#endif 494#endif
419#if ENABLE_DNS 495#if ENABLE_DNS
420 case PROT_DNSv4: 496 case PROT_DNSv4:
421 return send_dnsv4_packet (pkt, si, tos); 497 return send_dnsv4_packet (pkt, si, tos);
422#endif 498#endif
423
424 default: 499 default:
425 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si); 500 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
426 } 501 }
427 502
428 return false; 503 return false;
429} 504}
430 505
431void 506void
432vpn::ipv4_ev (io_watcher &w, short revents) 507vpn::ipv4_ev (ev::io &w, int revents)
433{ 508{
434 if (revents & EVENT_READ) 509 if (revents & EV_READ)
435 { 510 {
436 vpn_packet *pkt = new vpn_packet; 511 vpn_packet *pkt = new vpn_packet;
437 struct sockaddr_in sa; 512 struct sockaddr_in sa;
438 socklen_t sa_len = sizeof (sa); 513 socklen_t sa_len = sizeof (sa);
439 int len; 514 int len;
… …
468 } 543 }
469} 544}
470 545
471#if ENABLE_ICMP 546#if ENABLE_ICMP
472void 547void
473vpn::icmpv4_ev (io_watcher &w, short revents) 548vpn::icmpv4_ev (ev::io &w, int revents)
474{ 549{
475 if (revents & EVENT_READ) 550 if (revents & EV_READ)
476 { 551 {
477 vpn_packet *pkt = new vpn_packet; 552 vpn_packet *pkt = new vpn_packet;
478 struct sockaddr_in sa; 553 struct sockaddr_in sa;
479 socklen_t sa_len = sizeof (sa); 554 socklen_t sa_len = sizeof (sa);
480 int len; 555 int len;
… …
516 } 591 }
517} 592}
518#endif 593#endif
519 594
520void 595void
521vpn::udpv4_ev (io_watcher &w, short revents) 596vpn::udpv4_ev (ev::io &w, int revents)
522{ 597{
523 if (revents & EVENT_READ) 598 if (revents & EV_READ)
524 { 599 {
525 vpn_packet *pkt = new vpn_packet; 600 vpn_packet *pkt = new vpn_packet;
526 struct sockaddr_in sa; 601 struct sockaddr_in sa;
527 socklen_t sa_len = sizeof (sa); 602 socklen_t sa_len = sizeof (sa);
528 int len; 603 int len;
… …
553 exit (EXIT_FAILURE); 628 exit (EXIT_FAILURE);
554 } 629 }
555} 630}
556 631
557void 632void
558vpn::tap_ev (io_watcher &w, short revents) 633vpn::tap_ev (ev::io &w, int revents)
559{ 634{
560 if (revents & EVENT_READ) 635 if (revents & EV_READ)
561 { 636 {
562 /* process data */ 637 /* process data */
563 tap_packet *pkt; 638 tap_packet *pkt;
564 639
565 pkt = tap->recv (); 640 pkt = tap->recv ();
… …
595 else 670 else
596 abort (); 671 abort ();
597} 672}
598 673
599void 674void
600vpn::event_cb (time_watcher &w) 675vpn::event_cb (ev::timer &w, int)
601{ 676{
602 if (events) 677 if (events)
603 { 678 {
604 if (events & EVENT_SHUTDOWN) 679 if (events & EVENT_SHUTDOWN)
605 { 680 {
… …
696} 771}
697 772
698void 773void
699vpn::dump_status () 774vpn::dump_status ()
700{ 775{
701 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 776 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
702 777
703 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 778 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
704 (*c)->dump_status (); 779 (*c)->dump_status ();
705 780
706 slog (L_NOTICE, _("END status dump")); 781 slog (L_NOTICE, _("END status dump"));
707} 782}
708 783
709vpn::vpn (void) 784vpn::vpn (void)
785{
710: event (this, &vpn::event_cb) 786 event .set<vpn, &vpn::event_cb > (this);
711, udpv4_ev_watcher (this, &vpn::udpv4_ev) 787 udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
712, ipv4_ev_watcher (this, &vpn::ipv4_ev) 788 ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
713#if ENABLE_TCP 789#if ENABLE_TCP
714, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 790 tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
715#endif 791#endif
716#if ENABLE_ICMP 792#if ENABLE_ICMP
717, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 793 icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
718#endif 794#endif
719#if ENABLE_DNS 795#if ENABLE_DNS
720, dnsv4_ev_watcher (this, &vpn::dnsv4_ev) 796 dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
721#endif 797#endif
722, tap_ev_watcher (this, &vpn::tap_ev) 798 tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
723{
724} 799}
725 800
726vpn::~vpn () 801vpn::~vpn ()
727{ 802{
728} 803}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines