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.8 by pcg, Mon Apr 7 01:28:56 2003 UTC vs.
Revision 1.17 by pcg, Wed Oct 15 06:06:41 2003 UTC

24#include <cstring> 24#include <cstring>
25#include <cstdio> 25#include <cstdio>
26 26
27#include <sys/types.h> 27#include <sys/types.h>
28#include <sys/socket.h> 28#include <sys/socket.h>
29#include <sys/poll.h>
30#include <sys/wait.h> 29#include <sys/wait.h>
31#include <netinet/in.h>
32#include <arpa/inet.h>
33#include <errno.h> 30#include <errno.h>
34#include <time.h> 31#include <time.h>
35#include <unistd.h> 32#include <unistd.h>
33#include <fcntl.h>
34#include <sys/socket.h>
35
36#include "netcompat.h"
36 37
37#include "pidfile.h" 38#include "pidfile.h"
38 39
39#include "connection.h" 40#include "connection.h"
40#include "util.h" 41#include "util.h"
80 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 81 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
81 82
82 if (ipv4_fd < 0) 83 if (ipv4_fd < 0)
83 return -1; 84 return -1;
84 85
85 sockinfo si (THISNODE, PROT_IPv4); 86 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
86 87
87 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 88#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
88 {
89 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
90 exit (1);
91 }
92
93#ifdef IP_MTU_DISCOVER
94 // this I really consider a linux bug. I am neither connected 89 // this I really consider a linux bug. I am neither connected
95 // nor do I fragment myself. Linux still sets DF and doesn't 90 // nor do I fragment myself. Linux still sets DF and doesn't
96 // fragment for me sometimes. 91 // fragment for me sometimes.
97 { 92 {
98 int oval = IP_PMTUDISC_DONT; 93 int oval = IP_PMTUDISC_DONT;
99 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 94 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
100 } 95 }
101#endif 96#endif
102 97
98 sockinfo si (THISNODE, PROT_IPv4);
99
100 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
101 {
102 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
103 exit (1);
104 }
105
103 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 106 ipv4_ev_watcher.start (ipv4_fd, POLLIN);
104 } 107 }
105 108
106 udpv4_fd = -1; 109 udpv4_fd = -1;
107 110
109 { 112 {
110 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 113 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
111 114
112 if (udpv4_fd < 0) 115 if (udpv4_fd < 0)
113 return -1; 116 return -1;
117
118 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
114 119
115 // standard daemon practise... 120 // standard daemon practise...
116 { 121 {
117 int oval = 1; 122 int oval = 1;
118 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 123 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
119 } 124 }
120 125
121 sockinfo si (THISNODE, PROT_UDPv4); 126#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
122
123 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
124 {
125 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
126 exit (1);
127 }
128
129#ifdef IP_MTU_DISCOVER
130 // this I really consider a linux bug. I am neither connected 127 // this I really consider a linux bug. I am neither connected
131 // nor do I fragment myself. Linux still sets DF and doesn't 128 // nor do I fragment myself. Linux still sets DF and doesn't
132 // fragment for me sometimes. 129 // fragment for me sometimes.
133 { 130 {
134 int oval = IP_PMTUDISC_DONT; 131 int oval = IP_PMTUDISC_DONT;
135 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 132 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
136 } 133 }
137#endif 134#endif
138 135
136 sockinfo si (THISNODE, PROT_UDPv4);
137
138 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
139 {
140 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
141 exit (1);
142 }
143
139 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 144 udpv4_ev_watcher.start (udpv4_fd, POLLIN);
140 } 145 }
146
147 icmpv4_fd = -1;
148
149#if ENABLE_ICMP
150 if (THISNODE->protocols & PROT_ICMPv4)
151 {
152 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
153
154 if (icmpv4_fd < 0)
155 return -1;
156
157 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
158
159#ifdef ICMP_FILTER
160 {
161 icmp_filter oval;
162 oval.data = 0xffffffff;
163 if (::conf.icmp_type < 32)
164 oval.data &= ~(1 << ::conf.icmp_type);
165
166 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
167 }
168#endif
169
170#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
171 // this I really consider a linux bug. I am neither connected
172 // nor do I fragment myself. Linux still sets DF and doesn't
173 // fragment for me sometimes.
174 {
175 int oval = IP_PMTUDISC_DONT;
176 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
177 }
178#endif
179
180 sockinfo si (THISNODE, PROT_ICMPv4);
181
182 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
183 {
184 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
185 exit (1);
186 }
187
188 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);
189 }
190#endif
141 191
142 tcpv4_fd = -1; 192 tcpv4_fd = -1;
143 193
144#if ENABLE_TCP 194#if ENABLE_TCP
145 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port) 195 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
146 { 196 {
147 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 197 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
148 198
149 if (tcpv4_fd < 0) 199 if (tcpv4_fd < 0)
150 return -1; 200 return -1;
201
202 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
151 203
152 // standard daemon practise... 204 // standard daemon practise...
153 { 205 {
154 int oval = 1; 206 int oval = 1;
155 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 207 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
204#if ENABLE_TCP 256#if ENABLE_TCP
205 case PROT_TCPv4: 257 case PROT_TCPv4:
206 return send_tcpv4_packet (pkt, si, tos); 258 return send_tcpv4_packet (pkt, si, tos);
207#endif 259#endif
208 260
261#if ENABLE_ICMP
262 case PROT_ICMPv4:
263 return send_icmpv4_packet (pkt, si, tos);
264#endif
265
209 default: 266 default:
210 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si); 267 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
211 return false; 268 return false;
212 } 269 }
213} 270}
214 271
215bool 272bool
216vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 273vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
217{ 274{
275#if defined(SOL_IP) && defined(IP_TOS)
218 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 276 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
277#endif
219 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 278 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
220 279
221 return true; 280 return true;
222} 281}
282
283static u16
284ipv4_checksum (u16 *data, unsigned int len)
285{
286 // use 32 bit accumulator and fold back carry bits at the end
287 u32 sum = 0;
288
289 while (len > 1)
290 {
291 sum += *data++;
292 len -= 2;
293 }
294
295 // odd byte left?
296 if (len)
297 sum += *(u8 *)data;
298
299 // add back carry bits
300 sum = (sum >> 16) + (sum & 0xffff); // lo += hi
301 sum += (sum >> 16); // carry
302
303 return ~sum;
304}
305
306#if ENABLE_ICMP
307bool
308vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
309{
310#if defined(SOL_IP) && defined(IP_TOS)
311 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
312#endif
313
314 pkt->unshift_hdr (4);
315
316 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
317 hdr->type = ::conf.icmp_type;
318 hdr->code = 255;
319 hdr->checksum = 0;
320 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
321
322 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
323
324 return true;
325}
326#endif
223 327
224bool 328bool
225vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 329vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
226{ 330{
331#if defined(SOL_IP) && defined(IP_TOS)
227 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 332 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
333#endif
228 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 334 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
229 335
230 return true; 336 return true;
231} 337}
232 338
249 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 355 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
250 else 356 else
251 { 357 {
252 connection *c = conns[src - 1]; 358 connection *c = conns[src - 1];
253 359
254 if (dst == 0 && !THISNODE->routerprio) 360 if (dst == 0)
255 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), 361 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
256 c->conf->nodename, (const char *)rsi); 362 c->conf->nodename, (const char *)rsi);
257 else if (dst != 0 && dst != THISNODE->id) 363 else if (dst != 0 && dst != THISNODE->id)
258 { 364 {
259 if (THISNODE->routerprio) 365 if (THISNODE->routerprio)
260 // the tos setting gets lost here. who cares. 366 // the tos setting gets lost here. who cares.
269 c->recv_vpn_packet (pkt, rsi); 375 c->recv_vpn_packet (pkt, rsi);
270 } 376 }
271} 377}
272 378
273void 379void
274vpn::udpv4_ev (io_watcher &w, short revents) 380vpn::ipv4_ev (io_watcher &w, short revents)
275{ 381{
276 if (revents & (POLLIN | POLLERR)) 382 if (revents & (POLLIN | POLLERR))
277 { 383 {
278 vpn_packet *pkt = new vpn_packet; 384 vpn_packet *pkt = new vpn_packet;
279 struct sockaddr_in sa; 385 struct sockaddr_in sa;
280 socklen_t sa_len = sizeof (sa); 386 socklen_t sa_len = sizeof (sa);
281 int len; 387 int len;
282 388
283 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 389 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
284 390
285 sockinfo si(sa, PROT_UDPv4); 391 sockinfo si(sa, PROT_IPv4);
286 392
287 if (len > 0) 393 if (len > 0)
288 { 394 {
289 pkt->len = len; 395 pkt->len = len;
290 396
397 // raw sockets deliver the ipv4, but don't expect it on sends
398 // this is slow, but...
399 pkt->skip_hdr (IP_OVERHEAD);
400
291 recv_vpn_packet (pkt, si); 401 recv_vpn_packet (pkt, si);
292 } 402 }
293 else 403 else
294 { 404 {
295 // probably ECONNRESET or somesuch 405 // probably ECONNRESET or somesuch
296 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 406 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
297 } 407 }
298 408
299 delete pkt; 409 delete pkt;
300 } 410 }
301 else if (revents & POLLHUP) 411 else if (revents & POLLHUP)
302 { 412 {
303 // this cannot ;) happen on udp sockets 413 // this cannot ;) happen on udp sockets
304 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating.")); 414 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
305 exit (1); 415 exit (1);
306 } 416 }
307 else 417 else
308 { 418 {
309 slog (L_ERR, 419 slog (L_ERR,
311 revents); 421 revents);
312 exit (1); 422 exit (1);
313 } 423 }
314} 424}
315 425
426#if ENABLE_ICMP
316void 427void
317vpn::ipv4_ev (io_watcher &w, short revents) 428vpn::icmpv4_ev (io_watcher &w, short revents)
318{ 429{
319 if (revents & (POLLIN | POLLERR)) 430 if (revents & (POLLIN | POLLERR))
320 { 431 {
321 vpn_packet *pkt = new vpn_packet; 432 vpn_packet *pkt = new vpn_packet;
322 struct sockaddr_in sa; 433 struct sockaddr_in sa;
323 socklen_t sa_len = sizeof (sa); 434 socklen_t sa_len = sizeof (sa);
324 int len; 435 int len;
325 436
326 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 437 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
327 438
328 sockinfo si(sa, PROT_IPv4); 439 sockinfo si(sa, PROT_ICMPv4);
329 440
330 if (len > 0) 441 if (len > 0)
331 { 442 {
332 pkt->len = len; 443 pkt->len = len;
333 444
445 icmp_header *hdr = (icmp_header *)&((*pkt)[IP_OVERHEAD]);
446
447 if (hdr->type == ::conf.icmp_type
448 && hdr->code == 255)
449 {
334 // raw sockets deliver the ipv4, but don't expect it on sends 450 // raw sockets deliver the ipv4, but don't expect it on sends
335 // this is slow, but... 451 // this is slow, but...
336 pkt->skip_hdr (IP_OVERHEAD); 452 pkt->skip_hdr (ICMP_OVERHEAD);
337 453
338 recv_vpn_packet (pkt, si); 454 recv_vpn_packet (pkt, si);
455 }
339 } 456 }
340 else 457 else
341 { 458 {
342 // probably ECONNRESET or somesuch 459 // probably ECONNRESET or somesuch
343 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 460 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
346 delete pkt; 463 delete pkt;
347 } 464 }
348 else if (revents & POLLHUP) 465 else if (revents & POLLHUP)
349 { 466 {
350 // this cannot ;) happen on udp sockets 467 // this cannot ;) happen on udp sockets
351 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating.")); 468 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
352 exit (1); 469 exit (1);
353 } 470 }
354 else 471 else
355 { 472 {
356 slog (L_ERR, 473 slog (L_ERR,
357 _("FATAL: unknown revents %08x in socket, terminating\n"), 474 _("FATAL: unknown revents %08x in socket, terminating\n"),
358 revents); 475 revents);
359 exit (1); 476 exit (1);
360 } 477 }
361} 478}
479#endif
480
481void
482vpn::udpv4_ev (io_watcher &w, short revents)
483{
484 if (revents & (POLLIN | POLLERR))
485 {
486 vpn_packet *pkt = new vpn_packet;
487 struct sockaddr_in sa;
488 socklen_t sa_len = sizeof (sa);
489 int len;
490
491 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
492
493 sockinfo si(sa, PROT_UDPv4);
494
495 if (len > 0)
496 {
497 pkt->len = len;
498
499 recv_vpn_packet (pkt, si);
500 }
501 else
502 {
503 // probably ECONNRESET or somesuch
504 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
505 }
506
507 delete pkt;
508 }
509 else if (revents & POLLHUP)
510 {
511 // this cannot ;) happen on udp sockets
512 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
513 exit (1);
514 }
515 else
516 {
517 slog (L_ERR,
518 _("FATAL: unknown revents %08x in socket, terminating\n"),
519 revents);
520 exit (1);
521 }
522}
362 523
363void 524void
364vpn::tap_ev (io_watcher &w, short revents) 525vpn::tap_ev (io_watcher &w, short revents)
365{ 526{
366 if (revents & POLLIN) 527 if (revents & POLLIN)
368 /* process data */ 529 /* process data */
369 tap_packet *pkt; 530 tap_packet *pkt;
370 531
371 pkt = tap->recv (); 532 pkt = tap->recv ();
372 533
534 if (!pkt)
535 return;
536
537 if (pkt->len > 14)
538 {
373 int dst = mac2id (pkt->dst); 539 int dst = mac2id (pkt->dst);
374 int src = mac2id (pkt->src); 540 int src = mac2id (pkt->src);
375 541
376 if (src != THISNODE->id) 542 if (src != THISNODE->id)
377 {
378 slog (L_ERR, _("FATAL: tap packet not originating on current node received, terminating."));
379 exit (1);
380 }
381
382 if (dst == THISNODE->id)
383 {
384 slog (L_ERR, _("FATAL: tap packet destined for current node received, terminating."));
385 exit (1);
386 }
387
388 if (dst > conns.size ())
389 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
390 else
391 {
392 if (dst)
393 { 543 {
394 // unicast 544 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
395 if (dst != THISNODE->id) 545 exit (1);
396 conns[dst - 1]->inject_data_packet (pkt);
397 } 546 }
547
548 if (dst == THISNODE->id)
549 {
550 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
551 exit (1);
552 }
553
554 if (dst > conns.size ())
555 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
398 else 556 else
399 { 557 {
400 // broadcast, first check router, then self, then english
401 connection *router = find_router ();
402
403 if (router) 558 if (dst)
559 {
560 // unicast
561 if (dst != THISNODE->id)
404 router->inject_data_packet (pkt, true); 562 conns[dst - 1]->inject_data_packet (pkt);
563 }
405 else 564 else
565 {
566 // broadcast, this is ugly, but due to the security policy
567 // we have to connect to all hosts...
406 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 568 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
407 if ((*c)->conf != THISNODE) 569 if ((*c)->conf != THISNODE)
408 (*c)->inject_data_packet (pkt); 570 (*c)->inject_data_packet (pkt);
571 }
409 } 572 }
410 } 573 }
411 574
412 delete pkt; 575 delete pkt;
413 } 576 }
480 } 643 }
481} 644}
482 645
483connection *vpn::find_router () 646connection *vpn::find_router ()
484{ 647{
485 u32 prio = 0; 648 u32 prio = 1;
486 connection *router = 0; 649 connection *router = 0;
487 650
488 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 651 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
489 { 652 {
490 connection *c = *i; 653 connection *c = *i;
491 654
492 if (c->conf->routerprio > prio 655 if (c->conf->routerprio > prio
493 && c->connectmode == conf_node::C_ALWAYS 656 && c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use
494 && c->conf != THISNODE
495 && c->ictx && c->octx) 657 && c->ictx && c->octx
658 && c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode
496 { 659 {
497 prio = c->conf->routerprio; 660 prio = c->conf->routerprio;
498 router = c; 661 router = c;
499 } 662 }
500 } 663 }
509 if (c) 672 if (c)
510 c->send_connect_request (id); 673 c->send_connect_request (id);
511 else 674 else
512 // no router found, aggressively connect to all routers 675 // no router found, aggressively connect to all routers
513 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 676 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
514 if ((*i)->conf->routerprio) 677 if ((*i)->conf->routerprio && (*i)->conf != THISNODE)
515 (*i)->establish_connection (); 678 (*i)->establish_connection ();
516} 679}
517 680
518void 681void
519connection::dump_status () 682connection::dump_status ()
537 700
538 slog (L_NOTICE, _("END status dump")); 701 slog (L_NOTICE, _("END status dump"));
539} 702}
540 703
541vpn::vpn (void) 704vpn::vpn (void)
542: event(this, &vpn::event_cb) 705: event (this, &vpn::event_cb)
543, udpv4_ev_watcher(this, &vpn::udpv4_ev) 706, udpv4_ev_watcher (this, &vpn::udpv4_ev)
544, ipv4_ev_watcher (this, &vpn::ipv4_ev) 707, ipv4_ev_watcher (this, &vpn::ipv4_ev)
545, tap_ev_watcher (this, &vpn::tap_ev)
546#if ENABLE_TCP 708#if ENABLE_TCP
547, tcpv4_ev_watcher(this, &vpn::tcpv4_ev) 709, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
548#endif 710#endif
711#if ENABLE_ICMP
712, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
713#endif
714, tap_ev_watcher (this, &vpn::tap_ev)
549{ 715{
550} 716}
551 717
552vpn::~vpn () 718vpn::~vpn ()
553{ 719{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines