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

Diff Legend

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