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.27 by pcg, Tue Mar 1 06:27:20 2005 UTC vs.
Revision 1.41 by pcg, Sun Dec 2 00:20:19 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-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. 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
332 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
333
334 if (tap->if_up () &&
335 !run_script (run_script_cb (this, &vpn::script_if_init), true))
336 {
337 slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
338 tap->if_up ());
339 exit (EXIT_FAILURE);
340 }
341
261 run_script (run_script_cb (this, &vpn::script_if_up), true); 342 if (!run_script (run_script_cb (this, &vpn::script_if_up), true))
343 {
344 slog (L_ERR, _("if-up command execution failed, exiting."));
345 exit (EXIT_FAILURE);
346 }
262 347
263 tap_ev_watcher.start (tap->fd, EVENT_READ); 348 tap_ev_watcher.start (tap->fd, EV_READ);
264
265 reconnect_all ();
266 349
267 return 0; 350 return 0;
268} 351}
269 352
270bool 353bool
271vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 354vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
272{ 355{
273#if defined(SOL_IP) && defined(IP_TOS) 356 set_tos (ipv4_fd, ipv4_tos, tos);
274 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
275#endif
276 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 357 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
277 358
278 return true; 359 return true;
279} 360}
280 361
… …
303 384
304#if ENABLE_ICMP 385#if ENABLE_ICMP
305bool 386bool
306vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 387vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
307{ 388{
308#if defined(SOL_IP) && defined(IP_TOS)
309 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
310#endif
311
312 pkt->unshift_hdr (4); 389 pkt->unshift_hdr (4);
313 390
314 icmp_header *hdr = (icmp_header *)&((*pkt)[0]); 391 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
315 hdr->type = ::conf.icmp_type; 392 hdr->type = ::conf.icmp_type;
316 hdr->code = 255; 393 hdr->code = 255;
317 hdr->checksum = 0; 394 hdr->checksum = 0;
318 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 395 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
319 396
397 set_tos (icmpv4_fd, icmpv4_tos, tos);
320 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 398 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
321 399
322 return true; 400 return true;
323} 401}
324#endif 402#endif
325 403
326bool 404bool
327vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 405vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
328{ 406{
329#if defined(SOL_IP) && defined(IP_TOS) 407 set_tos (udpv4_fd, udpv4_tos, tos);
330 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
331#endif
332 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 408 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
333 409
334 return true; 410 return true;
335} 411}
336 412
… …
391 else 467 else
392 c->recv_vpn_packet (pkt, rsi); 468 c->recv_vpn_packet (pkt, rsi);
393 } 469 }
394} 470}
395 471
472bool
473vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
474{
475 switch (si.prot)
476 {
477 case PROT_IPv4:
478 return send_ipv4_packet (pkt, si, tos);
479
480 case PROT_UDPv4:
481 return send_udpv4_packet (pkt, si, tos);
482
483#if ENABLE_TCP
484 case PROT_TCPv4:
485 return send_tcpv4_packet (pkt, si, tos);
486#endif
487#if ENABLE_ICMP
488 case PROT_ICMPv4:
489 return send_icmpv4_packet (pkt, si, tos);
490#endif
491#if ENABLE_DNS
492 case PROT_DNSv4:
493 return send_dnsv4_packet (pkt, si, tos);
494#endif
495 default:
496 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
497 }
498
499 return false;
500}
501
396void 502void
397vpn::ipv4_ev (io_watcher &w, short revents) 503vpn::ipv4_ev (ev::io &w, int revents)
398{ 504{
399 if (revents & EVENT_READ) 505 if (revents & EV_READ)
400 { 506 {
401 vpn_packet *pkt = new vpn_packet; 507 vpn_packet *pkt = new vpn_packet;
402 struct sockaddr_in sa; 508 struct sockaddr_in sa;
403 socklen_t sa_len = sizeof (sa); 509 socklen_t sa_len = sizeof (sa);
404 int len; 510 int len;
… …
409 515
410 if (len > 0) 516 if (len > 0)
411 { 517 {
412 pkt->len = len; 518 pkt->len = len;
413 519
414 // raw sockets deliver the ipv4, but don't expect it on sends 520 // raw sockets deliver the ipv4 header, but don't expect it on sends
415 // this is slow, but...
416 pkt->skip_hdr (IP_OVERHEAD); 521 pkt->skip_hdr (IP_OVERHEAD);
417 522
418 recv_vpn_packet (pkt, si); 523 recv_vpn_packet (pkt, si);
419 } 524 }
420 else 525 else
… …
426 delete pkt; 531 delete pkt;
427 } 532 }
428 else 533 else
429 { 534 {
430 slog (L_ERR, 535 slog (L_ERR,
431 _("FATAL: unknown revents %08x in socket, terminating\n"), 536 _("FATAL: unknown revents %08x in socket, terminating\n"),
432 revents); 537 revents);
433 exit (EXIT_FAILURE); 538 exit (EXIT_FAILURE);
434 } 539 }
435} 540}
436 541
437#if ENABLE_ICMP 542#if ENABLE_ICMP
438void 543void
439vpn::icmpv4_ev (io_watcher &w, short revents) 544vpn::icmpv4_ev (ev::io &w, int revents)
440{ 545{
441 if (revents & EVENT_READ) 546 if (revents & EV_READ)
442 { 547 {
443 vpn_packet *pkt = new vpn_packet; 548 vpn_packet *pkt = new vpn_packet;
444 struct sockaddr_in sa; 549 struct sockaddr_in sa;
445 socklen_t sa_len = sizeof (sa); 550 socklen_t sa_len = sizeof (sa);
446 int len; 551 int len;
… …
482 } 587 }
483} 588}
484#endif 589#endif
485 590
486void 591void
487vpn::udpv4_ev (io_watcher &w, short revents) 592vpn::udpv4_ev (ev::io &w, int revents)
488{ 593{
489 if (revents & EVENT_READ) 594 if (revents & EV_READ)
490 { 595 {
491 vpn_packet *pkt = new vpn_packet; 596 vpn_packet *pkt = new vpn_packet;
492 struct sockaddr_in sa; 597 struct sockaddr_in sa;
493 socklen_t sa_len = sizeof (sa); 598 socklen_t sa_len = sizeof (sa);
494 int len; 599 int len;
… …
519 exit (EXIT_FAILURE); 624 exit (EXIT_FAILURE);
520 } 625 }
521} 626}
522 627
523void 628void
524vpn::tap_ev (io_watcher &w, short revents) 629vpn::tap_ev (ev::io &w, int revents)
525{ 630{
526 if (revents & EVENT_READ) 631 if (revents & EV_READ)
527 { 632 {
528 /* process data */ 633 /* process data */
529 tap_packet *pkt; 634 tap_packet *pkt;
530 635
531 pkt = tap->recv (); 636 pkt = tap->recv ();
… …
538 int dst = mac2id (pkt->dst); 643 int dst = mac2id (pkt->dst);
539 int src = mac2id (pkt->src); 644 int src = mac2id (pkt->src);
540 645
541 if (src != THISNODE->id) 646 if (src != THISNODE->id)
542 { 647 {
543 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting.")); 648 slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
544 exit (EXIT_FAILURE); 649 exit (EXIT_FAILURE);
545 } 650 }
546 651
547 if (dst == THISNODE->id) 652 if (dst == THISNODE->id)
548 { 653 {
… …
561 else 666 else
562 abort (); 667 abort ();
563} 668}
564 669
565void 670void
566vpn::event_cb (time_watcher &w) 671vpn::event_cb (ev::timer &w, int)
567{ 672{
568 if (events) 673 if (events)
569 { 674 {
570 if (events & EVENT_SHUTDOWN) 675 if (events & EVENT_SHUTDOWN)
571 { 676 {
… …
662} 767}
663 768
664void 769void
665vpn::dump_status () 770vpn::dump_status ()
666{ 771{
667 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 772 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
668 773
669 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 774 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
670 (*c)->dump_status (); 775 (*c)->dump_status ();
671 776
672 slog (L_NOTICE, _("END status dump")); 777 slog (L_NOTICE, _("END status dump"));

Diff Legend

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