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.33 by pcg, Wed Mar 23 21:55:39 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
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
51void 63void
52vpn::script_init_env () 64vpn::script_init_env ()
53{ 65{
54 // the tunnel device mtu should be the physical mtu - overhead 66 // the tunnel device mtu should be the physical mtu - overhead
55 // the tricky part is rounding to the cipher key blocksize 67 // the tricky part is rounding to the cipher key blocksize
… …
58 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 70 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
59 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 71 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
60 72
61 char *env; 73 char *env;
62 asprintf (&env, "CONFBASE=%s", confbase); putenv (env); 74 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
63 asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
64 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
65 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env); 75 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
66 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env); 76 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
67 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env); 77 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
68 asprintf (&env, "MTU=%d", mtu); putenv (env); 78 asprintf (&env, "MTU=%d", mtu); putenv (env);
69 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 79 asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
70 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8, 80 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
71 THISNODE->id & 0xff); putenv (env);
72 81
73 // TODO: info for other nodes, maybe? 82 conns [THISNODE->id - 1]->script_init_env ("");
74}
75 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 *
76const char *vpn::script_if_init () 93vpn::script_if_init ()
77{ 94{
78 script_init_env (); 95 script_init_env ();
79 96
80 return tap->if_up (); 97 return tap->if_up ();
81} 98}
82 99
100inline const char *
83const char *vpn::script_if_up () 101vpn::script_if_up ()
84{ 102{
85 script_init_env (); 103 script_init_env ();
86 104
87 char *filename; 105 char *filename;
88 asprintf (&filename, 106 asprintf (&filename,
… …
94} 112}
95 113
96int 114int
97vpn::setup () 115vpn::setup ()
98{ 116{
117 ipv4_tos = -1;
99 ipv4_fd = -1; 118 ipv4_fd = -1;
100 119
101 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 120 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
102 { 121 {
103 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 122 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
104 123
105 if (ipv4_fd < 0) 124 if (ipv4_fd < 0)
106 return -1; 125 return -1;
107 126
108 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); 127 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
128 fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
109 129
110#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 130#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
111 // this I really consider a linux bug. I am neither connected 131 // this I really consider a linux bug. I am neither connected
112 // 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
113 // fragment for me sometimes. 133 // fragment for me sometimes.
… …
123 { 143 {
124 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));
125 exit (EXIT_FAILURE); 145 exit (EXIT_FAILURE);
126 } 146 }
127 147
128 ipv4_ev_watcher.start (ipv4_fd, EVENT_READ); 148 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
129 } 149 }
130 150
151 udpv4_tos = -1;
131 udpv4_fd = -1; 152 udpv4_fd = -1;
132 153
133 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 154 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
134 { 155 {
135 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 156 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
136 157
137 if (udpv4_fd < 0) 158 if (udpv4_fd < 0)
138 return -1; 159 return -1;
139 160
140 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK); 161 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
162 fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
141 163
142 // standard daemon practise... 164 // standard daemon practise...
143 { 165 {
144 int oval = 1; 166 int oval = 1;
145 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 167 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
161 { 183 {
162 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));
163 exit (EXIT_FAILURE); 185 exit (EXIT_FAILURE);
164 } 186 }
165 187
166 udpv4_ev_watcher.start (udpv4_fd, EVENT_READ); 188 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
167 } 189 }
168 190
191 icmpv4_tos = -1;
169 icmpv4_fd = -1; 192 icmpv4_fd = -1;
170 193
171#if ENABLE_ICMP 194#if ENABLE_ICMP
172 if (THISNODE->protocols & PROT_ICMPv4) 195 if (THISNODE->protocols & PROT_ICMPv4)
173 { 196 {
174 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 197 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
175 198
176 if (icmpv4_fd < 0) 199 if (icmpv4_fd < 0)
177 return -1; 200 return -1;
178 201
179 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK); 202 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
203 fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
180 204
181#ifdef ICMP_FILTER 205#ifdef ICMP_FILTER
182 { 206 {
183 icmp_filter oval; 207 icmp_filter oval;
184 oval.data = 0xffffffff; 208 oval.data = 0xffffffff;
… …
193 // this I really consider a linux bug. I am neither connected 217 // this I really consider a linux bug. I am neither connected
194 // 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
195 // fragment for me sometimes. 219 // fragment for me sometimes.
196 { 220 {
197 int oval = IP_PMTUDISC_DONT; 221 int oval = IP_PMTUDISC_DONT;
198 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 222 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
199 } 223 }
200#endif 224#endif
201 225
202 sockinfo si (THISNODE, PROT_ICMPv4); 226 sockinfo si (THISNODE, PROT_ICMPv4);
203 227
… …
205 { 229 {
206 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));
207 exit (EXIT_FAILURE); 231 exit (EXIT_FAILURE);
208 } 232 }
209 233
210 icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ); 234 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
211 } 235 }
212#endif 236#endif
213 237
214 tcpv4_fd = -1; 238 tcpv4_fd = -1;
215 239
… …
220 244
221 if (tcpv4_fd < 0) 245 if (tcpv4_fd < 0)
222 return -1; 246 return -1;
223 247
224 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK); 248 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
249 fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
225 250
226 // standard daemon practise... 251 // standard daemon practise...
227 { 252 {
228 int oval = 1; 253 int oval = 1;
229 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 254 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
241 { 266 {
242 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));
243 exit (EXIT_FAILURE); 268 exit (EXIT_FAILURE);
244 } 269 }
245 270
246 tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ); 271 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
247 } 272 }
248#endif 273#endif
274
275 dnsv4_tos = -1;
276 dnsv4_fd = -1;
249 277
250#if ENABLE_DNS 278#if ENABLE_DNS
251 if (THISNODE->protocols & PROT_DNSv4) 279 if (THISNODE->protocols & PROT_DNSv4)
252 { 280 {
253 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4); 281 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
… …
255 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 283 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
256 284
257 if (dnsv4_fd < 0) 285 if (dnsv4_fd < 0)
258 return -1; 286 return -1;
259 287
288 fcntl (dnsv4_fd, F_SETFL, O_NONBLOCK);
289 fcntl (dnsv4_fd, F_SETFD, FD_CLOEXEC);
290
260#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 291# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
261 // this I really consider a linux bug. I am neither connected 292 // this I really consider a linux bug. I am neither connected
262 // nor do I fragment myself. Linux still sets DF and doesn't 293 // nor do I fragment myself. Linux still sets DF and doesn't
263 // fragment for me sometimes. 294 // fragment for me sometimes.
264 { 295 {
265 int oval = IP_PMTUDISC_DONT; 296 int oval = IP_PMTUDISC_DONT;
266 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 297 setsockopt (dnsv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
267 } 298 }
268#endif 299# endif
269 300
270 // standard daemon practise... 301 // standard daemon practise...
271 { 302 {
272 int oval = 1; 303 int oval = 1;
273 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 304 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
281 { 312 {
282 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));
283 exit (EXIT_FAILURE); 314 exit (EXIT_FAILURE);
284 } 315 }
285 316
286 dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ); 317 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
287 } 318 }
288#endif 319#endif
320
321 /////////////////////////////////////////////////////////////////////////////
322
323 reconnect_all ();
324
325 /////////////////////////////////////////////////////////////////////////////
289 326
290 tap = new tap_device (); 327 tap = new tap_device ();
291 if (!tap) //D this, of course, never catches 328 if (!tap) //D this, of course, never catches
292 { 329 {
293 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 330 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
294 exit (EXIT_FAILURE); 331 exit (EXIT_FAILURE);
295 } 332 }
296 333
334 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
335
336 run_script_cb cb;
337 cb.set<vpn, &vpn::script_if_init> (this);
338
297 if (tap->if_up () && 339 if (tap->if_up () &&
298 !run_script (run_script_cb (this, &vpn::script_if_init), true)) 340 !run_script (cb, true))
299 { 341 {
300 slog (L_ERR, _("interface initialization command '%s' failed, exiting."), 342 slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
301 tap->if_up ()); 343 tap->if_up ());
302 exit (EXIT_FAILURE); 344 exit (EXIT_FAILURE);
303 } 345 }
304 346
305 if (!run_script (run_script_cb (this, &vpn::script_if_up), true)) 347 cb.set<vpn, &vpn::script_if_up> (this);
348 if (!run_script (cb, true))
306 { 349 {
307 slog (L_ERR, _("if-up command execution failed, exiting.")); 350 slog (L_ERR, _("if-up command execution failed, exiting."));
308 exit (EXIT_FAILURE); 351 exit (EXIT_FAILURE);
309 } 352 }
310 353
311 tap_ev_watcher.start (tap->fd, EVENT_READ); 354 tap_ev_watcher.start (tap->fd, EV_READ);
312
313 reconnect_all ();
314 355
315 return 0; 356 return 0;
316} 357}
317 358
318bool 359bool
319vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 360vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
320{ 361{
321#if defined(SOL_IP) && defined(IP_TOS) 362 set_tos (ipv4_fd, ipv4_tos, tos);
322 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
323#endif
324 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 ());
325 364
326 return true; 365 return true;
327} 366}
328 367
… …
351 390
352#if ENABLE_ICMP 391#if ENABLE_ICMP
353bool 392bool
354vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 393vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
355{ 394{
356#if defined(SOL_IP) && defined(IP_TOS)
357 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
358#endif
359
360 pkt->unshift_hdr (4); 395 pkt->unshift_hdr (4);
361 396
362 icmp_header *hdr = (icmp_header *)&((*pkt)[0]); 397 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
363 hdr->type = ::conf.icmp_type; 398 hdr->type = ::conf.icmp_type;
364 hdr->code = 255; 399 hdr->code = 255;
365 hdr->checksum = 0; 400 hdr->checksum = 0;
366 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 401 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
367 402
403 set_tos (icmpv4_fd, icmpv4_tos, tos);
368 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 ());
369 405
370 return true; 406 return true;
371} 407}
372#endif 408#endif
373 409
374bool 410bool
375vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 411vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
376{ 412{
377#if defined(SOL_IP) && defined(IP_TOS) 413 set_tos (udpv4_fd, udpv4_tos, tos);
378 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
379#endif
380 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 ());
381 415
382 return true; 416 return true;
383} 417}
384 418
… …
395 { 429 {
396 // broadcast, this is ugly, but due to the security policy 430 // broadcast, this is ugly, but due to the security policy
397 // we have to connect to all hosts... 431 // we have to connect to all hosts...
398 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 432 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
399 if ((*c)->conf != THISNODE) 433 if ((*c)->conf != THISNODE)
400 (*c)->inject_data_packet (pkt, true); 434 (*c)->inject_data_packet (pkt);
401 } 435 }
402} 436}
403 437
404void 438void
405vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 439vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
… …
446{ 480{
447 switch (si.prot) 481 switch (si.prot)
448 { 482 {
449 case PROT_IPv4: 483 case PROT_IPv4:
450 return send_ipv4_packet (pkt, si, tos); 484 return send_ipv4_packet (pkt, si, tos);
485
451 case PROT_UDPv4: 486 case PROT_UDPv4:
452 return send_udpv4_packet (pkt, si, tos); 487 return send_udpv4_packet (pkt, si, tos);
488
453#if ENABLE_TCP 489#if ENABLE_TCP
454 case PROT_TCPv4: 490 case PROT_TCPv4:
455 return send_tcpv4_packet (pkt, si, tos); 491 return send_tcpv4_packet (pkt, si, tos);
456#endif 492#endif
457#if ENABLE_ICMP 493#if ENABLE_ICMP
… …
460#endif 496#endif
461#if ENABLE_DNS 497#if ENABLE_DNS
462 case PROT_DNSv4: 498 case PROT_DNSv4:
463 return send_dnsv4_packet (pkt, si, tos); 499 return send_dnsv4_packet (pkt, si, tos);
464#endif 500#endif
465
466 default: 501 default:
467 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si); 502 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
468 } 503 }
469 504
470 return false; 505 return false;
471} 506}
472 507
473void 508inline void
474vpn::ipv4_ev (io_watcher &w, short revents) 509vpn::ipv4_ev (ev::io &w, int revents)
475{ 510{
476 if (revents & EVENT_READ) 511 if (revents & EV_READ)
477 { 512 {
478 vpn_packet *pkt = new vpn_packet; 513 vpn_packet *pkt = new vpn_packet;
479 struct sockaddr_in sa; 514 struct sockaddr_in sa;
480 socklen_t sa_len = sizeof (sa); 515 socklen_t sa_len = sizeof (sa);
481 int len; 516 int len;
… …
509 exit (EXIT_FAILURE); 544 exit (EXIT_FAILURE);
510 } 545 }
511} 546}
512 547
513#if ENABLE_ICMP 548#if ENABLE_ICMP
514void 549inline void
515vpn::icmpv4_ev (io_watcher &w, short revents) 550vpn::icmpv4_ev (ev::io &w, int revents)
516{ 551{
517 if (revents & EVENT_READ) 552 if (revents & EV_READ)
518 { 553 {
519 vpn_packet *pkt = new vpn_packet; 554 vpn_packet *pkt = new vpn_packet;
520 struct sockaddr_in sa; 555 struct sockaddr_in sa;
521 socklen_t sa_len = sizeof (sa); 556 socklen_t sa_len = sizeof (sa);
522 int len; 557 int len;
… …
557 exit (EXIT_FAILURE); 592 exit (EXIT_FAILURE);
558 } 593 }
559} 594}
560#endif 595#endif
561 596
562void 597inline void
563vpn::udpv4_ev (io_watcher &w, short revents) 598vpn::udpv4_ev (ev::io &w, int revents)
564{ 599{
565 if (revents & EVENT_READ) 600 if (revents & EV_READ)
566 { 601 {
567 vpn_packet *pkt = new vpn_packet; 602 vpn_packet *pkt = new vpn_packet;
568 struct sockaddr_in sa; 603 struct sockaddr_in sa;
569 socklen_t sa_len = sizeof (sa); 604 socklen_t sa_len = sizeof (sa);
570 int len; 605 int len;
… …
594 revents); 629 revents);
595 exit (EXIT_FAILURE); 630 exit (EXIT_FAILURE);
596 } 631 }
597} 632}
598 633
599void 634inline void
600vpn::tap_ev (io_watcher &w, short revents) 635vpn::tap_ev (ev::io &w, int revents)
601{ 636{
602 if (revents & EVENT_READ) 637 if (revents & EV_READ)
603 { 638 {
604 /* process data */ 639 /* process data */
605 tap_packet *pkt; 640 tap_packet *pkt;
606 641
607 pkt = tap->recv (); 642 pkt = tap->recv ();
… …
636 } 671 }
637 else 672 else
638 abort (); 673 abort ();
639} 674}
640 675
641void 676inline void
642vpn::event_cb (time_watcher &w) 677vpn::event_cb (ev::timer &w, int)
643{ 678{
644 if (events) 679 if (events)
645 { 680 {
646 if (events & EVENT_SHUTDOWN) 681 if (events & EVENT_SHUTDOWN)
647 { 682 {
… …
738} 773}
739 774
740void 775void
741vpn::dump_status () 776vpn::dump_status ()
742{ 777{
743 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 778 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
744 779
745 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 780 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
746 (*c)->dump_status (); 781 (*c)->dump_status ();
747 782
748 slog (L_NOTICE, _("END status dump")); 783 slog (L_NOTICE, _("END status dump"));
749} 784}
750 785
751vpn::vpn (void) 786vpn::vpn (void)
787{
752: event (this, &vpn::event_cb) 788 event .set<vpn, &vpn::event_cb > (this);
753, udpv4_ev_watcher (this, &vpn::udpv4_ev) 789 udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
754, ipv4_ev_watcher (this, &vpn::ipv4_ev) 790 ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
755#if ENABLE_TCP 791#if ENABLE_TCP
756, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 792 tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
757#endif 793#endif
758#if ENABLE_ICMP 794#if ENABLE_ICMP
759, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 795 icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
760#endif 796#endif
761#if ENABLE_DNS 797#if ENABLE_DNS
762, dnsv4_ev_watcher (this, &vpn::dnsv4_ev) 798 dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
763#endif 799#endif
764, tap_ev_watcher (this, &vpn::tap_ev) 800 tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
765{
766} 801}
767 802
768vpn::~vpn () 803vpn::~vpn ()
769{ 804{
770} 805}

Diff Legend

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