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.21 by pcg, Thu Oct 16 21:57:54 2003 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 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>
23 25
26#include <cstdio>
27#include <cstring>
24#include <cstdlib> 28#include <cstdlib>
25#include <cstring>
26#include <cstdio>
27 29
28#include <sys/types.h> 30#include <sys/types.h>
29#include <sys/socket.h> 31#include <sys/socket.h>
30#include <sys/wait.h> 32#include <sys/wait.h>
31#include <errno.h> 33#include <errno.h>
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
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,
71 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;
72} 112}
73 113
74int 114int
75vpn::setup () 115vpn::setup ()
76{ 116{
117 ipv4_tos = -1;
77 ipv4_fd = -1; 118 ipv4_fd = -1;
78 119
79 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 120 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
80 { 121 {
81 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 122 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
82 123
83 if (ipv4_fd < 0) 124 if (ipv4_fd < 0)
84 return -1; 125 return -1;
85 126
86 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); 127 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
128 fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
87 129
88#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 130#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
89 // this I really consider a linux bug. I am neither connected 131 // this I really consider a linux bug. I am neither connected
90 // 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
91 // fragment for me sometimes. 133 // fragment for me sometimes.
98 sockinfo si (THISNODE, PROT_IPv4); 140 sockinfo si (THISNODE, PROT_IPv4);
99 141
100 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 142 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
101 { 143 {
102 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));
103 exit (1); 145 exit (EXIT_FAILURE);
104 } 146 }
105 147
106 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 148 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
107 } 149 }
108 150
151 udpv4_tos = -1;
109 udpv4_fd = -1; 152 udpv4_fd = -1;
110 153
111 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 154 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
112 { 155 {
113 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 156 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
114 157
115 if (udpv4_fd < 0) 158 if (udpv4_fd < 0)
116 return -1; 159 return -1;
117 160
118 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK); 161 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
162 fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
119 163
120 // standard daemon practise... 164 // standard daemon practise...
121 { 165 {
122 int oval = 1; 166 int oval = 1;
123 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 167 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
136 sockinfo si (THISNODE, PROT_UDPv4); 180 sockinfo si (THISNODE, PROT_UDPv4);
137 181
138 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 182 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
139 { 183 {
140 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));
141 exit (1); 185 exit (EXIT_FAILURE);
142 } 186 }
143 187
144 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 188 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
145 } 189 }
146 190
191 icmpv4_tos = -1;
147 icmpv4_fd = -1; 192 icmpv4_fd = -1;
148 193
149#if ENABLE_ICMP 194#if ENABLE_ICMP
150 if (THISNODE->protocols & PROT_ICMPv4) 195 if (THISNODE->protocols & PROT_ICMPv4)
151 { 196 {
152 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 197 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
153 198
154 if (icmpv4_fd < 0) 199 if (icmpv4_fd < 0)
155 return -1; 200 return -1;
156 201
157 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK); 202 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
203 fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
158 204
159#ifdef ICMP_FILTER 205#ifdef ICMP_FILTER
160 { 206 {
161 icmp_filter oval; 207 icmp_filter oval;
162 oval.data = 0xffffffff; 208 oval.data = 0xffffffff;
171 // this I really consider a linux bug. I am neither connected 217 // this I really consider a linux bug. I am neither connected
172 // 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
173 // fragment for me sometimes. 219 // fragment for me sometimes.
174 { 220 {
175 int oval = IP_PMTUDISC_DONT; 221 int oval = IP_PMTUDISC_DONT;
176 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 222 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
177 } 223 }
178#endif 224#endif
179 225
180 sockinfo si (THISNODE, PROT_ICMPv4); 226 sockinfo si (THISNODE, PROT_ICMPv4);
181 227
182 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 228 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
183 { 229 {
184 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));
185 exit (1); 231 exit (EXIT_FAILURE);
186 } 232 }
187 233
188 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); 234 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
189 } 235 }
190#endif 236#endif
191 237
192 tcpv4_fd = -1; 238 tcpv4_fd = -1;
193 239
198 244
199 if (tcpv4_fd < 0) 245 if (tcpv4_fd < 0)
200 return -1; 246 return -1;
201 247
202 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK); 248 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
249 fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
203 250
204 // standard daemon practise... 251 // standard daemon practise...
205 { 252 {
206 int oval = 1; 253 int oval = 1;
207 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 254 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
210 sockinfo si (THISNODE, PROT_TCPv4); 257 sockinfo si (THISNODE, PROT_TCPv4);
211 258
212 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 259 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
213 { 260 {
214 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 261 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
215 exit (1); 262 exit (EXIT_FAILURE);
216 } 263 }
217 264
218 if (listen (tcpv4_fd, 5)) 265 if (listen (tcpv4_fd, 5))
219 { 266 {
220 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));
221 exit (1); 268 exit (EXIT_FAILURE);
269 }
270
271 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
272 }
273#endif
274
275 dnsv4_tos = -1;
276 dnsv4_fd = -1;
277
278#if ENABLE_DNS
279 if (THISNODE->protocols & PROT_DNSv4)
280 {
281 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
282
283 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
284
285 if (dnsv4_fd < 0)
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);
222 } 298 }
223
224 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
225 }
226#endif 299# endif
300
301 // standard daemon practise...
302 {
303 int oval = 1;
304 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
305 }
306
307 sockinfo si (THISNODE->dns_hostname,
308 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
309 PROT_DNSv4);
310
311 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
312 {
313 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
314 exit (EXIT_FAILURE);
315 }
316
317 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
318 }
319#endif
320
321 /////////////////////////////////////////////////////////////////////////////
322
323 reconnect_all ();
324
325 /////////////////////////////////////////////////////////////////////////////
227 326
228 tap = new tap_device (); 327 tap = new tap_device ();
229 if (!tap) //D this, of course, never catches 328 if (!tap) //D this, of course, never catches
230 { 329 {
231 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 330 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
232 exit (1); 331 exit (EXIT_FAILURE);
233 } 332 }
234 333
235 run_script (run_script_cb (this, &vpn::script_if_up), true); 334 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
236 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
237 tap_ev_watcher.start (tap->fd, POLLIN); 354 tap_ev_watcher.start (tap->fd, EV_READ);
238
239 reconnect_all ();
240 355
241 return 0; 356 return 0;
242}
243
244// send a vpn packet out to other hosts
245bool
246vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
247{
248 switch (si.prot)
249 {
250 case PROT_IPv4:
251 return send_ipv4_packet (pkt, si, tos);
252
253 case PROT_UDPv4:
254 return send_udpv4_packet (pkt, si, tos);
255
256#if ENABLE_TCP
257 case PROT_TCPv4:
258 return send_tcpv4_packet (pkt, si, tos);
259#endif
260
261#if ENABLE_ICMP
262 case PROT_ICMPv4:
263 return send_icmpv4_packet (pkt, si, tos);
264#endif
265
266 default:
267 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
268 return false;
269 }
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 & (POLLIN | POLLERR)) 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
425 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 534 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
426 } 535 }
427 536
428 delete pkt; 537 delete pkt;
429 } 538 }
430 else if (revents & POLLHUP)
431 {
432 // this cannot ;) happen on udp sockets
433 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
434 exit (1);
435 }
436 else 539 else
437 { 540 {
438 slog (L_ERR, 541 slog (L_ERR,
439 _("FATAL: unknown revents %08x in socket, terminating\n"), 542 _("FATAL: unknown revents %08x in socket, terminating\n"),
440 revents); 543 revents);
441 exit (1); 544 exit (EXIT_FAILURE);
442 } 545 }
443} 546}
444 547
445#if ENABLE_ICMP 548#if ENABLE_ICMP
446void 549inline void
447vpn::icmpv4_ev (io_watcher &w, short revents) 550vpn::icmpv4_ev (ev::io &w, int revents)
448{ 551{
449 if (revents & (POLLIN | POLLERR)) 552 if (revents & EV_READ)
450 { 553 {
451 vpn_packet *pkt = new vpn_packet; 554 vpn_packet *pkt = new vpn_packet;
452 struct sockaddr_in sa; 555 struct sockaddr_in sa;
453 socklen_t sa_len = sizeof (sa); 556 socklen_t sa_len = sizeof (sa);
454 int len; 557 int len;
479 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 582 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
480 } 583 }
481 584
482 delete pkt; 585 delete pkt;
483 } 586 }
484 else if (revents & POLLHUP)
485 {
486 // this cannot ;) happen on udp sockets
487 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
488 exit (1);
489 }
490 else 587 else
491 { 588 {
492 slog (L_ERR, 589 slog (L_ERR,
493 _("FATAL: unknown revents %08x in socket, terminating\n"), 590 _("FATAL: unknown revents %08x in socket, terminating\n"),
494 revents); 591 revents);
495 exit (1); 592 exit (EXIT_FAILURE);
496 } 593 }
497} 594}
498#endif 595#endif
499 596
500void 597inline void
501vpn::udpv4_ev (io_watcher &w, short revents) 598vpn::udpv4_ev (ev::io &w, int revents)
502{ 599{
503 if (revents & (POLLIN | POLLERR)) 600 if (revents & EV_READ)
504 { 601 {
505 vpn_packet *pkt = new vpn_packet; 602 vpn_packet *pkt = new vpn_packet;
506 struct sockaddr_in sa; 603 struct sockaddr_in sa;
507 socklen_t sa_len = sizeof (sa); 604 socklen_t sa_len = sizeof (sa);
508 int len; 605 int len;
523 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 620 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
524 } 621 }
525 622
526 delete pkt; 623 delete pkt;
527 } 624 }
528 else if (revents & POLLHUP)
529 {
530 // this cannot ;) happen on udp sockets
531 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
532 exit (1);
533 }
534 else 625 else
535 { 626 {
536 slog (L_ERR, 627 slog (L_ERR,
537 _("FATAL: unknown revents %08x in socket, terminating\n"), 628 _("FATAL: unknown revents %08x in socket, terminating\n"),
538 revents); 629 revents);
539 exit (1); 630 exit (EXIT_FAILURE);
540 } 631 }
541} 632}
542 633
543void 634inline void
544vpn::tap_ev (io_watcher &w, short revents) 635vpn::tap_ev (ev::io &w, int revents)
545{ 636{
546 if (revents & POLLIN) 637 if (revents & EV_READ)
547 { 638 {
548 /* process data */ 639 /* process data */
549 tap_packet *pkt; 640 tap_packet *pkt;
550 641
551 pkt = tap->recv (); 642 pkt = tap->recv ();
558 int dst = mac2id (pkt->dst); 649 int dst = mac2id (pkt->dst);
559 int src = mac2id (pkt->src); 650 int src = mac2id (pkt->src);
560 651
561 if (src != THISNODE->id) 652 if (src != THISNODE->id)
562 { 653 {
563 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."));
564 exit (1); 655 exit (EXIT_FAILURE);
565 } 656 }
566 657
567 if (dst == THISNODE->id) 658 if (dst == THISNODE->id)
568 { 659 {
569 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting.")); 660 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
570 exit (1); 661 exit (EXIT_FAILURE);
571 } 662 }
572 663
573 if (dst > conns.size ()) 664 if (dst > conns.size ())
574 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst); 665 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
575 else 666 else
576 inject_data_packet (pkt, dst); 667 inject_data_packet (pkt, dst);
577 } 668 }
578 669
579 delete pkt; 670 delete pkt;
580 } 671 }
581 else if (revents & (POLLHUP | POLLERR))
582 {
583 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
584 exit (1);
585 }
586 else 672 else
587 abort (); 673 abort ();
588} 674}
589 675
590void 676inline void
591vpn::event_cb (time_watcher &w) 677vpn::event_cb (ev::timer &w, int)
592{ 678{
593 if (events) 679 if (events)
594 { 680 {
595 if (events & EVENT_SHUTDOWN) 681 if (events & EVENT_SHUTDOWN)
596 { 682 {
597 slog (L_INFO, _("preparing shutdown...")); 683 slog (L_INFO, _("preparing shutdown..."));
598 684
599 shutdown_all (); 685 shutdown_all ();
600
601 remove_pid (pidfilename); 686 remove_pid (conf.pidfilename);
602
603 slog (L_INFO, _("terminating")); 687 slog (L_INFO, _("terminating"));
604 688 exit (EXIT_SUCCESS);
605 exit (0);
606 } 689 }
607 690
608 if (events & EVENT_RECONNECT) 691 if (events & EVENT_RECONNECT)
609 { 692 {
610 slog (L_INFO, _("forced reconnect")); 693 slog (L_INFO, _("forced reconnect"));
612 reconnect_all (); 695 reconnect_all ();
613 } 696 }
614 697
615 events = 0; 698 events = 0;
616 } 699 }
617
618 w.at = TSTAMP_CANCEL;
619} 700}
620 701
621void 702void
622vpn::shutdown_all () 703vpn::shutdown_all ()
623{ 704{
636 connection_init (); 717 connection_init ();
637 718
638 for (configuration::node_vector::iterator i = conf.nodes.begin (); 719 for (configuration::node_vector::iterator i = conf.nodes.begin ();
639 i != conf.nodes.end (); ++i) 720 i != conf.nodes.end (); ++i)
640 { 721 {
641 connection *conn = new connection (this); 722 connection *conn = new connection (this, *i);
642
643 conn->conf = *i;
644 conns.push_back (conn); 723 conns.push_back (conn);
645
646 conn->establish_connection (); 724 conn->establish_connection ();
647 } 725 }
648} 726}
649 727
650connection *vpn::find_router () 728connection *vpn::find_router ()
695} 773}
696 774
697void 775void
698vpn::dump_status () 776vpn::dump_status ()
699{ 777{
700 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 778 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
701 779
702 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 780 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
703 (*c)->dump_status (); 781 (*c)->dump_status ();
704 782
705 slog (L_NOTICE, _("END status dump")); 783 slog (L_NOTICE, _("END status dump"));
706} 784}
707 785
708vpn::vpn (void) 786vpn::vpn (void)
787{
709: event (this, &vpn::event_cb) 788 event .set<vpn, &vpn::event_cb > (this);
710, udpv4_ev_watcher (this, &vpn::udpv4_ev) 789 udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
711, ipv4_ev_watcher (this, &vpn::ipv4_ev) 790 ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
712#if ENABLE_TCP 791#if ENABLE_TCP
713, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 792 tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
714#endif 793#endif
715#if ENABLE_ICMP 794#if ENABLE_ICMP
716, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 795 icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
717#endif 796#endif
718, tap_ev_watcher (this, &vpn::tap_ev) 797#if ENABLE_DNS
719{ 798 dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
799#endif
800 tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
720} 801}
721 802
722vpn::~vpn () 803vpn::~vpn ()
723{ 804{
724} 805}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines