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.18 by pcg, Thu Oct 16 02:28:36 2003 UTC vs.
Revision 1.33 by pcg, Wed Mar 23 21:55:39 2005 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 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
5 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
6 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 10 (at your 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,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but 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
12 GNU General Public License for more details. 15 GNU General 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
15 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
16 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17*/ 20*/
18 21
19#include "config.h" 22#include "config.h"
20 23
21#include <list> 24#include <list>
22 25
26#include <cstdio>
27#include <cstring>
23#include <cstdlib> 28#include <cstdlib>
24#include <cstring>
25#include <cstdio>
26 29
27#include <sys/types.h> 30#include <sys/types.h>
28#include <sys/socket.h> 31#include <sys/socket.h>
29#include <sys/wait.h> 32#include <sys/wait.h>
30#include <errno.h> 33#include <errno.h>
… …
39 42
40#include "connection.h" 43#include "connection.h"
41#include "util.h" 44#include "util.h"
42#include "vpn.h" 45#include "vpn.h"
43 46
47vpn network; // THE vpn (bad design...)
48
44///////////////////////////////////////////////////////////////////////////// 49/////////////////////////////////////////////////////////////////////////////
45 50
46const char *vpn::script_if_up () 51void
52vpn::script_init_env ()
47{ 53{
48 // the tunnel device mtu should be the physical mtu - overhead 54 // the tunnel device mtu should be the physical mtu - overhead
49 // the tricky part is rounding to the cipher key blocksize 55 // the tricky part is rounding to the cipher key blocksize
50 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD; 56 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
51 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 57 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
52 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 58 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
53 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 59 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
54 60
55 char *env; 61 char *env;
56 asprintf (&env, "CONFBASE=%s", confbase); 62 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
57 putenv (env);
58 asprintf (&env, "NODENAME=%s", THISNODE->nodename); 63 asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
59 putenv (env);
60 asprintf (&env, "NODEID=%d", THISNODE->id); 64 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
61 putenv (env);
62 asprintf (&env, "IFNAME=%s", tap->interface ()); 65 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
63 putenv (env); 66 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
67 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
64 asprintf (&env, "MTU=%d", mtu); 68 asprintf (&env, "MTU=%d", mtu); putenv (env);
65 putenv (env);
66 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 69 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",
67 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8, 70 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
68 THISNODE->id & 0xff); 71 THISNODE->id & 0xff); putenv (env);
69 putenv (env);
70 72
73 // TODO: info for other nodes, maybe?
74}
75
76const char *vpn::script_if_init ()
77{
78 script_init_env ();
79
80 return tap->if_up ();
81}
82
83const char *vpn::script_if_up ()
84{
85 script_init_env ();
86
87 char *filename;
88 asprintf (&filename,
89 "%s/%s",
90 confbase,
71 return ::conf.script_if_up ? ::conf.script_if_up : "if-up"; 91 ::conf.script_if_up ? ::conf.script_if_up : "if-up");
92
93 return filename;
72} 94}
73 95
74int 96int
75vpn::setup () 97vpn::setup ()
76{ 98{
… …
98 sockinfo si (THISNODE, PROT_IPv4); 120 sockinfo si (THISNODE, PROT_IPv4);
99 121
100 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 122 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
101 { 123 {
102 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 124 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
103 exit (1); 125 exit (EXIT_FAILURE);
104 } 126 }
105 127
106 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 128 ipv4_ev_watcher.start (ipv4_fd, EVENT_READ);
107 } 129 }
108 130
109 udpv4_fd = -1; 131 udpv4_fd = -1;
110 132
111 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 133 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
… …
136 sockinfo si (THISNODE, PROT_UDPv4); 158 sockinfo si (THISNODE, PROT_UDPv4);
137 159
138 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 160 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
139 { 161 {
140 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 162 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
141 exit (1); 163 exit (EXIT_FAILURE);
142 } 164 }
143 165
144 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 166 udpv4_ev_watcher.start (udpv4_fd, EVENT_READ);
145 } 167 }
146 168
147 icmpv4_fd = -1; 169 icmpv4_fd = -1;
148 170
149#if ENABLE_ICMP 171#if ENABLE_ICMP
… …
180 sockinfo si (THISNODE, PROT_ICMPv4); 202 sockinfo si (THISNODE, PROT_ICMPv4);
181 203
182 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 204 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
183 { 205 {
184 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); 206 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
185 exit (1); 207 exit (EXIT_FAILURE);
186 } 208 }
187 209
188 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); 210 icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ);
189 } 211 }
190#endif 212#endif
191 213
192 tcpv4_fd = -1; 214 tcpv4_fd = -1;
193 215
… …
210 sockinfo si (THISNODE, PROT_TCPv4); 232 sockinfo si (THISNODE, PROT_TCPv4);
211 233
212 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 234 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
213 { 235 {
214 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 236 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
215 exit (1); 237 exit (EXIT_FAILURE);
216 } 238 }
217 239
218 if (listen (tcpv4_fd, 5)) 240 if (listen (tcpv4_fd, 5))
219 { 241 {
220 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 242 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
221 exit (1); 243 exit (EXIT_FAILURE);
244 }
245
246 tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ);
247 }
248#endif
249
250#if ENABLE_DNS
251 if (THISNODE->protocols & PROT_DNSv4)
252 {
253 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
254
255 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
256
257 if (dnsv4_fd < 0)
258 return -1;
259
260#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
261 // this I really consider a linux bug. I am neither connected
262 // nor do I fragment myself. Linux still sets DF and doesn't
263 // fragment for me sometimes.
264 {
265 int oval = IP_PMTUDISC_DONT;
266 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
267 }
268#endif
269
270 // standard daemon practise...
271 {
272 int oval = 1;
273 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
274 }
275
276 sockinfo si (THISNODE->dns_hostname,
277 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
278 PROT_DNSv4);
279
280 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
222 } 281 {
282 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
283 exit (EXIT_FAILURE);
284 }
223 285
224 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN); 286 dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ);
225 } 287 }
226#endif 288#endif
227 289
228 tap = new tap_device (); 290 tap = new tap_device ();
229 if (!tap) //D this, of course, never catches 291 if (!tap) //D this, of course, never catches
230 { 292 {
231 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 293 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
232 exit (1); 294 exit (EXIT_FAILURE);
233 } 295 }
234 296
297 if (tap->if_up () &&
298 !run_script (run_script_cb (this, &vpn::script_if_init), true))
299 {
300 slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
301 tap->if_up ());
302 exit (EXIT_FAILURE);
303 }
304
235 run_script (run_script_cb (this, &vpn::script_if_up), true); 305 if (!run_script (run_script_cb (this, &vpn::script_if_up), true))
306 {
307 slog (L_ERR, _("if-up command execution failed, exiting."));
308 exit (EXIT_FAILURE);
309 }
236 310
237 tap_ev_watcher.start (tap->fd, POLLIN); 311 tap_ev_watcher.start (tap->fd, EVENT_READ);
238 312
239 reconnect_all (); 313 reconnect_all ();
240 314
241 return 0; 315 return 0;
242}
243
244// send a vpn packet out to other hosts
245bool
246vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
247{
248 switch (si.prot)
249 {
250 case PROT_IPv4:
251 return send_ipv4_packet (pkt, si, tos);
252
253 case PROT_UDPv4:
254 return send_udpv4_packet (pkt, si, tos);
255
256#if ENABLE_TCP
257 case PROT_TCPv4:
258 return send_tcpv4_packet (pkt, si, tos);
259#endif
260
261#if ENABLE_ICMP
262 case PROT_ICMPv4:
263 return send_icmpv4_packet (pkt, si, tos);
264#endif
265
266 default:
267 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
268 return false;
269 }
270} 316}
271 317
272bool 318bool
273vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 319vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
274{ 320{
… …
393 else 439 else
394 c->recv_vpn_packet (pkt, rsi); 440 c->recv_vpn_packet (pkt, rsi);
395 } 441 }
396} 442}
397 443
444bool
445vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
446{
447 switch (si.prot)
448 {
449 case PROT_IPv4:
450 return send_ipv4_packet (pkt, si, tos);
451 case PROT_UDPv4:
452 return send_udpv4_packet (pkt, si, tos);
453#if ENABLE_TCP
454 case PROT_TCPv4:
455 return send_tcpv4_packet (pkt, si, tos);
456#endif
457#if ENABLE_ICMP
458 case PROT_ICMPv4:
459 return send_icmpv4_packet (pkt, si, tos);
460#endif
461#if ENABLE_DNS
462 case PROT_DNSv4:
463 return send_dnsv4_packet (pkt, si, tos);
464#endif
465
466 default:
467 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
468 }
469
470 return false;
471}
472
398void 473void
399vpn::ipv4_ev (io_watcher &w, short revents) 474vpn::ipv4_ev (io_watcher &w, short revents)
400{ 475{
401 if (revents & (POLLIN | POLLERR)) 476 if (revents & EVENT_READ)
402 { 477 {
403 vpn_packet *pkt = new vpn_packet; 478 vpn_packet *pkt = new vpn_packet;
404 struct sockaddr_in sa; 479 struct sockaddr_in sa;
405 socklen_t sa_len = sizeof (sa); 480 socklen_t sa_len = sizeof (sa);
406 int len; 481 int len;
… …
411 486
412 if (len > 0) 487 if (len > 0)
413 { 488 {
414 pkt->len = len; 489 pkt->len = len;
415 490
416 // raw sockets deliver the ipv4, but don't expect it on sends 491 // raw sockets deliver the ipv4 header, but don't expect it on sends
417 // this is slow, but...
418 pkt->skip_hdr (IP_OVERHEAD); 492 pkt->skip_hdr (IP_OVERHEAD);
419 493
420 recv_vpn_packet (pkt, si); 494 recv_vpn_packet (pkt, si);
421 } 495 }
422 else 496 else
… …
425 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 499 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
426 } 500 }
427 501
428 delete pkt; 502 delete pkt;
429 } 503 }
430 else if (revents & POLLHUP)
431 {
432 // this cannot ;) happen on udp sockets
433 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
434 exit (1);
435 }
436 else 504 else
437 { 505 {
438 slog (L_ERR, 506 slog (L_ERR,
439 _("FATAL: unknown revents %08x in socket, terminating\n"), 507 _("FATAL: unknown revents %08x in socket, terminating\n"),
440 revents); 508 revents);
441 exit (1); 509 exit (EXIT_FAILURE);
442 } 510 }
443} 511}
444 512
445#if ENABLE_ICMP 513#if ENABLE_ICMP
446void 514void
447vpn::icmpv4_ev (io_watcher &w, short revents) 515vpn::icmpv4_ev (io_watcher &w, short revents)
448{ 516{
449 if (revents & (POLLIN | POLLERR)) 517 if (revents & EVENT_READ)
450 { 518 {
451 vpn_packet *pkt = new vpn_packet; 519 vpn_packet *pkt = new vpn_packet;
452 struct sockaddr_in sa; 520 struct sockaddr_in sa;
453 socklen_t sa_len = sizeof (sa); 521 socklen_t sa_len = sizeof (sa);
454 int len; 522 int len;
… …
479 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 547 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
480 } 548 }
481 549
482 delete pkt; 550 delete pkt;
483 } 551 }
484 else if (revents & POLLHUP)
485 {
486 // this cannot ;) happen on udp sockets
487 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
488 exit (1);
489 }
490 else 552 else
491 { 553 {
492 slog (L_ERR, 554 slog (L_ERR,
493 _("FATAL: unknown revents %08x in socket, terminating\n"), 555 _("FATAL: unknown revents %08x in socket, terminating\n"),
494 revents); 556 revents);
495 exit (1); 557 exit (EXIT_FAILURE);
496 } 558 }
497} 559}
498#endif 560#endif
499 561
500void 562void
501vpn::udpv4_ev (io_watcher &w, short revents) 563vpn::udpv4_ev (io_watcher &w, short revents)
502{ 564{
503 if (revents & (POLLIN | POLLERR)) 565 if (revents & EVENT_READ)
504 { 566 {
505 vpn_packet *pkt = new vpn_packet; 567 vpn_packet *pkt = new vpn_packet;
506 struct sockaddr_in sa; 568 struct sockaddr_in sa;
507 socklen_t sa_len = sizeof (sa); 569 socklen_t sa_len = sizeof (sa);
508 int len; 570 int len;
… …
523 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 585 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
524 } 586 }
525 587
526 delete pkt; 588 delete pkt;
527 } 589 }
528 else if (revents & POLLHUP)
529 {
530 // this cannot ;) happen on udp sockets
531 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
532 exit (1);
533 }
534 else 590 else
535 { 591 {
536 slog (L_ERR, 592 slog (L_ERR,
537 _("FATAL: unknown revents %08x in socket, terminating\n"), 593 _("FATAL: unknown revents %08x in socket, terminating\n"),
538 revents); 594 revents);
539 exit (1); 595 exit (EXIT_FAILURE);
540 } 596 }
541} 597}
542 598
543void 599void
544vpn::tap_ev (io_watcher &w, short revents) 600vpn::tap_ev (io_watcher &w, short revents)
545{ 601{
546 if (revents & POLLIN) 602 if (revents & EVENT_READ)
547 { 603 {
548 /* process data */ 604 /* process data */
549 tap_packet *pkt; 605 tap_packet *pkt;
550 606
551 pkt = tap->recv (); 607 pkt = tap->recv ();
… …
558 int dst = mac2id (pkt->dst); 614 int dst = mac2id (pkt->dst);
559 int src = mac2id (pkt->src); 615 int src = mac2id (pkt->src);
560 616
561 if (src != THISNODE->id) 617 if (src != THISNODE->id)
562 { 618 {
563 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting.")); 619 slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
564 exit (1); 620 exit (EXIT_FAILURE);
565 } 621 }
566 622
567 if (dst == THISNODE->id) 623 if (dst == THISNODE->id)
568 { 624 {
569 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting.")); 625 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
570 exit (1); 626 exit (EXIT_FAILURE);
571 } 627 }
572 628
573 if (dst > conns.size ()) 629 if (dst > conns.size ())
574 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst); 630 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
575 else 631 else
576 inject_data_packet (pkt, dst); 632 inject_data_packet (pkt, dst);
577 } 633 }
578 634
579 delete pkt; 635 delete pkt;
580 } 636 }
581 else if (revents & (POLLHUP | POLLERR))
582 {
583 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
584 exit (1);
585 }
586 else 637 else
587 abort (); 638 abort ();
588} 639}
589 640
590void 641void
… …
595 if (events & EVENT_SHUTDOWN) 646 if (events & EVENT_SHUTDOWN)
596 { 647 {
597 slog (L_INFO, _("preparing shutdown...")); 648 slog (L_INFO, _("preparing shutdown..."));
598 649
599 shutdown_all (); 650 shutdown_all ();
600
601 remove_pid (pidfilename); 651 remove_pid (conf.pidfilename);
602
603 slog (L_INFO, _("terminating")); 652 slog (L_INFO, _("terminating"));
604 653 exit (EXIT_SUCCESS);
605 exit (0);
606 } 654 }
607 655
608 if (events & EVENT_RECONNECT) 656 if (events & EVENT_RECONNECT)
609 { 657 {
610 slog (L_INFO, _("forced reconnect")); 658 slog (L_INFO, _("forced reconnect"));
… …
612 reconnect_all (); 660 reconnect_all ();
613 } 661 }
614 662
615 events = 0; 663 events = 0;
616 } 664 }
617
618 w.at = TSTAMP_CANCEL;
619} 665}
620 666
621void 667void
622vpn::shutdown_all () 668vpn::shutdown_all ()
623{ 669{
… …
636 connection_init (); 682 connection_init ();
637 683
638 for (configuration::node_vector::iterator i = conf.nodes.begin (); 684 for (configuration::node_vector::iterator i = conf.nodes.begin ();
639 i != conf.nodes.end (); ++i) 685 i != conf.nodes.end (); ++i)
640 { 686 {
641 connection *conn = new connection (this); 687 connection *conn = new connection (this, *i);
642
643 conn->conf = *i;
644 conns.push_back (conn); 688 conns.push_back (conn);
645
646 conn->establish_connection (); 689 conn->establish_connection ();
647 } 690 }
648} 691}
649 692
650connection *vpn::find_router () 693connection *vpn::find_router ()
… …
713, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 756, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
714#endif 757#endif
715#if ENABLE_ICMP 758#if ENABLE_ICMP
716, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 759, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
717#endif 760#endif
761#if ENABLE_DNS
762, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
763#endif
718, tap_ev_watcher (this, &vpn::tap_ev) 764, tap_ev_watcher (this, &vpn::tap_ev)
719{ 765{
720} 766}
721 767
722vpn::~vpn () 768vpn::~vpn ()

Diff Legend

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