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.36 by pcg, Fri Apr 8 16:48:16 2005 UTC vs.
Revision 1.48 by pcg, Sat Aug 9 18:30:55 2008 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-2008 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 it
8 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
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 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
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 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 along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 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.
20*/ 30*/
21 31
22#include "config.h" 32#include "config.h"
23 33
24#include <list> 34#include <list>
… …
46 56
47vpn network; // THE vpn (bad design...) 57vpn network; // THE vpn (bad design...)
48 58
49///////////////////////////////////////////////////////////////////////////// 59/////////////////////////////////////////////////////////////////////////////
50 60
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
51void 73void
52vpn::script_init_env () 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
… …
75 snprintf (ext, 16, "_%d", (*c)->conf->id); 97 snprintf (ext, 16, "_%d", (*c)->conf->id);
76 (*c)->script_init_env (ext); 98 (*c)->script_init_env (ext);
77 } 99 }
78} 100}
79 101
102inline const char *
80const char *vpn::script_if_init () 103vpn::script_if_init ()
81{ 104{
82 script_init_env (); 105 script_init_env ();
83 106
84 return tap->if_up (); 107 return tap->if_up ();
85} 108}
86 109
110inline const char *
87const char *vpn::script_if_up () 111vpn::script_if_up ()
88{ 112{
89 script_init_env (); 113 script_init_env ();
90 114
91 char *filename; 115 char *filename;
92 asprintf (&filename, 116 asprintf (&filename,
… …
98} 122}
99 123
100int 124int
101vpn::setup () 125vpn::setup ()
102{ 126{
127 ipv4_tos = -1;
103 ipv4_fd = -1; 128 ipv4_fd = -1;
104 129
105 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 130 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
106 { 131 {
107 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 132 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
108 133
109 if (ipv4_fd < 0) 134 if (ipv4_fd < 0)
110 return -1; 135 return -1;
111 136
112 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); 137 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
138 fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
113 139
114#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 140#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
115 // this I really consider a linux bug. I am neither connected 141 // this I really consider a linux bug. I am neither connected
116 // nor do I fragment myself. Linux still sets DF and doesn't 142 // nor do I fragment myself. Linux still sets DF and doesn't
117 // fragment for me sometimes. 143 // fragment for me sometimes.
… …
127 { 153 {
128 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 154 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
129 exit (EXIT_FAILURE); 155 exit (EXIT_FAILURE);
130 } 156 }
131 157
132 ipv4_ev_watcher.start (ipv4_fd, EVENT_READ); 158 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
133 } 159 }
134 160
161 udpv4_tos = -1;
135 udpv4_fd = -1; 162 udpv4_fd = -1;
136 163
137 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 164 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
138 { 165 {
139 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 166 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
140 167
141 if (udpv4_fd < 0) 168 if (udpv4_fd < 0)
142 return -1; 169 return -1;
143 170
144 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK); 171 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
172 fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
145 173
146 // standard daemon practise... 174 // standard daemon practise...
147 { 175 {
148 int oval = 1; 176 int oval = 1;
149 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 177 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
165 { 193 {
166 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 194 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
167 exit (EXIT_FAILURE); 195 exit (EXIT_FAILURE);
168 } 196 }
169 197
170 udpv4_ev_watcher.start (udpv4_fd, EVENT_READ); 198 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
171 } 199 }
172 200
201 icmpv4_tos = -1;
173 icmpv4_fd = -1; 202 icmpv4_fd = -1;
174 203
175#if ENABLE_ICMP 204#if ENABLE_ICMP
176 if (THISNODE->protocols & PROT_ICMPv4) 205 if (THISNODE->protocols & PROT_ICMPv4)
177 { 206 {
178 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 207 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
179 208
180 if (icmpv4_fd < 0) 209 if (icmpv4_fd < 0)
181 return -1; 210 return -1;
182 211
183 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK); 212 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
213 fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
184 214
185#ifdef ICMP_FILTER 215#ifdef ICMP_FILTER
186 { 216 {
187 icmp_filter oval; 217 icmp_filter oval;
188 oval.data = 0xffffffff; 218 oval.data = 0xffffffff;
… …
209 { 239 {
210 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); 240 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
211 exit (EXIT_FAILURE); 241 exit (EXIT_FAILURE);
212 } 242 }
213 243
214 icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ); 244 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
215 } 245 }
216#endif 246#endif
217 247
218 tcpv4_fd = -1; 248 tcpv4_fd = -1;
219 249
… …
224 254
225 if (tcpv4_fd < 0) 255 if (tcpv4_fd < 0)
226 return -1; 256 return -1;
227 257
228 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK); 258 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
259 fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
229 260
230 // standard daemon practise... 261 // standard daemon practise...
231 { 262 {
232 int oval = 1; 263 int oval = 1;
233 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 264 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
245 { 276 {
246 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 277 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
247 exit (EXIT_FAILURE); 278 exit (EXIT_FAILURE);
248 } 279 }
249 280
250 tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ); 281 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
251 } 282 }
252#endif 283#endif
284
285 dnsv4_tos = -1;
286 dnsv4_fd = -1;
253 287
254#if ENABLE_DNS 288#if ENABLE_DNS
255 if (THISNODE->protocols & PROT_DNSv4) 289 if (THISNODE->protocols & PROT_DNSv4)
256 { 290 {
257 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4); 291 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
258 292
259 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 293 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
260 294
261 if (dnsv4_fd < 0) 295 if (dnsv4_fd < 0)
262 return -1; 296 return -1;
297
298 fcntl (dnsv4_fd, F_SETFL, O_NONBLOCK);
299 fcntl (dnsv4_fd, F_SETFD, FD_CLOEXEC);
263 300
264# if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 301# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
265 // this I really consider a linux bug. I am neither connected 302 // this I really consider a linux bug. I am neither connected
266 // nor do I fragment myself. Linux still sets DF and doesn't 303 // nor do I fragment myself. Linux still sets DF and doesn't
267 // fragment for me sometimes. 304 // fragment for me sometimes.
… …
285 { 322 {
286 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno)); 323 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
287 exit (EXIT_FAILURE); 324 exit (EXIT_FAILURE);
288 } 325 }
289 326
290 dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ); 327 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
291 } 328 }
292#endif 329#endif
293 330
294 ///////////////////////////////////////////////////////////////////////////// 331 /////////////////////////////////////////////////////////////////////////////
295 332
… …
302 { 339 {
303 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 340 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
304 exit (EXIT_FAILURE); 341 exit (EXIT_FAILURE);
305 } 342 }
306 343
344 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
345
346 run_script_cb cb;
347 cb.set<vpn, &vpn::script_if_init> (this);
348
307 if (tap->if_up () && 349 if (tap->if_up () &&
308 !run_script (run_script_cb (this, &vpn::script_if_init), true)) 350 !run_script (cb, true))
309 { 351 {
310 slog (L_ERR, _("interface initialization command '%s' failed, exiting."), 352 slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
311 tap->if_up ()); 353 tap->if_up ());
312 exit (EXIT_FAILURE); 354 exit (EXIT_FAILURE);
313 } 355 }
314 356
315 if (!run_script (run_script_cb (this, &vpn::script_if_up), true)) 357 cb.set<vpn, &vpn::script_if_up> (this);
358 if (!run_script (cb, true))
316 { 359 {
317 slog (L_ERR, _("if-up command execution failed, exiting.")); 360 slog (L_ERR, _("if-up command execution failed, exiting."));
318 exit (EXIT_FAILURE); 361 exit (EXIT_FAILURE);
319 } 362 }
320 363
321 tap_ev_watcher.start (tap->fd, EVENT_READ); 364 tap_ev_watcher.start (tap->fd, EV_READ);
322 365
323 return 0; 366 return 0;
324} 367}
325 368
326bool 369bool
327vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 370vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
328{ 371{
329#if defined(SOL_IP) && defined(IP_TOS) 372 set_tos (ipv4_fd, ipv4_tos, tos);
330 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
331#endif
332 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 373 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
333 374
334 return true; 375 return true;
335} 376}
336 377
… …
359 400
360#if ENABLE_ICMP 401#if ENABLE_ICMP
361bool 402bool
362vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 403vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
363{ 404{
364#if defined(SOL_IP) && defined(IP_TOS)
365 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
366#endif
367
368 pkt->unshift_hdr (4); 405 pkt->unshift_hdr (4);
369 406
370 icmp_header *hdr = (icmp_header *)&((*pkt)[0]); 407 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
371 hdr->type = ::conf.icmp_type; 408 hdr->type = ::conf.icmp_type;
372 hdr->code = 255; 409 hdr->code = 255;
373 hdr->checksum = 0; 410 hdr->checksum = 0;
374 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 411 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
375 412
413 set_tos (icmpv4_fd, icmpv4_tos, tos);
376 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 414 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
377 415
378 return true; 416 return true;
379} 417}
380#endif 418#endif
381 419
382bool 420bool
383vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 421vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
384{ 422{
385#if defined(SOL_IP) && defined(IP_TOS) 423 set_tos (udpv4_fd, udpv4_tos, tos);
386 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
387#endif
388 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 424 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
389 425
390 return true; 426 return true;
391} 427}
392 428
… …
403 { 439 {
404 // broadcast, this is ugly, but due to the security policy 440 // broadcast, this is ugly, but due to the security policy
405 // we have to connect to all hosts... 441 // we have to connect to all hosts...
406 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 442 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
407 if ((*c)->conf != THISNODE) 443 if ((*c)->conf != THISNODE)
408 (*c)->inject_data_packet (pkt, true); 444 (*c)->inject_data_packet (pkt);
409 } 445 }
410} 446}
411 447
412void 448void
413vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 449vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
… …
454{ 490{
455 switch (si.prot) 491 switch (si.prot)
456 { 492 {
457 case PROT_IPv4: 493 case PROT_IPv4:
458 return send_ipv4_packet (pkt, si, tos); 494 return send_ipv4_packet (pkt, si, tos);
495
459 case PROT_UDPv4: 496 case PROT_UDPv4:
460 return send_udpv4_packet (pkt, si, tos); 497 return send_udpv4_packet (pkt, si, tos);
498
461#if ENABLE_TCP 499#if ENABLE_TCP
462 case PROT_TCPv4: 500 case PROT_TCPv4:
463 return send_tcpv4_packet (pkt, si, tos); 501 return send_tcpv4_packet (pkt, si, tos);
464#endif 502#endif
465#if ENABLE_ICMP 503#if ENABLE_ICMP
… …
468#endif 506#endif
469#if ENABLE_DNS 507#if ENABLE_DNS
470 case PROT_DNSv4: 508 case PROT_DNSv4:
471 return send_dnsv4_packet (pkt, si, tos); 509 return send_dnsv4_packet (pkt, si, tos);
472#endif 510#endif
473
474 default: 511 default:
475 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si); 512 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
476 } 513 }
477 514
478 return false; 515 return false;
479} 516}
480 517
481void 518inline void
482vpn::ipv4_ev (io_watcher &w, short revents) 519vpn::ipv4_ev (ev::io &w, int revents)
483{ 520{
484 if (revents & EVENT_READ) 521 if (revents & EV_READ)
485 { 522 {
486 vpn_packet *pkt = new vpn_packet; 523 vpn_packet *pkt = new vpn_packet;
487 struct sockaddr_in sa; 524 struct sockaddr_in sa;
488 socklen_t sa_len = sizeof (sa); 525 socklen_t sa_len = sizeof (sa);
489 int len; 526 int len;
… …
517 exit (EXIT_FAILURE); 554 exit (EXIT_FAILURE);
518 } 555 }
519} 556}
520 557
521#if ENABLE_ICMP 558#if ENABLE_ICMP
522void 559inline void
523vpn::icmpv4_ev (io_watcher &w, short revents) 560vpn::icmpv4_ev (ev::io &w, int revents)
524{ 561{
525 if (revents & EVENT_READ) 562 if (revents & EV_READ)
526 { 563 {
527 vpn_packet *pkt = new vpn_packet; 564 vpn_packet *pkt = new vpn_packet;
528 struct sockaddr_in sa; 565 struct sockaddr_in sa;
529 socklen_t sa_len = sizeof (sa); 566 socklen_t sa_len = sizeof (sa);
530 int len; 567 int len;
… …
565 exit (EXIT_FAILURE); 602 exit (EXIT_FAILURE);
566 } 603 }
567} 604}
568#endif 605#endif
569 606
570void 607inline void
571vpn::udpv4_ev (io_watcher &w, short revents) 608vpn::udpv4_ev (ev::io &w, int revents)
572{ 609{
573 if (revents & EVENT_READ) 610 if (revents & EV_READ)
574 { 611 {
575 vpn_packet *pkt = new vpn_packet; 612 vpn_packet *pkt = new vpn_packet;
576 struct sockaddr_in sa; 613 struct sockaddr_in sa;
577 socklen_t sa_len = sizeof (sa); 614 socklen_t sa_len = sizeof (sa);
578 int len; 615 int len;
… …
602 revents); 639 revents);
603 exit (EXIT_FAILURE); 640 exit (EXIT_FAILURE);
604 } 641 }
605} 642}
606 643
607void 644inline void
608vpn::tap_ev (io_watcher &w, short revents) 645vpn::tap_ev (ev::io &w, int revents)
609{ 646{
610 if (revents & EVENT_READ) 647 if (revents & EV_READ)
611 { 648 {
612 /* process data */ 649 /* process data */
613 tap_packet *pkt; 650 tap_packet *pkt;
614 651
615 pkt = tap->recv (); 652 pkt = tap->recv ();
… …
644 } 681 }
645 else 682 else
646 abort (); 683 abort ();
647} 684}
648 685
649void 686inline void
650vpn::event_cb (time_watcher &w) 687vpn::event_cb (ev::timer &w, int)
651{ 688{
652 if (events) 689 if (events)
653 { 690 {
654 if (events & EVENT_SHUTDOWN) 691 if (events & EVENT_SHUTDOWN)
655 { 692 {
… …
739 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id); 776 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);
740 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"), 777 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),
741 connectmode, conf->connectmode, (const char *)si, (int)prot_minor); 778 connectmode, conf->connectmode, (const char *)si, (int)prot_minor);
742 slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"), 779 slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"),
743 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt); 780 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt);
744 slog (L_NOTICE, _(" establish_conn %ld / rekey %ld / keepalive %ld"),
745 (long)(establish_connection.at), (long)(rekey.at), (long)(keepalive.at));
746} 781}
747 782
748void 783void
749vpn::dump_status () 784vpn::dump_status ()
750{ 785{
751 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 786 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
752 787
753 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 788 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
754 (*c)->dump_status (); 789 (*c)->dump_status ();
755 790
756 slog (L_NOTICE, _("END status dump")); 791 slog (L_NOTICE, _("END status dump"));
757} 792}
758 793
759vpn::vpn (void) 794vpn::vpn (void)
795{
760: event (this, &vpn::event_cb) 796 event .set<vpn, &vpn::event_cb > (this);
761, udpv4_ev_watcher (this, &vpn::udpv4_ev) 797 udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
762, ipv4_ev_watcher (this, &vpn::ipv4_ev) 798 ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
763#if ENABLE_TCP 799#if ENABLE_TCP
764, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 800 tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
765#endif 801#endif
766#if ENABLE_ICMP 802#if ENABLE_ICMP
767, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 803 icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
768#endif 804#endif
769#if ENABLE_DNS 805#if ENABLE_DNS
770, dnsv4_ev_watcher (this, &vpn::dnsv4_ev) 806 dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
771#endif 807#endif
772, tap_ev_watcher (this, &vpn::tap_ev) 808 tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
773{
774} 809}
775 810
776vpn::~vpn () 811vpn::~vpn ()
777{ 812{
778} 813}

Diff Legend

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