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.29 by pcg, Fri Mar 4 04:52:38 2005 UTC vs.
Revision 1.42 by pcg, Sun Dec 2 00:54:52 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-2005 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2007 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
8 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
… …
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 15 GNU General Public License for more details.
16 16
17 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
18 along with gvpe; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
19 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
20*/ 20*/
21 21
22#include "config.h" 22#include "config.h"
23 23
24#include <list> 24#include <list>
… …
46 46
47vpn network; // THE vpn (bad design...) 47vpn network; // THE vpn (bad design...)
48 48
49///////////////////////////////////////////////////////////////////////////// 49/////////////////////////////////////////////////////////////////////////////
50 50
51const 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 ()
52{ 65{
53 // the tunnel device mtu should be the physical mtu - overhead 66 // the tunnel device mtu should be the physical mtu - overhead
54 // the tricky part is rounding to the cipher key blocksize 67 // the tricky part is rounding to the cipher key blocksize
55 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD; 68 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
56 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 69 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
57 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 70 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
58 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 71 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
59 72
60 char *env; 73 char *env;
61 asprintf (&env, "CONFBASE=%s", confbase); putenv (env); 74 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
62 asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
63 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
64 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env); 75 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
65 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env); 76 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
66 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env); 77 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
67 asprintf (&env, "MTU=%d", mtu); putenv (env); 78 asprintf (&env, "MTU=%d", mtu); putenv (env);
68 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 79 asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
69 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8, 80 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
70 THISNODE->id & 0xff);
71 putenv (env);
72 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,
73 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;
74} 110}
75 111
76int 112int
77vpn::setup () 113vpn::setup ()
78{ 114{
115 ipv4_tos = -1;
79 ipv4_fd = -1; 116 ipv4_fd = -1;
80 117
81 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 118 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
82 { 119 {
83 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 120 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
84 121
85 if (ipv4_fd < 0) 122 if (ipv4_fd < 0)
86 return -1; 123 return -1;
87 124
88 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); 125 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
126 fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
89 127
90#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 128#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
91 // this I really consider a linux bug. I am neither connected 129 // this I really consider a linux bug. I am neither connected
92 // 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
93 // fragment for me sometimes. 131 // fragment for me sometimes.
… …
103 { 141 {
104 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));
105 exit (EXIT_FAILURE); 143 exit (EXIT_FAILURE);
106 } 144 }
107 145
108 ipv4_ev_watcher.start (ipv4_fd, EVENT_READ); 146 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
109 } 147 }
110 148
149 udpv4_tos = -1;
111 udpv4_fd = -1; 150 udpv4_fd = -1;
112 151
113 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 152 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
114 { 153 {
115 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 154 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
116 155
117 if (udpv4_fd < 0) 156 if (udpv4_fd < 0)
118 return -1; 157 return -1;
119 158
120 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK); 159 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
160 fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
121 161
122 // standard daemon practise... 162 // standard daemon practise...
123 { 163 {
124 int oval = 1; 164 int oval = 1;
125 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 165 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
141 { 181 {
142 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));
143 exit (EXIT_FAILURE); 183 exit (EXIT_FAILURE);
144 } 184 }
145 185
146 udpv4_ev_watcher.start (udpv4_fd, EVENT_READ); 186 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
147 } 187 }
148 188
189 icmpv4_tos = -1;
149 icmpv4_fd = -1; 190 icmpv4_fd = -1;
150 191
151#if ENABLE_ICMP 192#if ENABLE_ICMP
152 if (THISNODE->protocols & PROT_ICMPv4) 193 if (THISNODE->protocols & PROT_ICMPv4)
153 { 194 {
154 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 195 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
155 196
156 if (icmpv4_fd < 0) 197 if (icmpv4_fd < 0)
157 return -1; 198 return -1;
158 199
159 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK); 200 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
201 fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
160 202
161#ifdef ICMP_FILTER 203#ifdef ICMP_FILTER
162 { 204 {
163 icmp_filter oval; 205 icmp_filter oval;
164 oval.data = 0xffffffff; 206 oval.data = 0xffffffff;
… …
173 // this I really consider a linux bug. I am neither connected 215 // this I really consider a linux bug. I am neither connected
174 // 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
175 // fragment for me sometimes. 217 // fragment for me sometimes.
176 { 218 {
177 int oval = IP_PMTUDISC_DONT; 219 int oval = IP_PMTUDISC_DONT;
178 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 220 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
179 } 221 }
180#endif 222#endif
181 223
182 sockinfo si (THISNODE, PROT_ICMPv4); 224 sockinfo si (THISNODE, PROT_ICMPv4);
183 225
… …
185 { 227 {
186 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));
187 exit (EXIT_FAILURE); 229 exit (EXIT_FAILURE);
188 } 230 }
189 231
190 icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ); 232 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
191 } 233 }
192#endif 234#endif
193 235
194 tcpv4_fd = -1; 236 tcpv4_fd = -1;
195 237
… …
200 242
201 if (tcpv4_fd < 0) 243 if (tcpv4_fd < 0)
202 return -1; 244 return -1;
203 245
204 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK); 246 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
247 fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
205 248
206 // standard daemon practise... 249 // standard daemon practise...
207 { 250 {
208 int oval = 1; 251 int oval = 1;
209 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 252 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
221 { 264 {
222 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));
223 exit (EXIT_FAILURE); 266 exit (EXIT_FAILURE);
224 } 267 }
225 268
226 tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ); 269 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
227 } 270 }
228#endif 271#endif
272
273 dnsv4_tos = -1;
274 dnsv4_fd = -1;
229 275
230#if ENABLE_DNS 276#if ENABLE_DNS
231 if (THISNODE->protocols & PROT_DNSv4) 277 if (THISNODE->protocols & PROT_DNSv4)
232 { 278 {
233 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4); 279 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
234 280
235 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 281 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
236 282
237 if (dnsv4_fd < 0) 283 if (dnsv4_fd < 0)
238 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
239 298
240 // standard daemon practise... 299 // standard daemon practise...
241 { 300 {
242 int oval = 1; 301 int oval = 1;
243 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 302 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
244 } 303 }
245 304
246 sockinfo si (THISNODE, PROT_DNSv4); 305 sockinfo si (THISNODE->dns_hostname,
306 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
307 PROT_DNSv4);
247 308
248 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ())) 309 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
249 { 310 {
250 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));
251 exit (EXIT_FAILURE); 312 exit (EXIT_FAILURE);
252 } 313 }
253 314
254 dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ); 315 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
255 } 316 }
256#endif 317#endif
318
319 /////////////////////////////////////////////////////////////////////////////
320
321 reconnect_all ();
322
323 /////////////////////////////////////////////////////////////////////////////
257 324
258 tap = new tap_device (); 325 tap = new tap_device ();
259 if (!tap) //D this, of course, never catches 326 if (!tap) //D this, of course, never catches
260 { 327 {
261 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 328 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
262 exit (EXIT_FAILURE); 329 exit (EXIT_FAILURE);
263 } 330 }
264 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
265 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 }
266 347
267 tap_ev_watcher.start (tap->fd, EVENT_READ); 348 tap_ev_watcher.start (tap->fd, EV_READ);
268
269 reconnect_all ();
270 349
271 return 0; 350 return 0;
272} 351}
273 352
274bool 353bool
275vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 354vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
276{ 355{
277#if defined(SOL_IP) && defined(IP_TOS) 356 set_tos (ipv4_fd, ipv4_tos, tos);
278 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
279#endif
280 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 ());
281 358
282 return true; 359 return true;
283} 360}
284 361
… …
307 384
308#if ENABLE_ICMP 385#if ENABLE_ICMP
309bool 386bool
310vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 387vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
311{ 388{
312#if defined(SOL_IP) && defined(IP_TOS)
313 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
314#endif
315
316 pkt->unshift_hdr (4); 389 pkt->unshift_hdr (4);
317 390
318 icmp_header *hdr = (icmp_header *)&((*pkt)[0]); 391 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
319 hdr->type = ::conf.icmp_type; 392 hdr->type = ::conf.icmp_type;
320 hdr->code = 255; 393 hdr->code = 255;
321 hdr->checksum = 0; 394 hdr->checksum = 0;
322 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 395 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
323 396
397 set_tos (icmpv4_fd, icmpv4_tos, tos);
324 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 ());
325 399
326 return true; 400 return true;
327} 401}
328#endif 402#endif
329 403
330bool 404bool
331vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 405vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
332{ 406{
333#if defined(SOL_IP) && defined(IP_TOS) 407 set_tos (udpv4_fd, udpv4_tos, tos);
334 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
335#endif
336 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 ());
337 409
338 return true; 410 return true;
339} 411}
340 412
… …
395 else 467 else
396 c->recv_vpn_packet (pkt, rsi); 468 c->recv_vpn_packet (pkt, rsi);
397 } 469 }
398} 470}
399 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
400void 502void
401vpn::ipv4_ev (io_watcher &w, short revents) 503vpn::ipv4_ev (ev::io &w, int revents)
402{ 504{
403 if (revents & EVENT_READ) 505 if (revents & EV_READ)
404 { 506 {
405 vpn_packet *pkt = new vpn_packet; 507 vpn_packet *pkt = new vpn_packet;
406 struct sockaddr_in sa; 508 struct sockaddr_in sa;
407 socklen_t sa_len = sizeof (sa); 509 socklen_t sa_len = sizeof (sa);
408 int len; 510 int len;
… …
413 515
414 if (len > 0) 516 if (len > 0)
415 { 517 {
416 pkt->len = len; 518 pkt->len = len;
417 519
418 // 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
419 // this is slow, but...
420 pkt->skip_hdr (IP_OVERHEAD); 521 pkt->skip_hdr (IP_OVERHEAD);
421 522
422 recv_vpn_packet (pkt, si); 523 recv_vpn_packet (pkt, si);
423 } 524 }
424 else 525 else
… …
430 delete pkt; 531 delete pkt;
431 } 532 }
432 else 533 else
433 { 534 {
434 slog (L_ERR, 535 slog (L_ERR,
435 _("FATAL: unknown revents %08x in socket, terminating\n"), 536 _("FATAL: unknown revents %08x in socket, terminating\n"),
436 revents); 537 revents);
437 exit (EXIT_FAILURE); 538 exit (EXIT_FAILURE);
438 } 539 }
439} 540}
440 541
441#if ENABLE_ICMP 542#if ENABLE_ICMP
442void 543void
443vpn::icmpv4_ev (io_watcher &w, short revents) 544vpn::icmpv4_ev (ev::io &w, int revents)
444{ 545{
445 if (revents & EVENT_READ) 546 if (revents & EV_READ)
446 { 547 {
447 vpn_packet *pkt = new vpn_packet; 548 vpn_packet *pkt = new vpn_packet;
448 struct sockaddr_in sa; 549 struct sockaddr_in sa;
449 socklen_t sa_len = sizeof (sa); 550 socklen_t sa_len = sizeof (sa);
450 int len; 551 int len;
… …
486 } 587 }
487} 588}
488#endif 589#endif
489 590
490void 591void
491vpn::udpv4_ev (io_watcher &w, short revents) 592vpn::udpv4_ev (ev::io &w, int revents)
492{ 593{
493 if (revents & EVENT_READ) 594 if (revents & EV_READ)
494 { 595 {
495 vpn_packet *pkt = new vpn_packet; 596 vpn_packet *pkt = new vpn_packet;
496 struct sockaddr_in sa; 597 struct sockaddr_in sa;
497 socklen_t sa_len = sizeof (sa); 598 socklen_t sa_len = sizeof (sa);
498 int len; 599 int len;
… …
523 exit (EXIT_FAILURE); 624 exit (EXIT_FAILURE);
524 } 625 }
525} 626}
526 627
527void 628void
528vpn::tap_ev (io_watcher &w, short revents) 629vpn::tap_ev (ev::io &w, int revents)
529{ 630{
530 if (revents & EVENT_READ) 631 if (revents & EV_READ)
531 { 632 {
532 /* process data */ 633 /* process data */
533 tap_packet *pkt; 634 tap_packet *pkt;
534 635
535 pkt = tap->recv (); 636 pkt = tap->recv ();
… …
542 int dst = mac2id (pkt->dst); 643 int dst = mac2id (pkt->dst);
543 int src = mac2id (pkt->src); 644 int src = mac2id (pkt->src);
544 645
545 if (src != THISNODE->id) 646 if (src != THISNODE->id)
546 { 647 {
547 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."));
548 exit (EXIT_FAILURE); 649 exit (EXIT_FAILURE);
549 } 650 }
550 651
551 if (dst == THISNODE->id) 652 if (dst == THISNODE->id)
552 { 653 {
… …
565 else 666 else
566 abort (); 667 abort ();
567} 668}
568 669
569void 670void
570vpn::event_cb (time_watcher &w) 671vpn::event_cb (ev::timer &w, int)
571{ 672{
572 if (events) 673 if (events)
573 { 674 {
574 if (events & EVENT_SHUTDOWN) 675 if (events & EVENT_SHUTDOWN)
575 { 676 {
… …
666} 767}
667 768
668void 769void
669vpn::dump_status () 770vpn::dump_status ()
670{ 771{
671 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 772 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
672 773
673 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 774 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
674 (*c)->dump_status (); 775 (*c)->dump_status ();
675 776
676 slog (L_NOTICE, _("END status dump")); 777 slog (L_NOTICE, _("END status dump"));

Diff Legend

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