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.19 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.41 by pcg, Sun Dec 2 00:20:19 2007 UTC

1/* 1/*
2 vpn.C -- handle the protocol, encryption, handshaking etc. 2 vpn.C -- handle the protocol, encryption, handshaking etc.
3 Copyright (C) 2003 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2005 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>
40 42
41#include "connection.h" 43#include "connection.h"
42#include "util.h" 44#include "util.h"
43#include "vpn.h" 45#include "vpn.h"
44 46
47vpn network; // THE vpn (bad design...)
48
45///////////////////////////////////////////////////////////////////////////// 49/////////////////////////////////////////////////////////////////////////////
46 50
47const 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 ()
48{ 65{
49 // the tunnel device mtu should be the physical mtu - overhead 66 // the tunnel device mtu should be the physical mtu - overhead
50 // the tricky part is rounding to the cipher key blocksize 67 // the tricky part is rounding to the cipher key blocksize
51 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD; 68 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
52 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 69 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
53 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 70 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
54 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 71 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
55 72
56 char *env; 73 char *env;
57 asprintf (&env, "CONFBASE=%s", confbase); 74 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
58 putenv (env);
59 asprintf (&env, "NODENAME=%s", THISNODE->nodename);
60 putenv (env);
61 asprintf (&env, "NODEID=%d", THISNODE->id);
62 putenv (env);
63 asprintf (&env, "IFNAME=%s", tap->interface ()); 75 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
64 putenv (env); 76 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
77 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
65 asprintf (&env, "MTU=%d", mtu); 78 asprintf (&env, "MTU=%d", mtu); putenv (env);
66 putenv (env); 79 asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
67 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 80 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
68 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
69 THISNODE->id & 0xff);
70 putenv (env);
71 81
82 conns [THISNODE->id - 1]->script_init_env ("");
83
84 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
85 {
86 char ext[16];
87 snprintf (ext, 16, "_%d", (*c)->conf->id);
88 (*c)->script_init_env (ext);
89 }
90}
91
92const char *vpn::script_if_init ()
93{
94 script_init_env ();
95
96 return tap->if_up ();
97}
98
99const char *vpn::script_if_up ()
100{
101 script_init_env ();
102
103 char *filename;
104 asprintf (&filename,
105 "%s/%s",
106 confbase,
72 return ::conf.script_if_up ? ::conf.script_if_up : "if-up"; 107 ::conf.script_if_up ? ::conf.script_if_up : "if-up");
108
109 return filename;
73} 110}
74 111
75int 112int
76vpn::setup () 113vpn::setup ()
77{ 114{
115 ipv4_tos = -1;
78 ipv4_fd = -1; 116 ipv4_fd = -1;
79 117
80 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 118 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
81 { 119 {
82 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 120 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
83 121
84 if (ipv4_fd < 0) 122 if (ipv4_fd < 0)
85 return -1; 123 return -1;
86 124
87 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); 125 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
126 fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
88 127
89#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 128#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
90 // this I really consider a linux bug. I am neither connected 129 // this I really consider a linux bug. I am neither connected
91 // nor do I fragment myself. Linux still sets DF and doesn't 130 // nor do I fragment myself. Linux still sets DF and doesn't
92 // fragment for me sometimes. 131 // fragment for me sometimes.
99 sockinfo si (THISNODE, PROT_IPv4); 138 sockinfo si (THISNODE, PROT_IPv4);
100 139
101 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 140 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
102 { 141 {
103 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 142 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
104 exit (1); 143 exit (EXIT_FAILURE);
105 } 144 }
106 145
107 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 146 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
108 } 147 }
109 148
149 udpv4_tos = -1;
110 udpv4_fd = -1; 150 udpv4_fd = -1;
111 151
112 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 152 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
113 { 153 {
114 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 154 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
115 155
116 if (udpv4_fd < 0) 156 if (udpv4_fd < 0)
117 return -1; 157 return -1;
118 158
119 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK); 159 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
160 fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
120 161
121 // standard daemon practise... 162 // standard daemon practise...
122 { 163 {
123 int oval = 1; 164 int oval = 1;
124 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 165 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
137 sockinfo si (THISNODE, PROT_UDPv4); 178 sockinfo si (THISNODE, PROT_UDPv4);
138 179
139 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 180 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
140 { 181 {
141 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 182 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
142 exit (1); 183 exit (EXIT_FAILURE);
143 } 184 }
144 185
145 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 186 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
146 } 187 }
147 188
189 icmpv4_tos = -1;
148 icmpv4_fd = -1; 190 icmpv4_fd = -1;
149 191
150#if ENABLE_ICMP 192#if ENABLE_ICMP
151 if (THISNODE->protocols & PROT_ICMPv4) 193 if (THISNODE->protocols & PROT_ICMPv4)
152 { 194 {
153 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 195 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
154 196
155 if (icmpv4_fd < 0) 197 if (icmpv4_fd < 0)
156 return -1; 198 return -1;
157 199
158 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK); 200 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
201 fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
159 202
160#ifdef ICMP_FILTER 203#ifdef ICMP_FILTER
161 { 204 {
162 icmp_filter oval; 205 icmp_filter oval;
163 oval.data = 0xffffffff; 206 oval.data = 0xffffffff;
172 // this I really consider a linux bug. I am neither connected 215 // this I really consider a linux bug. I am neither connected
173 // nor do I fragment myself. Linux still sets DF and doesn't 216 // nor do I fragment myself. Linux still sets DF and doesn't
174 // fragment for me sometimes. 217 // fragment for me sometimes.
175 { 218 {
176 int oval = IP_PMTUDISC_DONT; 219 int oval = IP_PMTUDISC_DONT;
177 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 220 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
178 } 221 }
179#endif 222#endif
180 223
181 sockinfo si (THISNODE, PROT_ICMPv4); 224 sockinfo si (THISNODE, PROT_ICMPv4);
182 225
183 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 226 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
184 { 227 {
185 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); 228 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
186 exit (1); 229 exit (EXIT_FAILURE);
187 } 230 }
188 231
189 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); 232 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
190 } 233 }
191#endif 234#endif
192 235
193 tcpv4_fd = -1; 236 tcpv4_fd = -1;
194 237
199 242
200 if (tcpv4_fd < 0) 243 if (tcpv4_fd < 0)
201 return -1; 244 return -1;
202 245
203 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK); 246 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
247 fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
204 248
205 // standard daemon practise... 249 // standard daemon practise...
206 { 250 {
207 int oval = 1; 251 int oval = 1;
208 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 252 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
211 sockinfo si (THISNODE, PROT_TCPv4); 255 sockinfo si (THISNODE, PROT_TCPv4);
212 256
213 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 257 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
214 { 258 {
215 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 259 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
216 exit (1); 260 exit (EXIT_FAILURE);
217 } 261 }
218 262
219 if (listen (tcpv4_fd, 5)) 263 if (listen (tcpv4_fd, 5))
220 { 264 {
221 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 265 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
222 exit (1); 266 exit (EXIT_FAILURE);
267 }
268
269 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
270 }
271#endif
272
273 dnsv4_tos = -1;
274 dnsv4_fd = -1;
275
276#if ENABLE_DNS
277 if (THISNODE->protocols & PROT_DNSv4)
278 {
279 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
280
281 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
282
283 if (dnsv4_fd < 0)
284 return -1;
285
286 fcntl (dnsv4_fd, F_SETFL, O_NONBLOCK);
287 fcntl (dnsv4_fd, F_SETFD, FD_CLOEXEC);
288
289# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
290 // this I really consider a linux bug. I am neither connected
291 // nor do I fragment myself. Linux still sets DF and doesn't
292 // fragment for me sometimes.
293 {
294 int oval = IP_PMTUDISC_DONT;
295 setsockopt (dnsv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
223 } 296 }
224
225 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
226 }
227#endif 297# endif
298
299 // standard daemon practise...
300 {
301 int oval = 1;
302 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
303 }
304
305 sockinfo si (THISNODE->dns_hostname,
306 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
307 PROT_DNSv4);
308
309 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
310 {
311 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
312 exit (EXIT_FAILURE);
313 }
314
315 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
316 }
317#endif
318
319 /////////////////////////////////////////////////////////////////////////////
320
321 reconnect_all ();
322
323 /////////////////////////////////////////////////////////////////////////////
228 324
229 tap = new tap_device (); 325 tap = new tap_device ();
230 if (!tap) //D this, of course, never catches 326 if (!tap) //D this, of course, never catches
231 { 327 {
232 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 328 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
233 exit (1); 329 exit (EXIT_FAILURE);
234 } 330 }
235 331
332 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
333
334 if (tap->if_up () &&
335 !run_script (run_script_cb (this, &vpn::script_if_init), true))
336 {
337 slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
338 tap->if_up ());
339 exit (EXIT_FAILURE);
340 }
341
236 run_script (run_script_cb (this, &vpn::script_if_up), true); 342 if (!run_script (run_script_cb (this, &vpn::script_if_up), true))
343 {
344 slog (L_ERR, _("if-up command execution failed, exiting."));
345 exit (EXIT_FAILURE);
346 }
237 347
238 tap_ev_watcher.start (tap->fd, POLLIN); 348 tap_ev_watcher.start (tap->fd, EV_READ);
239
240 reconnect_all ();
241 349
242 return 0; 350 return 0;
243}
244
245// send a vpn packet out to other hosts
246bool
247vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
248{
249 switch (si.prot)
250 {
251 case PROT_IPv4:
252 return send_ipv4_packet (pkt, si, tos);
253
254 case PROT_UDPv4:
255 return send_udpv4_packet (pkt, si, tos);
256
257#if ENABLE_TCP
258 case PROT_TCPv4:
259 return send_tcpv4_packet (pkt, si, tos);
260#endif
261
262#if ENABLE_ICMP
263 case PROT_ICMPv4:
264 return send_icmpv4_packet (pkt, si, tos);
265#endif
266
267 default:
268 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
269 return false;
270 }
271} 351}
272 352
273bool 353bool
274vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 354vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
275{ 355{
276#if defined(SOL_IP) && defined(IP_TOS) 356 set_tos (ipv4_fd, ipv4_tos, tos);
277 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
278#endif
279 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 357 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
280 358
281 return true; 359 return true;
282} 360}
283 361
306 384
307#if ENABLE_ICMP 385#if ENABLE_ICMP
308bool 386bool
309vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 387vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
310{ 388{
311#if defined(SOL_IP) && defined(IP_TOS)
312 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
313#endif
314
315 pkt->unshift_hdr (4); 389 pkt->unshift_hdr (4);
316 390
317 icmp_header *hdr = (icmp_header *)&((*pkt)[0]); 391 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
318 hdr->type = ::conf.icmp_type; 392 hdr->type = ::conf.icmp_type;
319 hdr->code = 255; 393 hdr->code = 255;
320 hdr->checksum = 0; 394 hdr->checksum = 0;
321 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 395 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
322 396
397 set_tos (icmpv4_fd, icmpv4_tos, tos);
323 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 398 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
324 399
325 return true; 400 return true;
326} 401}
327#endif 402#endif
328 403
329bool 404bool
330vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 405vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
331{ 406{
332#if defined(SOL_IP) && defined(IP_TOS) 407 set_tos (udpv4_fd, udpv4_tos, tos);
333 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
334#endif
335 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 408 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
336 409
337 return true; 410 return true;
338} 411}
339 412
394 else 467 else
395 c->recv_vpn_packet (pkt, rsi); 468 c->recv_vpn_packet (pkt, rsi);
396 } 469 }
397} 470}
398 471
472bool
473vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
474{
475 switch (si.prot)
476 {
477 case PROT_IPv4:
478 return send_ipv4_packet (pkt, si, tos);
479
480 case PROT_UDPv4:
481 return send_udpv4_packet (pkt, si, tos);
482
483#if ENABLE_TCP
484 case PROT_TCPv4:
485 return send_tcpv4_packet (pkt, si, tos);
486#endif
487#if ENABLE_ICMP
488 case PROT_ICMPv4:
489 return send_icmpv4_packet (pkt, si, tos);
490#endif
491#if ENABLE_DNS
492 case PROT_DNSv4:
493 return send_dnsv4_packet (pkt, si, tos);
494#endif
495 default:
496 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
497 }
498
499 return false;
500}
501
399void 502void
400vpn::ipv4_ev (io_watcher &w, short revents) 503vpn::ipv4_ev (ev::io &w, int revents)
401{ 504{
402 if (revents & (POLLIN | POLLERR)) 505 if (revents & EV_READ)
403 { 506 {
404 vpn_packet *pkt = new vpn_packet; 507 vpn_packet *pkt = new vpn_packet;
405 struct sockaddr_in sa; 508 struct sockaddr_in sa;
406 socklen_t sa_len = sizeof (sa); 509 socklen_t sa_len = sizeof (sa);
407 int len; 510 int len;
412 515
413 if (len > 0) 516 if (len > 0)
414 { 517 {
415 pkt->len = len; 518 pkt->len = len;
416 519
417 // raw sockets deliver the ipv4, but don't expect it on sends 520 // raw sockets deliver the ipv4 header, but don't expect it on sends
418 // this is slow, but...
419 pkt->skip_hdr (IP_OVERHEAD); 521 pkt->skip_hdr (IP_OVERHEAD);
420 522
421 recv_vpn_packet (pkt, si); 523 recv_vpn_packet (pkt, si);
422 } 524 }
423 else 525 else
426 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 528 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
427 } 529 }
428 530
429 delete pkt; 531 delete pkt;
430 } 532 }
431 else if (revents & POLLHUP)
432 {
433 // this cannot ;) happen on udp sockets
434 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
435 exit (1);
436 }
437 else 533 else
438 { 534 {
439 slog (L_ERR, 535 slog (L_ERR,
440 _("FATAL: unknown revents %08x in socket, terminating\n"), 536 _("FATAL: unknown revents %08x in socket, terminating\n"),
441 revents); 537 revents);
442 exit (1); 538 exit (EXIT_FAILURE);
443 } 539 }
444} 540}
445 541
446#if ENABLE_ICMP 542#if ENABLE_ICMP
447void 543void
448vpn::icmpv4_ev (io_watcher &w, short revents) 544vpn::icmpv4_ev (ev::io &w, int revents)
449{ 545{
450 if (revents & (POLLIN | POLLERR)) 546 if (revents & EV_READ)
451 { 547 {
452 vpn_packet *pkt = new vpn_packet; 548 vpn_packet *pkt = new vpn_packet;
453 struct sockaddr_in sa; 549 struct sockaddr_in sa;
454 socklen_t sa_len = sizeof (sa); 550 socklen_t sa_len = sizeof (sa);
455 int len; 551 int len;
480 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 576 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
481 } 577 }
482 578
483 delete pkt; 579 delete pkt;
484 } 580 }
485 else if (revents & POLLHUP)
486 {
487 // this cannot ;) happen on udp sockets
488 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
489 exit (1);
490 }
491 else 581 else
492 { 582 {
493 slog (L_ERR, 583 slog (L_ERR,
494 _("FATAL: unknown revents %08x in socket, terminating\n"), 584 _("FATAL: unknown revents %08x in socket, terminating\n"),
495 revents); 585 revents);
496 exit (1); 586 exit (EXIT_FAILURE);
497 } 587 }
498} 588}
499#endif 589#endif
500 590
501void 591void
502vpn::udpv4_ev (io_watcher &w, short revents) 592vpn::udpv4_ev (ev::io &w, int revents)
503{ 593{
504 if (revents & (POLLIN | POLLERR)) 594 if (revents & EV_READ)
505 { 595 {
506 vpn_packet *pkt = new vpn_packet; 596 vpn_packet *pkt = new vpn_packet;
507 struct sockaddr_in sa; 597 struct sockaddr_in sa;
508 socklen_t sa_len = sizeof (sa); 598 socklen_t sa_len = sizeof (sa);
509 int len; 599 int len;
524 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 614 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
525 } 615 }
526 616
527 delete pkt; 617 delete pkt;
528 } 618 }
529 else if (revents & POLLHUP)
530 {
531 // this cannot ;) happen on udp sockets
532 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
533 exit (1);
534 }
535 else 619 else
536 { 620 {
537 slog (L_ERR, 621 slog (L_ERR,
538 _("FATAL: unknown revents %08x in socket, terminating\n"), 622 _("FATAL: unknown revents %08x in socket, terminating\n"),
539 revents); 623 revents);
540 exit (1); 624 exit (EXIT_FAILURE);
541 } 625 }
542} 626}
543 627
544void 628void
545vpn::tap_ev (io_watcher &w, short revents) 629vpn::tap_ev (ev::io &w, int revents)
546{ 630{
547 if (revents & POLLIN) 631 if (revents & EV_READ)
548 { 632 {
549 /* process data */ 633 /* process data */
550 tap_packet *pkt; 634 tap_packet *pkt;
551 635
552 pkt = tap->recv (); 636 pkt = tap->recv ();
559 int dst = mac2id (pkt->dst); 643 int dst = mac2id (pkt->dst);
560 int src = mac2id (pkt->src); 644 int src = mac2id (pkt->src);
561 645
562 if (src != THISNODE->id) 646 if (src != THISNODE->id)
563 { 647 {
564 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting.")); 648 slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
565 exit (1); 649 exit (EXIT_FAILURE);
566 } 650 }
567 651
568 if (dst == THISNODE->id) 652 if (dst == THISNODE->id)
569 { 653 {
570 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting.")); 654 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
571 exit (1); 655 exit (EXIT_FAILURE);
572 } 656 }
573 657
574 if (dst > conns.size ()) 658 if (dst > conns.size ())
575 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst); 659 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
576 else 660 else
577 inject_data_packet (pkt, dst); 661 inject_data_packet (pkt, dst);
578 } 662 }
579 663
580 delete pkt; 664 delete pkt;
581 } 665 }
582 else if (revents & (POLLHUP | POLLERR))
583 {
584 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
585 exit (1);
586 }
587 else 666 else
588 abort (); 667 abort ();
589} 668}
590 669
591void 670void
592vpn::event_cb (time_watcher &w) 671vpn::event_cb (ev::timer &w, int)
593{ 672{
594 if (events) 673 if (events)
595 { 674 {
596 if (events & EVENT_SHUTDOWN) 675 if (events & EVENT_SHUTDOWN)
597 { 676 {
598 slog (L_INFO, _("preparing shutdown...")); 677 slog (L_INFO, _("preparing shutdown..."));
599 678
600 shutdown_all (); 679 shutdown_all ();
601
602 remove_pid (pidfilename); 680 remove_pid (conf.pidfilename);
603
604 slog (L_INFO, _("terminating")); 681 slog (L_INFO, _("terminating"));
605 682 exit (EXIT_SUCCESS);
606 exit (0);
607 } 683 }
608 684
609 if (events & EVENT_RECONNECT) 685 if (events & EVENT_RECONNECT)
610 { 686 {
611 slog (L_INFO, _("forced reconnect")); 687 slog (L_INFO, _("forced reconnect"));
613 reconnect_all (); 689 reconnect_all ();
614 } 690 }
615 691
616 events = 0; 692 events = 0;
617 } 693 }
618
619 w.at = TSTAMP_CANCEL;
620} 694}
621 695
622void 696void
623vpn::shutdown_all () 697vpn::shutdown_all ()
624{ 698{
637 connection_init (); 711 connection_init ();
638 712
639 for (configuration::node_vector::iterator i = conf.nodes.begin (); 713 for (configuration::node_vector::iterator i = conf.nodes.begin ();
640 i != conf.nodes.end (); ++i) 714 i != conf.nodes.end (); ++i)
641 { 715 {
642 connection *conn = new connection (this); 716 connection *conn = new connection (this, *i);
643
644 conn->conf = *i;
645 conns.push_back (conn); 717 conns.push_back (conn);
646
647 conn->establish_connection (); 718 conn->establish_connection ();
648 } 719 }
649} 720}
650 721
651connection *vpn::find_router () 722connection *vpn::find_router ()
696} 767}
697 768
698void 769void
699vpn::dump_status () 770vpn::dump_status ()
700{ 771{
701 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 772 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
702 773
703 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 774 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
704 (*c)->dump_status (); 775 (*c)->dump_status ();
705 776
706 slog (L_NOTICE, _("END status dump")); 777 slog (L_NOTICE, _("END status dump"));
714, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 785, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
715#endif 786#endif
716#if ENABLE_ICMP 787#if ENABLE_ICMP
717, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 788, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
718#endif 789#endif
790#if ENABLE_DNS
791, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
792#endif
719, tap_ev_watcher (this, &vpn::tap_ev) 793, tap_ev_watcher (this, &vpn::tap_ev)
720{ 794{
721} 795}
722 796
723vpn::~vpn () 797vpn::~vpn ()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines