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

Diff Legend

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