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.20 by pcg, Thu Oct 16 14:12:00 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); 74 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
60 putenv (env);
61 asprintf (&env, "NODENAME=%s", THISNODE->nodename);
62 putenv (env);
63 asprintf (&env, "NODEID=%d", THISNODE->id);
64 putenv (env);
65 asprintf (&env, "IFNAME=%s", tap->interface ()); 75 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
66 putenv (env); 76 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
77 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
67 asprintf (&env, "MTU=%d", mtu); 78 asprintf (&env, "MTU=%d", mtu); putenv (env);
68 putenv (env); 79 asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
69 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 80 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
70 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
71 THISNODE->id & 0xff);
72 putenv (env);
73 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,
74 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;
75} 112}
76 113
77int 114int
78vpn::setup () 115vpn::setup ()
79{ 116{
117 ipv4_tos = -1;
80 ipv4_fd = -1; 118 ipv4_fd = -1;
81 119
82 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 120 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
83 { 121 {
84 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 122 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
85 123
86 if (ipv4_fd < 0) 124 if (ipv4_fd < 0)
87 return -1; 125 return -1;
88 126
89 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); 127 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
128 fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
90 129
91#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 130#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
92 // this I really consider a linux bug. I am neither connected 131 // this I really consider a linux bug. I am neither connected
93 // 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
94 // fragment for me sometimes. 133 // fragment for me sometimes.
101 sockinfo si (THISNODE, PROT_IPv4); 140 sockinfo si (THISNODE, PROT_IPv4);
102 141
103 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 142 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
104 { 143 {
105 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));
106 exit (1); 145 exit (EXIT_FAILURE);
107 } 146 }
108 147
109 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 148 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
110 } 149 }
111 150
151 udpv4_tos = -1;
112 udpv4_fd = -1; 152 udpv4_fd = -1;
113 153
114 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 154 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
115 { 155 {
116 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 156 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
117 157
118 if (udpv4_fd < 0) 158 if (udpv4_fd < 0)
119 return -1; 159 return -1;
120 160
121 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK); 161 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
162 fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
122 163
123 // standard daemon practise... 164 // standard daemon practise...
124 { 165 {
125 int oval = 1; 166 int oval = 1;
126 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 167 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
139 sockinfo si (THISNODE, PROT_UDPv4); 180 sockinfo si (THISNODE, PROT_UDPv4);
140 181
141 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 182 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
142 { 183 {
143 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));
144 exit (1); 185 exit (EXIT_FAILURE);
145 } 186 }
146 187
147 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 188 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
148 } 189 }
149 190
191 icmpv4_tos = -1;
150 icmpv4_fd = -1; 192 icmpv4_fd = -1;
151 193
152#if ENABLE_ICMP 194#if ENABLE_ICMP
153 if (THISNODE->protocols & PROT_ICMPv4) 195 if (THISNODE->protocols & PROT_ICMPv4)
154 { 196 {
155 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 197 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
156 198
157 if (icmpv4_fd < 0) 199 if (icmpv4_fd < 0)
158 return -1; 200 return -1;
159 201
160 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK); 202 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
203 fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
161 204
162#ifdef ICMP_FILTER 205#ifdef ICMP_FILTER
163 { 206 {
164 icmp_filter oval; 207 icmp_filter oval;
165 oval.data = 0xffffffff; 208 oval.data = 0xffffffff;
174 // this I really consider a linux bug. I am neither connected 217 // this I really consider a linux bug. I am neither connected
175 // 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
176 // fragment for me sometimes. 219 // fragment for me sometimes.
177 { 220 {
178 int oval = IP_PMTUDISC_DONT; 221 int oval = IP_PMTUDISC_DONT;
179 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 222 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
180 } 223 }
181#endif 224#endif
182 225
183 sockinfo si (THISNODE, PROT_ICMPv4); 226 sockinfo si (THISNODE, PROT_ICMPv4);
184 227
185 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 228 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
186 { 229 {
187 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));
188 exit (1); 231 exit (EXIT_FAILURE);
189 } 232 }
190 233
191 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); 234 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
192 } 235 }
193#endif 236#endif
194 237
195 tcpv4_fd = -1; 238 tcpv4_fd = -1;
196 239
201 244
202 if (tcpv4_fd < 0) 245 if (tcpv4_fd < 0)
203 return -1; 246 return -1;
204 247
205 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK); 248 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
249 fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
206 250
207 // standard daemon practise... 251 // standard daemon practise...
208 { 252 {
209 int oval = 1; 253 int oval = 1;
210 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 254 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
213 sockinfo si (THISNODE, PROT_TCPv4); 257 sockinfo si (THISNODE, PROT_TCPv4);
214 258
215 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 259 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
216 { 260 {
217 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));
218 exit (1); 262 exit (EXIT_FAILURE);
219 } 263 }
220 264
221 if (listen (tcpv4_fd, 5)) 265 if (listen (tcpv4_fd, 5))
222 { 266 {
223 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));
224 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);
225 } 298 }
226
227 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
228 }
229#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 /////////////////////////////////////////////////////////////////////////////
230 326
231 tap = new tap_device (); 327 tap = new tap_device ();
232 if (!tap) //D this, of course, never catches 328 if (!tap) //D this, of course, never catches
233 { 329 {
234 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 330 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
235 exit (1); 331 exit (EXIT_FAILURE);
236 } 332 }
237 333
238 run_script (run_script_cb (this, &vpn::script_if_up), true); 334 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
239 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
240 tap_ev_watcher.start (tap->fd, POLLIN); 354 tap_ev_watcher.start (tap->fd, EV_READ);
241
242 reconnect_all ();
243 355
244 return 0; 356 return 0;
245}
246
247// send a vpn packet out to other hosts
248bool
249vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
250{
251 switch (si.prot)
252 {
253 case PROT_IPv4:
254 return send_ipv4_packet (pkt, si, tos);
255
256 case PROT_UDPv4:
257 return send_udpv4_packet (pkt, si, tos);
258
259#if ENABLE_TCP
260 case PROT_TCPv4:
261 return send_tcpv4_packet (pkt, si, tos);
262#endif
263
264#if ENABLE_ICMP
265 case PROT_ICMPv4:
266 return send_icmpv4_packet (pkt, si, tos);
267#endif
268
269 default:
270 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
271 return false;
272 }
273} 357}
274 358
275bool 359bool
276vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 360vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
277{ 361{
278#if defined(SOL_IP) && defined(IP_TOS) 362 set_tos (ipv4_fd, ipv4_tos, tos);
279 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
280#endif
281 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 ());
282 364
283 return true; 365 return true;
284} 366}
285 367
308 390
309#if ENABLE_ICMP 391#if ENABLE_ICMP
310bool 392bool
311vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 393vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
312{ 394{
313#if defined(SOL_IP) && defined(IP_TOS)
314 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
315#endif
316
317 pkt->unshift_hdr (4); 395 pkt->unshift_hdr (4);
318 396
319 icmp_header *hdr = (icmp_header *)&((*pkt)[0]); 397 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
320 hdr->type = ::conf.icmp_type; 398 hdr->type = ::conf.icmp_type;
321 hdr->code = 255; 399 hdr->code = 255;
322 hdr->checksum = 0; 400 hdr->checksum = 0;
323 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 401 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
324 402
403 set_tos (icmpv4_fd, icmpv4_tos, tos);
325 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 ());
326 405
327 return true; 406 return true;
328} 407}
329#endif 408#endif
330 409
331bool 410bool
332vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 411vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
333{ 412{
334#if defined(SOL_IP) && defined(IP_TOS) 413 set_tos (udpv4_fd, udpv4_tos, tos);
335 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
336#endif
337 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 ());
338 415
339 return true; 416 return true;
340} 417}
341 418
352 { 429 {
353 // broadcast, this is ugly, but due to the security policy 430 // broadcast, this is ugly, but due to the security policy
354 // we have to connect to all hosts... 431 // we have to connect to all hosts...
355 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 432 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
356 if ((*c)->conf != THISNODE) 433 if ((*c)->conf != THISNODE)
357 (*c)->inject_data_packet (pkt, true); 434 (*c)->inject_data_packet (pkt);
358 } 435 }
359} 436}
360 437
361void 438void
362vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 439vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
396 else 473 else
397 c->recv_vpn_packet (pkt, rsi); 474 c->recv_vpn_packet (pkt, rsi);
398 } 475 }
399} 476}
400 477
401void 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
402vpn::ipv4_ev (io_watcher &w, short revents) 509vpn::ipv4_ev (ev::io &w, int revents)
403{ 510{
404 if (revents & (POLLIN | POLLERR)) 511 if (revents & EV_READ)
405 { 512 {
406 vpn_packet *pkt = new vpn_packet; 513 vpn_packet *pkt = new vpn_packet;
407 struct sockaddr_in sa; 514 struct sockaddr_in sa;
408 socklen_t sa_len = sizeof (sa); 515 socklen_t sa_len = sizeof (sa);
409 int len; 516 int len;
414 521
415 if (len > 0) 522 if (len > 0)
416 { 523 {
417 pkt->len = len; 524 pkt->len = len;
418 525
419 // 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
420 // this is slow, but...
421 pkt->skip_hdr (IP_OVERHEAD); 527 pkt->skip_hdr (IP_OVERHEAD);
422 528
423 recv_vpn_packet (pkt, si); 529 recv_vpn_packet (pkt, si);
424 } 530 }
425 else 531 else
428 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 534 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
429 } 535 }
430 536
431 delete pkt; 537 delete pkt;
432 } 538 }
433 else if (revents & POLLHUP)
434 {
435 // this cannot ;) happen on udp sockets
436 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
437 exit (1);
438 }
439 else 539 else
440 { 540 {
441 slog (L_ERR, 541 slog (L_ERR,
442 _("FATAL: unknown revents %08x in socket, terminating\n"), 542 _("FATAL: unknown revents %08x in socket, terminating\n"),
443 revents); 543 revents);
444 exit (1); 544 exit (EXIT_FAILURE);
445 } 545 }
446} 546}
447 547
448#if ENABLE_ICMP 548#if ENABLE_ICMP
449void 549inline void
450vpn::icmpv4_ev (io_watcher &w, short revents) 550vpn::icmpv4_ev (ev::io &w, int revents)
451{ 551{
452 if (revents & (POLLIN | POLLERR)) 552 if (revents & EV_READ)
453 { 553 {
454 vpn_packet *pkt = new vpn_packet; 554 vpn_packet *pkt = new vpn_packet;
455 struct sockaddr_in sa; 555 struct sockaddr_in sa;
456 socklen_t sa_len = sizeof (sa); 556 socklen_t sa_len = sizeof (sa);
457 int len; 557 int len;
482 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 582 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
483 } 583 }
484 584
485 delete pkt; 585 delete pkt;
486 } 586 }
487 else if (revents & POLLHUP)
488 {
489 // this cannot ;) happen on udp sockets
490 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
491 exit (1);
492 }
493 else 587 else
494 { 588 {
495 slog (L_ERR, 589 slog (L_ERR,
496 _("FATAL: unknown revents %08x in socket, terminating\n"), 590 _("FATAL: unknown revents %08x in socket, terminating\n"),
497 revents); 591 revents);
498 exit (1); 592 exit (EXIT_FAILURE);
499 } 593 }
500} 594}
501#endif 595#endif
502 596
503void 597inline void
504vpn::udpv4_ev (io_watcher &w, short revents) 598vpn::udpv4_ev (ev::io &w, int revents)
505{ 599{
506 if (revents & (POLLIN | POLLERR)) 600 if (revents & EV_READ)
507 { 601 {
508 vpn_packet *pkt = new vpn_packet; 602 vpn_packet *pkt = new vpn_packet;
509 struct sockaddr_in sa; 603 struct sockaddr_in sa;
510 socklen_t sa_len = sizeof (sa); 604 socklen_t sa_len = sizeof (sa);
511 int len; 605 int len;
526 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));
527 } 621 }
528 622
529 delete pkt; 623 delete pkt;
530 } 624 }
531 else if (revents & POLLHUP)
532 {
533 // this cannot ;) happen on udp sockets
534 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
535 exit (1);
536 }
537 else 625 else
538 { 626 {
539 slog (L_ERR, 627 slog (L_ERR,
540 _("FATAL: unknown revents %08x in socket, terminating\n"), 628 _("FATAL: unknown revents %08x in socket, terminating\n"),
541 revents); 629 revents);
542 exit (1); 630 exit (EXIT_FAILURE);
543 } 631 }
544} 632}
545 633
546void 634inline void
547vpn::tap_ev (io_watcher &w, short revents) 635vpn::tap_ev (ev::io &w, int revents)
548{ 636{
549 if (revents & POLLIN) 637 if (revents & EV_READ)
550 { 638 {
551 /* process data */ 639 /* process data */
552 tap_packet *pkt; 640 tap_packet *pkt;
553 641
554 pkt = tap->recv (); 642 pkt = tap->recv ();
561 int dst = mac2id (pkt->dst); 649 int dst = mac2id (pkt->dst);
562 int src = mac2id (pkt->src); 650 int src = mac2id (pkt->src);
563 651
564 if (src != THISNODE->id) 652 if (src != THISNODE->id)
565 { 653 {
566 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."));
567 exit (1); 655 exit (EXIT_FAILURE);
568 } 656 }
569 657
570 if (dst == THISNODE->id) 658 if (dst == THISNODE->id)
571 { 659 {
572 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."));
573 exit (1); 661 exit (EXIT_FAILURE);
574 } 662 }
575 663
576 if (dst > conns.size ()) 664 if (dst > conns.size ())
577 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);
578 else 666 else
579 inject_data_packet (pkt, dst); 667 inject_data_packet (pkt, dst);
580 } 668 }
581 669
582 delete pkt; 670 delete pkt;
583 } 671 }
584 else if (revents & (POLLHUP | POLLERR))
585 {
586 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
587 exit (1);
588 }
589 else 672 else
590 abort (); 673 abort ();
591} 674}
592 675
593void 676inline void
594vpn::event_cb (time_watcher &w) 677vpn::event_cb (ev::timer &w, int)
595{ 678{
596 if (events) 679 if (events)
597 { 680 {
598 if (events & EVENT_SHUTDOWN) 681 if (events & EVENT_SHUTDOWN)
599 { 682 {
600 slog (L_INFO, _("preparing shutdown...")); 683 slog (L_INFO, _("preparing shutdown..."));
601 684
602 shutdown_all (); 685 shutdown_all ();
603
604 remove_pid (pidfilename); 686 remove_pid (conf.pidfilename);
605
606 slog (L_INFO, _("terminating")); 687 slog (L_INFO, _("terminating"));
607 688 exit (EXIT_SUCCESS);
608 exit (0);
609 } 689 }
610 690
611 if (events & EVENT_RECONNECT) 691 if (events & EVENT_RECONNECT)
612 { 692 {
613 slog (L_INFO, _("forced reconnect")); 693 slog (L_INFO, _("forced reconnect"));
615 reconnect_all (); 695 reconnect_all ();
616 } 696 }
617 697
618 events = 0; 698 events = 0;
619 } 699 }
620
621 w.at = TSTAMP_CANCEL;
622} 700}
623 701
624void 702void
625vpn::shutdown_all () 703vpn::shutdown_all ()
626{ 704{
639 connection_init (); 717 connection_init ();
640 718
641 for (configuration::node_vector::iterator i = conf.nodes.begin (); 719 for (configuration::node_vector::iterator i = conf.nodes.begin ();
642 i != conf.nodes.end (); ++i) 720 i != conf.nodes.end (); ++i)
643 { 721 {
644 connection *conn = new connection (this); 722 connection *conn = new connection (this, *i);
645
646 conn->conf = *i;
647 conns.push_back (conn); 723 conns.push_back (conn);
648
649 conn->establish_connection (); 724 conn->establish_connection ();
650 } 725 }
651} 726}
652 727
653connection *vpn::find_router () 728connection *vpn::find_router ()
698} 773}
699 774
700void 775void
701vpn::dump_status () 776vpn::dump_status ()
702{ 777{
703 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 778 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
704 779
705 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 780 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
706 (*c)->dump_status (); 781 (*c)->dump_status ();
707 782
708 slog (L_NOTICE, _("END status dump")); 783 slog (L_NOTICE, _("END status dump"));
709} 784}
710 785
711vpn::vpn (void) 786vpn::vpn (void)
787{
712: event (this, &vpn::event_cb) 788 event .set<vpn, &vpn::event_cb > (this);
713, udpv4_ev_watcher (this, &vpn::udpv4_ev) 789 udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
714, ipv4_ev_watcher (this, &vpn::ipv4_ev) 790 ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
715#if ENABLE_TCP 791#if ENABLE_TCP
716, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 792 tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
717#endif 793#endif
718#if ENABLE_ICMP 794#if ENABLE_ICMP
719, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 795 icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
720#endif 796#endif
721, tap_ev_watcher (this, &vpn::tap_ev) 797#if ENABLE_DNS
722{ 798 dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
799#endif
800 tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
723} 801}
724 802
725vpn::~vpn () 803vpn::~vpn ()
726{ 804{
727} 805}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines