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.28 by pcg, Thu Mar 3 16:54:34 2005 UTC vs.
Revision 1.46 by pcg, Thu Aug 7 17:30:28 2008 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
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,
73 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;
74} 112}
75 113
76int 114int
77vpn::setup () 115vpn::setup ()
78{ 116{
117 ipv4_tos = -1;
79 ipv4_fd = -1; 118 ipv4_fd = -1;
80 119
81 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 120 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
82 { 121 {
83 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 122 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
84 123
85 if (ipv4_fd < 0) 124 if (ipv4_fd < 0)
86 return -1; 125 return -1;
87 126
88 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); 127 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
128 fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
89 129
90#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 130#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
91 // this I really consider a linux bug. I am neither connected 131 // this I really consider a linux bug. I am neither connected
92 // 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
93 // fragment for me sometimes. 133 // fragment for me sometimes.
… …
103 { 143 {
104 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));
105 exit (EXIT_FAILURE); 145 exit (EXIT_FAILURE);
106 } 146 }
107 147
108 ipv4_ev_watcher.start (ipv4_fd, EVENT_READ); 148 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
109 } 149 }
110 150
151 udpv4_tos = -1;
111 udpv4_fd = -1; 152 udpv4_fd = -1;
112 153
113 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 154 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
114 { 155 {
115 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 156 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
116 157
117 if (udpv4_fd < 0) 158 if (udpv4_fd < 0)
118 return -1; 159 return -1;
119 160
120 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK); 161 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
162 fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
121 163
122 // standard daemon practise... 164 // standard daemon practise...
123 { 165 {
124 int oval = 1; 166 int oval = 1;
125 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 167 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
141 { 183 {
142 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));
143 exit (EXIT_FAILURE); 185 exit (EXIT_FAILURE);
144 } 186 }
145 187
146 udpv4_ev_watcher.start (udpv4_fd, EVENT_READ); 188 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
147 } 189 }
148 190
191 icmpv4_tos = -1;
149 icmpv4_fd = -1; 192 icmpv4_fd = -1;
150 193
151#if ENABLE_ICMP 194#if ENABLE_ICMP
152 if (THISNODE->protocols & PROT_ICMPv4) 195 if (THISNODE->protocols & PROT_ICMPv4)
153 { 196 {
154 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 197 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
155 198
156 if (icmpv4_fd < 0) 199 if (icmpv4_fd < 0)
157 return -1; 200 return -1;
158 201
159 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK); 202 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
203 fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
160 204
161#ifdef ICMP_FILTER 205#ifdef ICMP_FILTER
162 { 206 {
163 icmp_filter oval; 207 icmp_filter oval;
164 oval.data = 0xffffffff; 208 oval.data = 0xffffffff;
… …
173 // this I really consider a linux bug. I am neither connected 217 // this I really consider a linux bug. I am neither connected
174 // 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
175 // fragment for me sometimes. 219 // fragment for me sometimes.
176 { 220 {
177 int oval = IP_PMTUDISC_DONT; 221 int oval = IP_PMTUDISC_DONT;
178 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 222 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
179 } 223 }
180#endif 224#endif
181 225
182 sockinfo si (THISNODE, PROT_ICMPv4); 226 sockinfo si (THISNODE, PROT_ICMPv4);
183 227
… …
185 { 229 {
186 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));
187 exit (EXIT_FAILURE); 231 exit (EXIT_FAILURE);
188 } 232 }
189 233
190 icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ); 234 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
191 } 235 }
192#endif 236#endif
193 237
194 tcpv4_fd = -1; 238 tcpv4_fd = -1;
195 239
… …
200 244
201 if (tcpv4_fd < 0) 245 if (tcpv4_fd < 0)
202 return -1; 246 return -1;
203 247
204 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK); 248 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
249 fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
205 250
206 // standard daemon practise... 251 // standard daemon practise...
207 { 252 {
208 int oval = 1; 253 int oval = 1;
209 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 254 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
221 { 266 {
222 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));
223 exit (EXIT_FAILURE); 268 exit (EXIT_FAILURE);
224 } 269 }
225 270
226 tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ); 271 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
227 } 272 }
228#endif 273#endif
274
275 dnsv4_tos = -1;
276 dnsv4_fd = -1;
229 277
230#if ENABLE_DNS 278#if ENABLE_DNS
231 if (THISNODE->protocols & PROT_DNSv4) 279 if (THISNODE->protocols & PROT_DNSv4)
232 { 280 {
281 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
282
233 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 283 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
234 284
235 if (dnsv4_fd < 0) 285 if (dnsv4_fd < 0)
236 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
237 300
238 // standard daemon practise... 301 // standard daemon practise...
239 { 302 {
240 int oval = 1; 303 int oval = 1;
241 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 304 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
242 } 305 }
243 306
244 sockinfo si (THISNODE, PROT_DNSv4); 307 sockinfo si (THISNODE->dns_hostname,
308 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
309 PROT_DNSv4);
245 310
246 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ())) 311 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
247 { 312 {
248 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));
249 exit (EXIT_FAILURE); 314 exit (EXIT_FAILURE);
250 } 315 }
251 316
252 dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ); 317 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
253 } 318 }
254#endif 319#endif
320
321 /////////////////////////////////////////////////////////////////////////////
322
323 reconnect_all ();
324
325 /////////////////////////////////////////////////////////////////////////////
255 326
256 tap = new tap_device (); 327 tap = new tap_device ();
257 if (!tap) //D this, of course, never catches 328 if (!tap) //D this, of course, never catches
258 { 329 {
259 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 330 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
260 exit (EXIT_FAILURE); 331 exit (EXIT_FAILURE);
261 } 332 }
262 333
263 run_script (run_script_cb (this, &vpn::script_if_up), true); 334 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
264 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
265 tap_ev_watcher.start (tap->fd, EVENT_READ); 354 tap_ev_watcher.start (tap->fd, EV_READ);
266
267 reconnect_all ();
268 355
269 return 0; 356 return 0;
270} 357}
271 358
272bool 359bool
273vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 360vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
274{ 361{
275#if defined(SOL_IP) && defined(IP_TOS) 362 set_tos (ipv4_fd, ipv4_tos, tos);
276 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
277#endif
278 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 ());
279 364
280 return true; 365 return true;
281} 366}
282 367
… …
305 390
306#if ENABLE_ICMP 391#if ENABLE_ICMP
307bool 392bool
308vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 393vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
309{ 394{
310#if defined(SOL_IP) && defined(IP_TOS)
311 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
312#endif
313
314 pkt->unshift_hdr (4); 395 pkt->unshift_hdr (4);
315 396
316 icmp_header *hdr = (icmp_header *)&((*pkt)[0]); 397 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
317 hdr->type = ::conf.icmp_type; 398 hdr->type = ::conf.icmp_type;
318 hdr->code = 255; 399 hdr->code = 255;
319 hdr->checksum = 0; 400 hdr->checksum = 0;
320 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 401 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
321 402
403 set_tos (icmpv4_fd, icmpv4_tos, tos);
322 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 ());
323 405
324 return true; 406 return true;
325} 407}
326#endif 408#endif
327 409
328bool 410bool
329vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 411vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
330{ 412{
331#if defined(SOL_IP) && defined(IP_TOS) 413 set_tos (udpv4_fd, udpv4_tos, tos);
332 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
333#endif
334 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 ());
335 415
336 return true; 416 return true;
337} 417}
338 418
… …
349 { 429 {
350 // broadcast, this is ugly, but due to the security policy 430 // broadcast, this is ugly, but due to the security policy
351 // we have to connect to all hosts... 431 // we have to connect to all hosts...
352 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 432 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
353 if ((*c)->conf != THISNODE) 433 if ((*c)->conf != THISNODE)
354 (*c)->inject_data_packet (pkt, true); 434 (*c)->inject_data_packet (pkt);
355 } 435 }
356} 436}
357 437
358void 438void
359vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 439vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
… …
393 else 473 else
394 c->recv_vpn_packet (pkt, rsi); 474 c->recv_vpn_packet (pkt, rsi);
395 } 475 }
396} 476}
397 477
398void 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
399vpn::ipv4_ev (io_watcher &w, short revents) 509vpn::ipv4_ev (ev::io &w, int revents)
400{ 510{
401 if (revents & EVENT_READ) 511 if (revents & EV_READ)
402 { 512 {
403 vpn_packet *pkt = new vpn_packet; 513 vpn_packet *pkt = new vpn_packet;
404 struct sockaddr_in sa; 514 struct sockaddr_in sa;
405 socklen_t sa_len = sizeof (sa); 515 socklen_t sa_len = sizeof (sa);
406 int len; 516 int len;
… …
411 521
412 if (len > 0) 522 if (len > 0)
413 { 523 {
414 pkt->len = len; 524 pkt->len = len;
415 525
416 // 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
417 // this is slow, but...
418 pkt->skip_hdr (IP_OVERHEAD); 527 pkt->skip_hdr (IP_OVERHEAD);
419 528
420 recv_vpn_packet (pkt, si); 529 recv_vpn_packet (pkt, si);
421 } 530 }
422 else 531 else
… …
428 delete pkt; 537 delete pkt;
429 } 538 }
430 else 539 else
431 { 540 {
432 slog (L_ERR, 541 slog (L_ERR,
433 _("FATAL: unknown revents %08x in socket, terminating\n"), 542 _("FATAL: unknown revents %08x in socket, terminating\n"),
434 revents); 543 revents);
435 exit (EXIT_FAILURE); 544 exit (EXIT_FAILURE);
436 } 545 }
437} 546}
438 547
439#if ENABLE_ICMP 548#if ENABLE_ICMP
440void 549inline void
441vpn::icmpv4_ev (io_watcher &w, short revents) 550vpn::icmpv4_ev (ev::io &w, int revents)
442{ 551{
443 if (revents & EVENT_READ) 552 if (revents & EV_READ)
444 { 553 {
445 vpn_packet *pkt = new vpn_packet; 554 vpn_packet *pkt = new vpn_packet;
446 struct sockaddr_in sa; 555 struct sockaddr_in sa;
447 socklen_t sa_len = sizeof (sa); 556 socklen_t sa_len = sizeof (sa);
448 int len; 557 int len;
… …
483 exit (EXIT_FAILURE); 592 exit (EXIT_FAILURE);
484 } 593 }
485} 594}
486#endif 595#endif
487 596
488void 597inline void
489vpn::udpv4_ev (io_watcher &w, short revents) 598vpn::udpv4_ev (ev::io &w, int revents)
490{ 599{
491 if (revents & EVENT_READ) 600 if (revents & EV_READ)
492 { 601 {
493 vpn_packet *pkt = new vpn_packet; 602 vpn_packet *pkt = new vpn_packet;
494 struct sockaddr_in sa; 603 struct sockaddr_in sa;
495 socklen_t sa_len = sizeof (sa); 604 socklen_t sa_len = sizeof (sa);
496 int len; 605 int len;
… …
520 revents); 629 revents);
521 exit (EXIT_FAILURE); 630 exit (EXIT_FAILURE);
522 } 631 }
523} 632}
524 633
525void 634inline void
526vpn::tap_ev (io_watcher &w, short revents) 635vpn::tap_ev (ev::io &w, int revents)
527{ 636{
528 if (revents & EVENT_READ) 637 if (revents & EV_READ)
529 { 638 {
530 /* process data */ 639 /* process data */
531 tap_packet *pkt; 640 tap_packet *pkt;
532 641
533 pkt = tap->recv (); 642 pkt = tap->recv ();
… …
540 int dst = mac2id (pkt->dst); 649 int dst = mac2id (pkt->dst);
541 int src = mac2id (pkt->src); 650 int src = mac2id (pkt->src);
542 651
543 if (src != THISNODE->id) 652 if (src != THISNODE->id)
544 { 653 {
545 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."));
546 exit (EXIT_FAILURE); 655 exit (EXIT_FAILURE);
547 } 656 }
548 657
549 if (dst == THISNODE->id) 658 if (dst == THISNODE->id)
550 { 659 {
… …
562 } 671 }
563 else 672 else
564 abort (); 673 abort ();
565} 674}
566 675
567void 676inline void
568vpn::event_cb (time_watcher &w) 677vpn::event_cb (ev::timer &w, int)
569{ 678{
570 if (events) 679 if (events)
571 { 680 {
572 if (events & EVENT_SHUTDOWN) 681 if (events & EVENT_SHUTDOWN)
573 { 682 {
… …
664} 773}
665 774
666void 775void
667vpn::dump_status () 776vpn::dump_status ()
668{ 777{
669 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 778 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
670 779
671 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 780 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
672 (*c)->dump_status (); 781 (*c)->dump_status ();
673 782
674 slog (L_NOTICE, _("END status dump")); 783 slog (L_NOTICE, _("END status dump"));
675} 784}
676 785
677vpn::vpn (void) 786vpn::vpn (void)
787{
678: event (this, &vpn::event_cb) 788 event .set<vpn, &vpn::event_cb > (this);
679, udpv4_ev_watcher (this, &vpn::udpv4_ev) 789 udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
680, ipv4_ev_watcher (this, &vpn::ipv4_ev) 790 ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
681#if ENABLE_TCP 791#if ENABLE_TCP
682, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 792 tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
683#endif 793#endif
684#if ENABLE_ICMP 794#if ENABLE_ICMP
685, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 795 icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
686#endif 796#endif
687#if ENABLE_DNS 797#if ENABLE_DNS
688, dnsv4_ev_watcher (this, &vpn::dnsv4_ev) 798 dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
689#endif 799#endif
690, tap_ev_watcher (this, &vpn::tap_ev) 800 tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
691{
692} 801}
693 802
694vpn::~vpn () 803vpn::~vpn ()
695{ 804{
696} 805}

Diff Legend

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