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.42 by pcg, Sun Dec 2 00:54:52 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-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
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,
74 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;
75} 110}
76 111
77int 112int
78vpn::setup () 113vpn::setup ()
79{ 114{
115 ipv4_tos = -1;
80 ipv4_fd = -1; 116 ipv4_fd = -1;
81 117
82 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 118 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
83 { 119 {
84 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 120 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
85 121
86 if (ipv4_fd < 0) 122 if (ipv4_fd < 0)
87 return -1; 123 return -1;
88 124
89 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); 125 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
126 fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
90 127
91#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 128#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
92 // this I really consider a linux bug. I am neither connected 129 // this I really consider a linux bug. I am neither connected
93 // 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
94 // fragment for me sometimes. 131 // fragment for me sometimes.
101 sockinfo si (THISNODE, PROT_IPv4); 138 sockinfo si (THISNODE, PROT_IPv4);
102 139
103 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 140 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
104 { 141 {
105 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));
106 exit (1); 143 exit (EXIT_FAILURE);
107 } 144 }
108 145
109 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 146 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
110 } 147 }
111 148
149 udpv4_tos = -1;
112 udpv4_fd = -1; 150 udpv4_fd = -1;
113 151
114 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 152 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
115 { 153 {
116 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 154 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
117 155
118 if (udpv4_fd < 0) 156 if (udpv4_fd < 0)
119 return -1; 157 return -1;
120 158
121 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK); 159 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
160 fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
122 161
123 // standard daemon practise... 162 // standard daemon practise...
124 { 163 {
125 int oval = 1; 164 int oval = 1;
126 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 165 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
139 sockinfo si (THISNODE, PROT_UDPv4); 178 sockinfo si (THISNODE, PROT_UDPv4);
140 179
141 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 180 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
142 { 181 {
143 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));
144 exit (1); 183 exit (EXIT_FAILURE);
145 } 184 }
146 185
147 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 186 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
148 } 187 }
149 188
189 icmpv4_tos = -1;
150 icmpv4_fd = -1; 190 icmpv4_fd = -1;
151 191
152#if ENABLE_ICMP 192#if ENABLE_ICMP
153 if (THISNODE->protocols & PROT_ICMPv4) 193 if (THISNODE->protocols & PROT_ICMPv4)
154 { 194 {
155 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 195 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
156 196
157 if (icmpv4_fd < 0) 197 if (icmpv4_fd < 0)
158 return -1; 198 return -1;
159 199
160 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK); 200 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
201 fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
161 202
162#ifdef ICMP_FILTER 203#ifdef ICMP_FILTER
163 { 204 {
164 icmp_filter oval; 205 icmp_filter oval;
165 oval.data = 0xffffffff; 206 oval.data = 0xffffffff;
174 // this I really consider a linux bug. I am neither connected 215 // this I really consider a linux bug. I am neither connected
175 // 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
176 // fragment for me sometimes. 217 // fragment for me sometimes.
177 { 218 {
178 int oval = IP_PMTUDISC_DONT; 219 int oval = IP_PMTUDISC_DONT;
179 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 220 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
180 } 221 }
181#endif 222#endif
182 223
183 sockinfo si (THISNODE, PROT_ICMPv4); 224 sockinfo si (THISNODE, PROT_ICMPv4);
184 225
185 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 226 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
186 { 227 {
187 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));
188 exit (1); 229 exit (EXIT_FAILURE);
189 } 230 }
190 231
191 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); 232 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
192 } 233 }
193#endif 234#endif
194 235
195 tcpv4_fd = -1; 236 tcpv4_fd = -1;
196 237
201 242
202 if (tcpv4_fd < 0) 243 if (tcpv4_fd < 0)
203 return -1; 244 return -1;
204 245
205 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK); 246 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
247 fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
206 248
207 // standard daemon practise... 249 // standard daemon practise...
208 { 250 {
209 int oval = 1; 251 int oval = 1;
210 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 252 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
213 sockinfo si (THISNODE, PROT_TCPv4); 255 sockinfo si (THISNODE, PROT_TCPv4);
214 256
215 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 257 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
216 { 258 {
217 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));
218 exit (1); 260 exit (EXIT_FAILURE);
219 } 261 }
220 262
221 if (listen (tcpv4_fd, 5)) 263 if (listen (tcpv4_fd, 5))
222 { 264 {
223 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));
224 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);
225 } 296 }
226
227 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
228 }
229#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 /////////////////////////////////////////////////////////////////////////////
230 324
231 tap = new tap_device (); 325 tap = new tap_device ();
232 if (!tap) //D this, of course, never catches 326 if (!tap) //D this, of course, never catches
233 { 327 {
234 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 328 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
235 exit (1); 329 exit (EXIT_FAILURE);
236 } 330 }
237 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
238 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 }
239 347
240 tap_ev_watcher.start (tap->fd, POLLIN); 348 tap_ev_watcher.start (tap->fd, EV_READ);
241
242 reconnect_all ();
243 349
244 return 0; 350 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} 351}
274 352
275bool 353bool
276vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 354vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
277{ 355{
278#if defined(SOL_IP) && defined(IP_TOS) 356 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 ()); 357 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
282 358
283 return true; 359 return true;
284} 360}
285 361
308 384
309#if ENABLE_ICMP 385#if ENABLE_ICMP
310bool 386bool
311vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 387vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
312{ 388{
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); 389 pkt->unshift_hdr (4);
318 390
319 icmp_header *hdr = (icmp_header *)&((*pkt)[0]); 391 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
320 hdr->type = ::conf.icmp_type; 392 hdr->type = ::conf.icmp_type;
321 hdr->code = 255; 393 hdr->code = 255;
322 hdr->checksum = 0; 394 hdr->checksum = 0;
323 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 395 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
324 396
397 set_tos (icmpv4_fd, icmpv4_tos, tos);
325 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 ());
326 399
327 return true; 400 return true;
328} 401}
329#endif 402#endif
330 403
331bool 404bool
332vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 405vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
333{ 406{
334#if defined(SOL_IP) && defined(IP_TOS) 407 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 ()); 408 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
338 409
339 return true; 410 return true;
340} 411}
341 412
396 else 467 else
397 c->recv_vpn_packet (pkt, rsi); 468 c->recv_vpn_packet (pkt, rsi);
398 } 469 }
399} 470}
400 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
401void 502void
402vpn::ipv4_ev (io_watcher &w, short revents) 503vpn::ipv4_ev (ev::io &w, int revents)
403{ 504{
404 if (revents & (POLLIN | POLLERR)) 505 if (revents & EV_READ)
405 { 506 {
406 vpn_packet *pkt = new vpn_packet; 507 vpn_packet *pkt = new vpn_packet;
407 struct sockaddr_in sa; 508 struct sockaddr_in sa;
408 socklen_t sa_len = sizeof (sa); 509 socklen_t sa_len = sizeof (sa);
409 int len; 510 int len;
414 515
415 if (len > 0) 516 if (len > 0)
416 { 517 {
417 pkt->len = len; 518 pkt->len = len;
418 519
419 // 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
420 // this is slow, but...
421 pkt->skip_hdr (IP_OVERHEAD); 521 pkt->skip_hdr (IP_OVERHEAD);
422 522
423 recv_vpn_packet (pkt, si); 523 recv_vpn_packet (pkt, si);
424 } 524 }
425 else 525 else
428 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 528 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
429 } 529 }
430 530
431 delete pkt; 531 delete pkt;
432 } 532 }
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 533 else
440 { 534 {
441 slog (L_ERR, 535 slog (L_ERR,
442 _("FATAL: unknown revents %08x in socket, terminating\n"), 536 _("FATAL: unknown revents %08x in socket, terminating\n"),
443 revents); 537 revents);
444 exit (1); 538 exit (EXIT_FAILURE);
445 } 539 }
446} 540}
447 541
448#if ENABLE_ICMP 542#if ENABLE_ICMP
449void 543void
450vpn::icmpv4_ev (io_watcher &w, short revents) 544vpn::icmpv4_ev (ev::io &w, int revents)
451{ 545{
452 if (revents & (POLLIN | POLLERR)) 546 if (revents & EV_READ)
453 { 547 {
454 vpn_packet *pkt = new vpn_packet; 548 vpn_packet *pkt = new vpn_packet;
455 struct sockaddr_in sa; 549 struct sockaddr_in sa;
456 socklen_t sa_len = sizeof (sa); 550 socklen_t sa_len = sizeof (sa);
457 int len; 551 int len;
482 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 576 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
483 } 577 }
484 578
485 delete pkt; 579 delete pkt;
486 } 580 }
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 581 else
494 { 582 {
495 slog (L_ERR, 583 slog (L_ERR,
496 _("FATAL: unknown revents %08x in socket, terminating\n"), 584 _("FATAL: unknown revents %08x in socket, terminating\n"),
497 revents); 585 revents);
498 exit (1); 586 exit (EXIT_FAILURE);
499 } 587 }
500} 588}
501#endif 589#endif
502 590
503void 591void
504vpn::udpv4_ev (io_watcher &w, short revents) 592vpn::udpv4_ev (ev::io &w, int revents)
505{ 593{
506 if (revents & (POLLIN | POLLERR)) 594 if (revents & EV_READ)
507 { 595 {
508 vpn_packet *pkt = new vpn_packet; 596 vpn_packet *pkt = new vpn_packet;
509 struct sockaddr_in sa; 597 struct sockaddr_in sa;
510 socklen_t sa_len = sizeof (sa); 598 socklen_t sa_len = sizeof (sa);
511 int len; 599 int len;
526 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));
527 } 615 }
528 616
529 delete pkt; 617 delete pkt;
530 } 618 }
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 619 else
538 { 620 {
539 slog (L_ERR, 621 slog (L_ERR,
540 _("FATAL: unknown revents %08x in socket, terminating\n"), 622 _("FATAL: unknown revents %08x in socket, terminating\n"),
541 revents); 623 revents);
542 exit (1); 624 exit (EXIT_FAILURE);
543 } 625 }
544} 626}
545 627
546void 628void
547vpn::tap_ev (io_watcher &w, short revents) 629vpn::tap_ev (ev::io &w, int revents)
548{ 630{
549 if (revents & POLLIN) 631 if (revents & EV_READ)
550 { 632 {
551 /* process data */ 633 /* process data */
552 tap_packet *pkt; 634 tap_packet *pkt;
553 635
554 pkt = tap->recv (); 636 pkt = tap->recv ();
561 int dst = mac2id (pkt->dst); 643 int dst = mac2id (pkt->dst);
562 int src = mac2id (pkt->src); 644 int src = mac2id (pkt->src);
563 645
564 if (src != THISNODE->id) 646 if (src != THISNODE->id)
565 { 647 {
566 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."));
567 exit (1); 649 exit (EXIT_FAILURE);
568 } 650 }
569 651
570 if (dst == THISNODE->id) 652 if (dst == THISNODE->id)
571 { 653 {
572 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."));
573 exit (1); 655 exit (EXIT_FAILURE);
574 } 656 }
575 657
576 if (dst > conns.size ()) 658 if (dst > conns.size ())
577 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);
578 else 660 else
579 inject_data_packet (pkt, dst); 661 inject_data_packet (pkt, dst);
580 } 662 }
581 663
582 delete pkt; 664 delete pkt;
583 } 665 }
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 666 else
590 abort (); 667 abort ();
591} 668}
592 669
593void 670void
594vpn::event_cb (time_watcher &w) 671vpn::event_cb (ev::timer &w, int)
595{ 672{
596 if (events) 673 if (events)
597 { 674 {
598 if (events & EVENT_SHUTDOWN) 675 if (events & EVENT_SHUTDOWN)
599 { 676 {
600 slog (L_INFO, _("preparing shutdown...")); 677 slog (L_INFO, _("preparing shutdown..."));
601 678
602 shutdown_all (); 679 shutdown_all ();
603
604 remove_pid (pidfilename); 680 remove_pid (conf.pidfilename);
605
606 slog (L_INFO, _("terminating")); 681 slog (L_INFO, _("terminating"));
607 682 exit (EXIT_SUCCESS);
608 exit (0);
609 } 683 }
610 684
611 if (events & EVENT_RECONNECT) 685 if (events & EVENT_RECONNECT)
612 { 686 {
613 slog (L_INFO, _("forced reconnect")); 687 slog (L_INFO, _("forced reconnect"));
615 reconnect_all (); 689 reconnect_all ();
616 } 690 }
617 691
618 events = 0; 692 events = 0;
619 } 693 }
620
621 w.at = TSTAMP_CANCEL;
622} 694}
623 695
624void 696void
625vpn::shutdown_all () 697vpn::shutdown_all ()
626{ 698{
639 connection_init (); 711 connection_init ();
640 712
641 for (configuration::node_vector::iterator i = conf.nodes.begin (); 713 for (configuration::node_vector::iterator i = conf.nodes.begin ();
642 i != conf.nodes.end (); ++i) 714 i != conf.nodes.end (); ++i)
643 { 715 {
644 connection *conn = new connection (this); 716 connection *conn = new connection (this, *i);
645
646 conn->conf = *i;
647 conns.push_back (conn); 717 conns.push_back (conn);
648
649 conn->establish_connection (); 718 conn->establish_connection ();
650 } 719 }
651} 720}
652 721
653connection *vpn::find_router () 722connection *vpn::find_router ()
698} 767}
699 768
700void 769void
701vpn::dump_status () 770vpn::dump_status ()
702{ 771{
703 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 772 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
704 773
705 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 774 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
706 (*c)->dump_status (); 775 (*c)->dump_status ();
707 776
708 slog (L_NOTICE, _("END status dump")); 777 slog (L_NOTICE, _("END status dump"));
716, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 785, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
717#endif 786#endif
718#if ENABLE_ICMP 787#if ENABLE_ICMP
719, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 788, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
720#endif 789#endif
790#if ENABLE_DNS
791, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
792#endif
721, tap_ev_watcher (this, &vpn::tap_ev) 793, tap_ev_watcher (this, &vpn::tap_ev)
722{ 794{
723} 795}
724 796
725vpn::~vpn () 797vpn::~vpn ()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines