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.26 by pcg, Sun Jul 25 18:11:54 2004 UTC vs.
Revision 1.45 by pcg, Thu Dec 6 00:35:29 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-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2007 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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21 23
22#include <list> 24#include <list>
… …
44 46
45vpn network; // THE vpn (bad design...) 47vpn network; // THE vpn (bad design...)
46 48
47///////////////////////////////////////////////////////////////////////////// 49/////////////////////////////////////////////////////////////////////////////
48 50
49const 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 ()
50{ 65{
51 // the tunnel device mtu should be the physical mtu - overhead 66 // the tunnel device mtu should be the physical mtu - overhead
52 // the tricky part is rounding to the cipher key blocksize 67 // the tricky part is rounding to the cipher key blocksize
53 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD; 68 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
54 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 69 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
55 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 70 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
56 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 71 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
57 72
58 char *env; 73 char *env;
59 asprintf (&env, "CONFBASE=%s", confbase); putenv (env); 74 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
60 asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
61 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
62 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env); 75 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
63 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env); 76 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
64 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env); 77 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
65 asprintf (&env, "MTU=%d", mtu); putenv (env); 78 asprintf (&env, "MTU=%d", mtu); putenv (env);
66 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 79 asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
67 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8, 80 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
68 THISNODE->id & 0xff);
69 putenv (env);
70 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
92inline const char *
93vpn::script_if_init ()
94{
95 script_init_env ();
96
97 return tap->if_up ();
98}
99
100inline const char *
101vpn::script_if_up ()
102{
103 script_init_env ();
104
105 char *filename;
106 asprintf (&filename,
107 "%s/%s",
108 confbase,
71 return ::conf.script_if_up ? ::conf.script_if_up : "if-up"; 109 ::conf.script_if_up ? ::conf.script_if_up : "if-up");
110
111 return filename;
72} 112}
73 113
74int 114int
75vpn::setup () 115vpn::setup ()
76{ 116{
117 ipv4_tos = -1;
77 ipv4_fd = -1; 118 ipv4_fd = -1;
78 119
79 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 120 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
80 { 121 {
81 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 122 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
82 123
83 if (ipv4_fd < 0) 124 if (ipv4_fd < 0)
84 return -1; 125 return -1;
85 126
86 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); 127 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
128 fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
87 129
88#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 130#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
89 // this I really consider a linux bug. I am neither connected 131 // this I really consider a linux bug. I am neither connected
90 // nor do I fragment myself. Linux still sets DF and doesn't 132 // nor do I fragment myself. Linux still sets DF and doesn't
91 // fragment for me sometimes. 133 // fragment for me sometimes.
… …
101 { 143 {
102 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 144 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
103 exit (EXIT_FAILURE); 145 exit (EXIT_FAILURE);
104 } 146 }
105 147
106 ipv4_ev_watcher.start (ipv4_fd, EVENT_READ); 148 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
107 } 149 }
108 150
151 udpv4_tos = -1;
109 udpv4_fd = -1; 152 udpv4_fd = -1;
110 153
111 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 154 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
112 { 155 {
113 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 156 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
114 157
115 if (udpv4_fd < 0) 158 if (udpv4_fd < 0)
116 return -1; 159 return -1;
117 160
118 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK); 161 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
162 fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
119 163
120 // standard daemon practise... 164 // standard daemon practise...
121 { 165 {
122 int oval = 1; 166 int oval = 1;
123 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 167 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
139 { 183 {
140 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 184 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
141 exit (EXIT_FAILURE); 185 exit (EXIT_FAILURE);
142 } 186 }
143 187
144 udpv4_ev_watcher.start (udpv4_fd, EVENT_READ); 188 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
145 } 189 }
146 190
191 icmpv4_tos = -1;
147 icmpv4_fd = -1; 192 icmpv4_fd = -1;
148 193
149#if ENABLE_ICMP 194#if ENABLE_ICMP
150 if (THISNODE->protocols & PROT_ICMPv4) 195 if (THISNODE->protocols & PROT_ICMPv4)
151 { 196 {
152 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 197 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
153 198
154 if (icmpv4_fd < 0) 199 if (icmpv4_fd < 0)
155 return -1; 200 return -1;
156 201
157 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK); 202 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
203 fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
158 204
159#ifdef ICMP_FILTER 205#ifdef ICMP_FILTER
160 { 206 {
161 icmp_filter oval; 207 icmp_filter oval;
162 oval.data = 0xffffffff; 208 oval.data = 0xffffffff;
… …
171 // this I really consider a linux bug. I am neither connected 217 // this I really consider a linux bug. I am neither connected
172 // nor do I fragment myself. Linux still sets DF and doesn't 218 // nor do I fragment myself. Linux still sets DF and doesn't
173 // fragment for me sometimes. 219 // fragment for me sometimes.
174 { 220 {
175 int oval = IP_PMTUDISC_DONT; 221 int oval = IP_PMTUDISC_DONT;
176 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 222 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
177 } 223 }
178#endif 224#endif
179 225
180 sockinfo si (THISNODE, PROT_ICMPv4); 226 sockinfo si (THISNODE, PROT_ICMPv4);
181 227
… …
183 { 229 {
184 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); 230 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
185 exit (EXIT_FAILURE); 231 exit (EXIT_FAILURE);
186 } 232 }
187 233
188 icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ); 234 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
189 } 235 }
190#endif 236#endif
191 237
192 tcpv4_fd = -1; 238 tcpv4_fd = -1;
193 239
… …
198 244
199 if (tcpv4_fd < 0) 245 if (tcpv4_fd < 0)
200 return -1; 246 return -1;
201 247
202 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK); 248 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
249 fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
203 250
204 // standard daemon practise... 251 // standard daemon practise...
205 { 252 {
206 int oval = 1; 253 int oval = 1;
207 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 254 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
219 { 266 {
220 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 267 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
221 exit (EXIT_FAILURE); 268 exit (EXIT_FAILURE);
222 } 269 }
223 270
224 tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ); 271 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
225 } 272 }
226#endif 273#endif
274
275 dnsv4_tos = -1;
276 dnsv4_fd = -1;
227 277
228#if ENABLE_DNS 278#if ENABLE_DNS
229 if (THISNODE->protocols & PROT_DNSv4) 279 if (THISNODE->protocols & PROT_DNSv4)
230 { 280 {
281 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
282
231 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 283 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
232 284
233 if (dnsv4_fd < 0) 285 if (dnsv4_fd < 0)
234 return -1; 286 return -1;
287
288 fcntl (dnsv4_fd, F_SETFL, O_NONBLOCK);
289 fcntl (dnsv4_fd, F_SETFD, FD_CLOEXEC);
290
291# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
292 // this I really consider a linux bug. I am neither connected
293 // nor do I fragment myself. Linux still sets DF and doesn't
294 // fragment for me sometimes.
295 {
296 int oval = IP_PMTUDISC_DONT;
297 setsockopt (dnsv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
298 }
299# endif
235 300
236 // standard daemon practise... 301 // standard daemon practise...
237 { 302 {
238 int oval = 1; 303 int oval = 1;
239 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 304 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
240 } 305 }
241 306
242 sockinfo si (THISNODE, PROT_DNSv4); 307 sockinfo si (THISNODE->dns_hostname,
308 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
309 PROT_DNSv4);
243 310
244 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ())) 311 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
245 { 312 {
246 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno)); 313 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
247 exit (EXIT_FAILURE); 314 exit (EXIT_FAILURE);
248 } 315 }
249 316
250 dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ); 317 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
251 } 318 }
252#endif 319#endif
320
321 /////////////////////////////////////////////////////////////////////////////
322
323 reconnect_all ();
324
325 /////////////////////////////////////////////////////////////////////////////
253 326
254 tap = new tap_device (); 327 tap = new tap_device ();
255 if (!tap) //D this, of course, never catches 328 if (!tap) //D this, of course, never catches
256 { 329 {
257 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 330 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
258 exit (EXIT_FAILURE); 331 exit (EXIT_FAILURE);
259 } 332 }
260 333
261 run_script (run_script_cb (this, &vpn::script_if_up), true); 334 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
262 335
336 run_script_cb cb;
337 cb.set<vpn, &vpn::script_if_init> (this);
338
339 if (tap->if_up () &&
340 !run_script (cb, true))
341 {
342 slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
343 tap->if_up ());
344 exit (EXIT_FAILURE);
345 }
346
347 cb.set<vpn, &vpn::script_if_up> (this);
348 if (!run_script (cb, true))
349 {
350 slog (L_ERR, _("if-up command execution failed, exiting."));
351 exit (EXIT_FAILURE);
352 }
353
263 tap_ev_watcher.start (tap->fd, EVENT_READ); 354 tap_ev_watcher.start (tap->fd, EV_READ);
264
265 reconnect_all ();
266 355
267 return 0; 356 return 0;
268}
269
270// send a vpn packet out to other hosts
271bool
272vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
273{
274 switch (si.prot)
275 {
276 case PROT_IPv4:
277 return send_ipv4_packet (pkt, si, tos);
278
279 case PROT_UDPv4:
280 return send_udpv4_packet (pkt, si, tos);
281
282#if ENABLE_TCP
283 case PROT_TCPv4:
284 return send_tcpv4_packet (pkt, si, tos);
285#endif
286
287#if ENABLE_ICMP
288 case PROT_ICMPv4:
289 return send_icmpv4_packet (pkt, si, tos);
290#endif
291
292#if ENABLE_DNS
293 case PROT_DNSv4:
294 return send_dnsv4_packet (pkt, si, tos);
295#endif
296
297 default:
298 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
299 return false;
300 }
301} 357}
302 358
303bool 359bool
304vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 360vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
305{ 361{
306#if defined(SOL_IP) && defined(IP_TOS) 362 set_tos (ipv4_fd, ipv4_tos, tos);
307 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
308#endif
309 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 363 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
310 364
311 return true; 365 return true;
312} 366}
313 367
… …
336 390
337#if ENABLE_ICMP 391#if ENABLE_ICMP
338bool 392bool
339vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 393vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
340{ 394{
341#if defined(SOL_IP) && defined(IP_TOS)
342 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
343#endif
344
345 pkt->unshift_hdr (4); 395 pkt->unshift_hdr (4);
346 396
347 icmp_header *hdr = (icmp_header *)&((*pkt)[0]); 397 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
348 hdr->type = ::conf.icmp_type; 398 hdr->type = ::conf.icmp_type;
349 hdr->code = 255; 399 hdr->code = 255;
350 hdr->checksum = 0; 400 hdr->checksum = 0;
351 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 401 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
352 402
403 set_tos (icmpv4_fd, icmpv4_tos, tos);
353 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 404 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
354 405
355 return true; 406 return true;
356} 407}
357#endif 408#endif
358 409
359bool 410bool
360vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 411vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
361{ 412{
362#if defined(SOL_IP) && defined(IP_TOS) 413 set_tos (udpv4_fd, udpv4_tos, tos);
363 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
364#endif
365 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 414 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
366 415
367 return true; 416 return true;
368} 417}
369 418
… …
424 else 473 else
425 c->recv_vpn_packet (pkt, rsi); 474 c->recv_vpn_packet (pkt, rsi);
426 } 475 }
427} 476}
428 477
429void 478bool
479vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
480{
481 switch (si.prot)
482 {
483 case PROT_IPv4:
484 return send_ipv4_packet (pkt, si, tos);
485
486 case PROT_UDPv4:
487 return send_udpv4_packet (pkt, si, tos);
488
489#if ENABLE_TCP
490 case PROT_TCPv4:
491 return send_tcpv4_packet (pkt, si, tos);
492#endif
493#if ENABLE_ICMP
494 case PROT_ICMPv4:
495 return send_icmpv4_packet (pkt, si, tos);
496#endif
497#if ENABLE_DNS
498 case PROT_DNSv4:
499 return send_dnsv4_packet (pkt, si, tos);
500#endif
501 default:
502 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
503 }
504
505 return false;
506}
507
508inline void
430vpn::ipv4_ev (io_watcher &w, short revents) 509vpn::ipv4_ev (ev::io &w, int revents)
431{ 510{
432 if (revents & EVENT_READ) 511 if (revents & EV_READ)
433 { 512 {
434 vpn_packet *pkt = new vpn_packet; 513 vpn_packet *pkt = new vpn_packet;
435 struct sockaddr_in sa; 514 struct sockaddr_in sa;
436 socklen_t sa_len = sizeof (sa); 515 socklen_t sa_len = sizeof (sa);
437 int len; 516 int len;
… …
442 521
443 if (len > 0) 522 if (len > 0)
444 { 523 {
445 pkt->len = len; 524 pkt->len = len;
446 525
447 // raw sockets deliver the ipv4, but don't expect it on sends 526 // raw sockets deliver the ipv4 header, but don't expect it on sends
448 // this is slow, but...
449 pkt->skip_hdr (IP_OVERHEAD); 527 pkt->skip_hdr (IP_OVERHEAD);
450 528
451 recv_vpn_packet (pkt, si); 529 recv_vpn_packet (pkt, si);
452 } 530 }
453 else 531 else
… …
459 delete pkt; 537 delete pkt;
460 } 538 }
461 else 539 else
462 { 540 {
463 slog (L_ERR, 541 slog (L_ERR,
464 _("FATAL: unknown revents %08x in socket, terminating\n"), 542 _("FATAL: unknown revents %08x in socket, terminating\n"),
465 revents); 543 revents);
466 exit (EXIT_FAILURE); 544 exit (EXIT_FAILURE);
467 } 545 }
468} 546}
469 547
470#if ENABLE_ICMP 548#if ENABLE_ICMP
471void 549inline void
472vpn::icmpv4_ev (io_watcher &w, short revents) 550vpn::icmpv4_ev (ev::io &w, int revents)
473{ 551{
474 if (revents & EVENT_READ) 552 if (revents & EV_READ)
475 { 553 {
476 vpn_packet *pkt = new vpn_packet; 554 vpn_packet *pkt = new vpn_packet;
477 struct sockaddr_in sa; 555 struct sockaddr_in sa;
478 socklen_t sa_len = sizeof (sa); 556 socklen_t sa_len = sizeof (sa);
479 int len; 557 int len;
… …
514 exit (EXIT_FAILURE); 592 exit (EXIT_FAILURE);
515 } 593 }
516} 594}
517#endif 595#endif
518 596
519void 597inline void
520vpn::udpv4_ev (io_watcher &w, short revents) 598vpn::udpv4_ev (ev::io &w, int revents)
521{ 599{
522 if (revents & EVENT_READ) 600 if (revents & EV_READ)
523 { 601 {
524 vpn_packet *pkt = new vpn_packet; 602 vpn_packet *pkt = new vpn_packet;
525 struct sockaddr_in sa; 603 struct sockaddr_in sa;
526 socklen_t sa_len = sizeof (sa); 604 socklen_t sa_len = sizeof (sa);
527 int len; 605 int len;
… …
551 revents); 629 revents);
552 exit (EXIT_FAILURE); 630 exit (EXIT_FAILURE);
553 } 631 }
554} 632}
555 633
556void 634inline void
557vpn::tap_ev (io_watcher &w, short revents) 635vpn::tap_ev (ev::io &w, int revents)
558{ 636{
559 if (revents & EVENT_READ) 637 if (revents & EV_READ)
560 { 638 {
561 /* process data */ 639 /* process data */
562 tap_packet *pkt; 640 tap_packet *pkt;
563 641
564 pkt = tap->recv (); 642 pkt = tap->recv ();
… …
571 int dst = mac2id (pkt->dst); 649 int dst = mac2id (pkt->dst);
572 int src = mac2id (pkt->src); 650 int src = mac2id (pkt->src);
573 651
574 if (src != THISNODE->id) 652 if (src != THISNODE->id)
575 { 653 {
576 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting.")); 654 slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
577 exit (EXIT_FAILURE); 655 exit (EXIT_FAILURE);
578 } 656 }
579 657
580 if (dst == THISNODE->id) 658 if (dst == THISNODE->id)
581 { 659 {
… …
593 } 671 }
594 else 672 else
595 abort (); 673 abort ();
596} 674}
597 675
598void 676inline void
599vpn::event_cb (time_watcher &w) 677vpn::event_cb (ev::timer &w, int)
600{ 678{
601 if (events) 679 if (events)
602 { 680 {
603 if (events & EVENT_SHUTDOWN) 681 if (events & EVENT_SHUTDOWN)
604 { 682 {
… …
639 connection_init (); 717 connection_init ();
640 718
641 for (configuration::node_vector::iterator i = conf.nodes.begin (); 719 for (configuration::node_vector::iterator i = conf.nodes.begin ();
642 i != conf.nodes.end (); ++i) 720 i != conf.nodes.end (); ++i)
643 { 721 {
644 connection *conn = new connection (this); 722 connection *conn = new connection (this, *i);
645
646 conn->conf = *i;
647 conns.push_back (conn); 723 conns.push_back (conn);
648
649 conn->establish_connection (); 724 conn->establish_connection ();
650 } 725 }
651} 726}
652 727
653connection *vpn::find_router () 728connection *vpn::find_router ()
… …
698} 773}
699 774
700void 775void
701vpn::dump_status () 776vpn::dump_status ()
702{ 777{
703 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 778 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
704 779
705 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 780 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
706 (*c)->dump_status (); 781 (*c)->dump_status ();
707 782
708 slog (L_NOTICE, _("END status dump")); 783 slog (L_NOTICE, _("END status dump"));
709} 784}
710 785
711vpn::vpn (void) 786vpn::vpn (void)
787{
712: event (this, &vpn::event_cb) 788 event .set<vpn, &vpn::event_cb > (this);
713, udpv4_ev_watcher (this, &vpn::udpv4_ev) 789 udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
714, ipv4_ev_watcher (this, &vpn::ipv4_ev) 790 ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
715#if ENABLE_TCP 791#if ENABLE_TCP
716, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 792 tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
717#endif 793#endif
718#if ENABLE_ICMP 794#if ENABLE_ICMP
719, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 795 icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
720#endif 796#endif
721#if ENABLE_DNS 797#if ENABLE_DNS
722, dnsv4_ev_watcher (this, &vpn::dnsv4_ev) 798 dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
723#endif 799#endif
724, tap_ev_watcher (this, &vpn::tap_ev) 800 tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
725{
726} 801}
727 802
728vpn::~vpn () 803vpn::~vpn ()
729{ 804{
730} 805}

Diff Legend

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