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.35 by pcg, Fri Apr 8 16:12:49 2005 UTC vs.
Revision 1.59 by root, Fri Sep 16 17:59:46 2011 UTC

1/* 1/*
2 vpn.C -- handle the protocol, encryption, handshaking etc. 2 vpn.C -- handle the protocol, encryption, handshaking etc.
3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008,2010,2011 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 Public License for more details.
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22#include "config.h" 32#include "config.h"
23 33
24#include <list> 34#include <list>
… …
46 56
47vpn network; // THE vpn (bad design...) 57vpn network; // THE vpn (bad design...)
48 58
49///////////////////////////////////////////////////////////////////////////// 59/////////////////////////////////////////////////////////////////////////////
50 60
61static void inline
62set_tos (int fd, int &tos_prev, int tos)
63{
64#if defined(SOL_IP) && defined(IP_TOS)
65 if (tos_prev == tos)
66 return;
67
68 tos_prev = tos;
69 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
70#endif
71}
72
51void 73void
52vpn::script_init_env () 74vpn::script_init_env ()
53{ 75{
54 // the tunnel device mtu should be the physical mtu - overhead 76 // the tunnel device mtu should be the physical mtu - overhead
55 // the tricky part is rounding to the cipher key blocksize 77 // the tricky part is rounding to the cipher key blocksize
… …
75 snprintf (ext, 16, "_%d", (*c)->conf->id); 97 snprintf (ext, 16, "_%d", (*c)->conf->id);
76 (*c)->script_init_env (ext); 98 (*c)->script_init_env (ext);
77 } 99 }
78} 100}
79 101
102inline const char *
80const char *vpn::script_if_init () 103vpn::script_if_init ()
81{ 104{
82 script_init_env (); 105 script_init_env ();
83 106
84 return tap->if_up (); 107 return tap->if_up ();
85} 108}
86 109
110inline const char *
87const char *vpn::script_if_up () 111vpn::script_if_up ()
88{ 112{
89 script_init_env (); 113 script_init_env ();
90 114
91 char *filename; 115 char *filename;
92 asprintf (&filename, 116 asprintf (&filename,
… …
96 120
97 return filename; 121 return filename;
98} 122}
99 123
100int 124int
125vpn::setup_socket (u8 prot, int family, int type, int proto)
126{
127 int fd = socket (family, type, proto);
128
129 if (fd < 0)
130 {
131 slog (L_ERR, _("unable to create %s socket: %s."), strprotocol (prot), strerror (errno));
132 return fd;
133 }
134
135 fcntl (fd, F_SETFL, O_NONBLOCK);
136 fcntl (fd, F_SETFD, FD_CLOEXEC);
137
138#ifdef SO_MARK
139 if (::conf.nfmark)
140 if (setsockopt (fd, SOL_SOCKET, SO_MARK, &::conf.nfmark, sizeof ::conf.nfmark))
141 slog (L_WARN, _("unable to set nfmark on %s socket: %s"), strprotocol (prot), strerror (errno));
142#endif
143
144 return fd;
145}
146
147int
101vpn::setup () 148vpn::setup ()
102{ 149{
150 int success = 0;
151
152 ipv4_tos = -1;
103 ipv4_fd = -1; 153 ipv4_fd = -1;
104 154
105 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 155 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
106 { 156 {
107 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 157 ipv4_fd = setup_socket (PROT_IPv4, PF_INET, SOCK_RAW, ::conf.ip_proto);
108 158
109 if (ipv4_fd < 0) 159 if (ipv4_fd < 0)
110 return -1; 160 return -1;
111
112 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
113 161
114#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 162#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
115 // this I really consider a linux bug. I am neither connected 163 // this I really consider a linux bug. I am neither connected
116 // nor do I fragment myself. Linux still sets DF and doesn't 164 // nor do I fragment myself. Linux still sets DF and doesn't
117 // fragment for me sometimes. 165 // fragment for me sometimes.
… …
123 171
124 sockinfo si (THISNODE, PROT_IPv4); 172 sockinfo si (THISNODE, PROT_IPv4);
125 173
126 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 174 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
127 { 175 {
128 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 176 slog (L_ERR, _("can't bind ipv4 socket on %s: %s, exiting."), (const char *)si, strerror (errno));
129 exit (EXIT_FAILURE); 177 return -1;
130 } 178 }
131 179
132 ipv4_ev_watcher.start (ipv4_fd, EVENT_READ); 180 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
181 ++success;
133 } 182 }
183 else
184 THISNODE->protocols &= ~PROT_IPv4;
134 185
186 udpv4_tos = -1;
135 udpv4_fd = -1; 187 udpv4_fd = -1;
136 188
137 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 189 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
138 { 190 {
139 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 191 udpv4_fd = setup_socket (PROT_UDPv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
140 192
141 if (udpv4_fd < 0) 193 if (udpv4_fd < 0)
142 return -1; 194 return -1;
143
144 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
145 195
146 // standard daemon practise... 196 // standard daemon practise...
147 { 197 {
148 int oval = 1; 198 int oval = 1;
149 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 199 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
161 211
162 sockinfo si (THISNODE, PROT_UDPv4); 212 sockinfo si (THISNODE, PROT_UDPv4);
163 213
164 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 214 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
165 { 215 {
166 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 216 slog (L_ERR, _("can't bind udpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
167 exit (EXIT_FAILURE); 217 return -1;
168 } 218 }
169 219
170 udpv4_ev_watcher.start (udpv4_fd, EVENT_READ); 220 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
221 ++success;
171 } 222 }
223 else
224 THISNODE->protocols &= ~PROT_UDPv4;
172 225
226 icmpv4_tos = -1;
173 icmpv4_fd = -1; 227 icmpv4_fd = -1;
174 228
175#if ENABLE_ICMP 229#if ENABLE_ICMP
176 if (THISNODE->protocols & PROT_ICMPv4) 230 if (THISNODE->protocols & PROT_ICMPv4)
177 { 231 {
178 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 232 icmpv4_fd = setup_socket (PROT_ICMPv4, PF_INET, SOCK_RAW, IPPROTO_ICMP);
179 233
180 if (icmpv4_fd < 0) 234 if (icmpv4_fd < 0)
181 return -1; 235 return -1;
182
183 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
184 236
185#ifdef ICMP_FILTER 237#ifdef ICMP_FILTER
186 { 238 {
187 icmp_filter oval; 239 icmp_filter oval;
188 oval.data = 0xffffffff; 240 oval.data = 0xffffffff;
… …
197 // this I really consider a linux bug. I am neither connected 249 // this I really consider a linux bug. I am neither connected
198 // nor do I fragment myself. Linux still sets DF and doesn't 250 // nor do I fragment myself. Linux still sets DF and doesn't
199 // fragment for me sometimes. 251 // fragment for me sometimes.
200 { 252 {
201 int oval = IP_PMTUDISC_DONT; 253 int oval = IP_PMTUDISC_DONT;
202 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 254 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
203 } 255 }
204#endif 256#endif
205 257
206 sockinfo si (THISNODE, PROT_ICMPv4); 258 sockinfo si (THISNODE, PROT_ICMPv4);
207 259
208 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 260 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
209 { 261 {
210 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); 262 slog (L_ERR, _("can't bind icmpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
211 exit (EXIT_FAILURE); 263 return -1;
212 } 264 }
213 265
214 icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ); 266 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
267 ++success;
215 } 268 }
216#endif 269#endif
217 270
218 tcpv4_fd = -1; 271 tcpv4_fd = -1;
219 272
220#if ENABLE_TCP 273#if ENABLE_TCP
221 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port) 274 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
222 { 275 {
223 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 276 tcpv4_fd = setup_socket (PROT_TCPv4, PF_INET, SOCK_STREAM, IPPROTO_TCP);
224 277
225 if (tcpv4_fd < 0) 278 if (tcpv4_fd < 0)
226 return -1; 279 return -1;
227
228 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
229 280
230 // standard daemon practise... 281 // standard daemon practise...
231 { 282 {
232 int oval = 1; 283 int oval = 1;
233 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 284 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
235 286
236 sockinfo si (THISNODE, PROT_TCPv4); 287 sockinfo si (THISNODE, PROT_TCPv4);
237 288
238 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 289 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
239 { 290 {
240 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 291 slog (L_ERR, _("can't bind tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
241 exit (EXIT_FAILURE); 292 return -1;
242 } 293 }
243 294
244 if (listen (tcpv4_fd, 5)) 295 if (listen (tcpv4_fd, 5))
245 { 296 {
246 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 297 slog (L_ERR, _("can't listen tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
247 exit (EXIT_FAILURE); 298 return -1;
248 } 299 }
249 300
250 tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ); 301 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
302 ++success;
251 } 303 }
304 else
305 THISNODE->protocols &= ~PROT_TCPv4;
252#endif 306#endif
307
308 dnsv4_tos = -1;
309 dnsv4_fd = -1;
253 310
254#if ENABLE_DNS 311#if ENABLE_DNS
255 if (THISNODE->protocols & PROT_DNSv4) 312 if (THISNODE->protocols & PROT_DNSv4)
256 { 313 {
257 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4); 314 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
258 315
259 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 316 dnsv4_fd = setup_socket (PROT_DNSv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
260 317
261 if (dnsv4_fd < 0) 318 if (dnsv4_fd < 0)
262 return -1; 319 return -1;
263 320
264# if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 321# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
… …
281 THISNODE->dns_hostname ? THISNODE->dns_port : 0, 338 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
282 PROT_DNSv4); 339 PROT_DNSv4);
283 340
284 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ())) 341 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
285 { 342 {
286 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno)); 343 slog (L_ERR, _("can't bind dnsv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
287 exit (EXIT_FAILURE); 344 return -1;
288 } 345 }
289 346
290 dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ); 347 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
348 ++success;
291 } 349 }
292#endif 350#endif
293 351
294 ///////////////////////////////////////////////////////////////////////////// 352 /////////////////////////////////////////////////////////////////////////////
353
354 if (!success)
355 {
356 slog (L_ERR, _("no protocols enabled."));
357 return -1;
358 }
295 359
296 reconnect_all (); 360 reconnect_all ();
297 361
298 ///////////////////////////////////////////////////////////////////////////// 362 /////////////////////////////////////////////////////////////////////////////
299 363
300 tap = new tap_device (); 364 tap = new tap_device ();
301 if (!tap) //D this, of course, never catches 365 if (!tap) //D this, of course, never catches
302 { 366 {
303 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 367 slog (L_ERR, _("cannot create network interface '%s'."), conf.ifname);
304 exit (EXIT_FAILURE); 368 return -1;
305 } 369 }
306 370
371 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
372
373 run_script_cb cb;
374 cb.set<vpn, &vpn::script_if_init> (this);
375
307 if (tap->if_up () && 376 if (tap->if_up () &&
308 !run_script (run_script_cb (this, &vpn::script_if_init), true)) 377 !run_script (cb, true))
309 { 378 {
310 slog (L_ERR, _("interface initialization command '%s' failed, exiting."), 379 slog (L_ERR, _("interface initialization command '%s' failed."),
311 tap->if_up ()); 380 tap->if_up ());
312 exit (EXIT_FAILURE); 381 return -1;
313 }
314
315 if (!run_script (run_script_cb (this, &vpn::script_if_up), true))
316 { 382 }
383
384 cb.set<vpn, &vpn::script_if_up> (this);
385 if (!run_script (cb, true))
386 {
317 slog (L_ERR, _("if-up command execution failed, exiting.")); 387 slog (L_ERR, _("if-up command execution failed."));
318 exit (EXIT_FAILURE); 388 return -1;
319 } 389 }
320 390
321 tap_ev_watcher.start (tap->fd, EVENT_READ); 391 tap_ev_watcher.start (tap->fd, EV_READ);
322 392
323 return 0; 393 return 0;
324} 394}
325 395
326bool 396bool
327vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 397vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
328{ 398{
329#if defined(SOL_IP) && defined(IP_TOS) 399 set_tos (ipv4_fd, ipv4_tos, tos);
330 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
331#endif
332 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 400 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
333 401
334 return true; 402 return true;
335} 403}
336 404
… …
359 427
360#if ENABLE_ICMP 428#if ENABLE_ICMP
361bool 429bool
362vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 430vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
363{ 431{
364#if defined(SOL_IP) && defined(IP_TOS)
365 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
366#endif
367
368 pkt->unshift_hdr (4); 432 pkt->unshift_hdr (4);
369 433
370 icmp_header *hdr = (icmp_header *)&((*pkt)[0]); 434 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
371 hdr->type = ::conf.icmp_type; 435 hdr->type = ::conf.icmp_type;
372 hdr->code = 255; 436 hdr->code = 255;
373 hdr->checksum = 0; 437 hdr->checksum = 0;
374 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 438 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
375 439
440 set_tos (icmpv4_fd, icmpv4_tos, tos);
376 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 441 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
377 442
378 return true; 443 return true;
379} 444}
380#endif 445#endif
381 446
382bool 447bool
383vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 448vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
384{ 449{
385#if defined(SOL_IP) && defined(IP_TOS) 450 set_tos (udpv4_fd, udpv4_tos, tos);
386 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
387#endif
388 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 451 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
389 452
390 return true; 453 return true;
391} 454}
392 455
… …
403 { 466 {
404 // broadcast, this is ugly, but due to the security policy 467 // broadcast, this is ugly, but due to the security policy
405 // we have to connect to all hosts... 468 // we have to connect to all hosts...
406 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 469 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
407 if ((*c)->conf != THISNODE) 470 if ((*c)->conf != THISNODE)
408 (*c)->inject_data_packet (pkt, true); 471 (*c)->inject_data_packet (pkt);
409 } 472 }
410} 473}
411 474
412void 475void
413vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 476vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
414{ 477{
415 unsigned int src = pkt->src (); 478 unsigned int src = pkt->src ();
416 unsigned int dst = pkt->dst (); 479 unsigned int dst = pkt->dst ();
417 480
418 slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d"), 481 slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d."),
419 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len); 482 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);
420 483
421 if (src == 0 || src > conns.size () 484 if (src == 0 || src > conns.size ()
422 || dst > conns.size () 485 || dst > conns.size ()
423 || pkt->typ () >= vpn_packet::PT_MAX) 486 || pkt->typ () >= vpn_packet::PT_MAX)
424 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), 487 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)."),
425 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 488 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
426 else if (dst > conns.size ()) 489 else if (dst > conns.size ())
427 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), 490 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)."),
428 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 491 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
429 else 492 else
430 { 493 {
431 connection *c = conns[src - 1]; 494 connection *c = conns[src - 1];
432 495
433 if (dst == 0) 496 if (dst == 0)
434 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"), 497 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)."),
435 c->conf->nodename, (const char *)rsi); 498 c->conf->nodename, (const char *)rsi);
436 else if (dst != THISNODE->id) 499 else if (dst != THISNODE->id)
437 { 500 {
438 if (THISNODE->routerprio) 501 if (THISNODE->routerprio)
439 // the tos setting gets lost here. who cares. 502 // the tos setting gets lost here. who cares.
440 conns[dst - 1]->inject_vpn_packet (pkt); 503 conns[dst - 1]->inject_vpn_packet (pkt);
441 else 504 else
442 slog (L_WARN, 505 slog (L_WARN,
443 _("%s(%s): forwarding request (=> %s), but we are no router"), 506 _("%s(%s): request to forward packet to %s, but we are no router (config mismatch?)."),
444 c->conf->nodename, (const char *)rsi, 507 c->conf->nodename, (const char *)rsi,
445 conns[dst - 1]->conf->nodename); 508 conns[dst - 1]->conf->nodename);
446 } 509 }
447 else 510 else
448 c->recv_vpn_packet (pkt, rsi); 511 c->recv_vpn_packet (pkt, rsi);
… …
454{ 517{
455 switch (si.prot) 518 switch (si.prot)
456 { 519 {
457 case PROT_IPv4: 520 case PROT_IPv4:
458 return send_ipv4_packet (pkt, si, tos); 521 return send_ipv4_packet (pkt, si, tos);
522
459 case PROT_UDPv4: 523 case PROT_UDPv4:
460 return send_udpv4_packet (pkt, si, tos); 524 return send_udpv4_packet (pkt, si, tos);
525
461#if ENABLE_TCP 526#if ENABLE_TCP
462 case PROT_TCPv4: 527 case PROT_TCPv4:
463 return send_tcpv4_packet (pkt, si, tos); 528 return send_tcpv4_packet (pkt, si, tos);
464#endif 529#endif
465#if ENABLE_ICMP 530#if ENABLE_ICMP
466 case PROT_ICMPv4: 531 case PROT_ICMPv4:
… …
468#endif 533#endif
469#if ENABLE_DNS 534#if ENABLE_DNS
470 case PROT_DNSv4: 535 case PROT_DNSv4:
471 return send_dnsv4_packet (pkt, si, tos); 536 return send_dnsv4_packet (pkt, si, tos);
472#endif 537#endif
473
474 default: 538 default:
475 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si); 539 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol."), (const char *)si);
476 } 540 }
477 541
478 return false; 542 return false;
479} 543}
480 544
481void 545inline void
482vpn::ipv4_ev (io_watcher &w, short revents) 546vpn::ipv4_ev (ev::io &w, int revents)
483{ 547{
484 if (revents & EVENT_READ) 548 if (revents & EV_READ)
485 { 549 {
486 vpn_packet *pkt = new vpn_packet; 550 vpn_packet *pkt = new vpn_packet;
487 struct sockaddr_in sa; 551 struct sockaddr_in sa;
488 socklen_t sa_len = sizeof (sa); 552 socklen_t sa_len = sizeof (sa);
489 int len; 553 int len;
… …
495 if (len > 0) 559 if (len > 0)
496 { 560 {
497 pkt->len = len; 561 pkt->len = len;
498 562
499 // raw sockets deliver the ipv4 header, but don't expect it on sends 563 // raw sockets deliver the ipv4 header, but don't expect it on sends
500 pkt->skip_hdr (IP_OVERHEAD); 564 pkt->skip_ipv4_hdr ();
501 565
502 recv_vpn_packet (pkt, si); 566 recv_vpn_packet (pkt, si);
503 } 567 }
504 else 568 else
505 { 569 {
506 // probably ECONNRESET or somesuch 570 // probably ECONNRESET or somesuch
507 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 571 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
508 } 572 }
509 573
510 delete pkt; 574 delete pkt;
511 } 575 }
512 else 576 else
513 { 577 {
514 slog (L_ERR, 578 slog (L_ERR,
515 _("FATAL: unknown revents %08x in socket, terminating\n"), 579 _("FATAL: unknown revents %08x in socket, exiting.\n"),
516 revents); 580 revents);
517 exit (EXIT_FAILURE); 581 exit (EXIT_FAILURE);
518 } 582 }
519} 583}
520 584
521#if ENABLE_ICMP 585#if ENABLE_ICMP
522void 586inline void
523vpn::icmpv4_ev (io_watcher &w, short revents) 587vpn::icmpv4_ev (ev::io &w, int revents)
524{ 588{
525 if (revents & EVENT_READ) 589 if (revents & EV_READ)
526 { 590 {
527 vpn_packet *pkt = new vpn_packet; 591 vpn_packet *pkt = new vpn_packet;
528 struct sockaddr_in sa; 592 struct sockaddr_in sa;
529 socklen_t sa_len = sizeof (sa); 593 socklen_t sa_len = sizeof (sa);
530 int len; 594 int len;
… …
542 if (hdr->type == ::conf.icmp_type 606 if (hdr->type == ::conf.icmp_type
543 && hdr->code == 255) 607 && hdr->code == 255)
544 { 608 {
545 // raw sockets deliver the ipv4, but don't expect it on sends 609 // raw sockets deliver the ipv4, but don't expect it on sends
546 // this is slow, but... 610 // this is slow, but...
547 pkt->skip_hdr (ICMP_OVERHEAD); 611 pkt->skip_ipv4_hdr (ICMP_OVERHEAD - IP_OVERHEAD);
548 612
549 recv_vpn_packet (pkt, si); 613 recv_vpn_packet (pkt, si);
550 } 614 }
551 } 615 }
552 else 616 else
553 { 617 {
554 // probably ECONNRESET or somesuch 618 // probably ECONNRESET or somesuch
555 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 619 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
556 } 620 }
557 621
558 delete pkt; 622 delete pkt;
559 } 623 }
560 else 624 else
561 { 625 {
562 slog (L_ERR, 626 slog (L_ERR,
563 _("FATAL: unknown revents %08x in socket, terminating\n"), 627 _("FATAL: unknown revents %08x in socket, exiting.\n"),
564 revents); 628 revents);
565 exit (EXIT_FAILURE); 629 exit (EXIT_FAILURE);
566 } 630 }
567} 631}
568#endif 632#endif
569 633
570void 634inline void
571vpn::udpv4_ev (io_watcher &w, short revents) 635vpn::udpv4_ev (ev::io &w, int revents)
572{ 636{
573 if (revents & EVENT_READ) 637 if (revents & EV_READ)
574 { 638 {
575 vpn_packet *pkt = new vpn_packet; 639 vpn_packet *pkt = new vpn_packet;
576 struct sockaddr_in sa; 640 struct sockaddr_in sa;
577 socklen_t sa_len = sizeof (sa); 641 socklen_t sa_len = sizeof (sa);
578 int len; 642 int len;
… …
588 recv_vpn_packet (pkt, si); 652 recv_vpn_packet (pkt, si);
589 } 653 }
590 else 654 else
591 { 655 {
592 // probably ECONNRESET or somesuch 656 // probably ECONNRESET or somesuch
593 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 657 slog (L_DEBUG, _("%s: fd %d, %s."), (const char *)si, w.fd, strerror (errno));
594 } 658 }
595 659
596 delete pkt; 660 delete pkt;
597 } 661 }
598 else 662 else
599 { 663 {
600 slog (L_ERR, 664 slog (L_ERR,
601 _("FATAL: unknown revents %08x in socket, terminating\n"), 665 _("FATAL: unknown revents %08x in socket, exiting.\n"),
602 revents); 666 revents);
603 exit (EXIT_FAILURE); 667 exit (EXIT_FAILURE);
604 } 668 }
605} 669}
606 670
607void 671inline void
608vpn::tap_ev (io_watcher &w, short revents) 672vpn::tap_ev (ev::io &w, int revents)
609{ 673{
610 if (revents & EVENT_READ) 674 if (revents & EV_READ)
611 { 675 {
612 /* process data */ 676 /* process data */
613 tap_packet *pkt; 677 tap_packet *pkt;
614 678
615 pkt = tap->recv (); 679 pkt = tap->recv ();
… …
644 } 708 }
645 else 709 else
646 abort (); 710 abort ();
647} 711}
648 712
649void 713inline void
650vpn::event_cb (time_watcher &w) 714vpn::event_cb (ev::timer &w, int)
651{ 715{
652 if (events) 716 if (events)
653 { 717 {
654 if (events & EVENT_SHUTDOWN) 718 if (events & EVENT_SHUTDOWN)
655 { 719 {
656 slog (L_INFO, _("preparing shutdown...")); 720 slog (L_INFO, _("preparing shutdown..."));
657 721
658 shutdown_all (); 722 shutdown_all ();
659 remove_pid (conf.pidfilename); 723 remove_pid (conf.pidfilename);
660 slog (L_INFO, _("terminating")); 724 slog (L_INFO, _("exiting."));
661 exit (EXIT_SUCCESS); 725 exit (EXIT_SUCCESS);
662 } 726 }
663 727
664 if (events & EVENT_RECONNECT) 728 if (events & EVENT_RECONNECT)
665 { 729 {
666 slog (L_INFO, _("forced reconnect")); 730 slog (L_INFO, _("forced reconnect."));
667 731
668 reconnect_all (); 732 reconnect_all ();
669 } 733 }
670 734
671 events = 0; 735 events = 0;
… …
687 751
688 conns.clear (); 752 conns.clear ();
689 753
690 connection_init (); 754 connection_init ();
691 755
692 for (configuration::node_vector::iterator i = conf.nodes.begin (); 756 for (configuration::node_vector::iterator i = conf.nodes.begin (); i != conf.nodes.end (); ++i)
693 i != conf.nodes.end (); ++i) 757 conns.push_back (new connection (this, *i));
694 { 758
695 connection *conn = new connection (this, *i); 759 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
696 conns.push_back (conn);
697 conn->establish_connection (); 760 (*c)->establish_connection ();
698 }
699} 761}
700 762
701connection *vpn::find_router () 763bool
764vpn::can_direct (conf_node *src, conf_node *dst) const
702{ 765{
703 u32 prio = 1; 766 return src != dst
767 && src->may_direct (dst)
768 && dst->may_direct (src)
769 && (((src->protocols & dst->protocols) && src->connectmode == conf_node::C_ALWAYS)
770 || (src->protocols & dst->connectable_protocols ()));
771}
772
773// only works for indirect and routed connections: find a router
774// from THISNODE to dst
775connection *
776vpn::find_router_for (const connection *dst)
777{
704 connection *router = 0; 778 connection *router = 0;
705 779
780 // first try to find a router with a direct connection, route there
781 // regardless of any other considerations.
782 {
783 u32 prio = 1;
784
785 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
786 {
787 connection *c = *i;
788
789 if (c->conf->routerprio > prio
790 && c->conf != THISNODE
791 && can_direct (c->conf, dst->conf)
792 && c->ictx && c->octx)
793 {
794 prio = c->conf->routerprio;
795 router = c;
796 }
797 }
798 }
799
800 if (router)
801 return router;
802
803 // second try find the router with the highest priority, higher than ours
804 {
805 u32 prio = THISNODE->routerprio ? THISNODE->routerprio : 1;
806
807 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
808 {
809 connection *c = *i;
810
811 if (c->conf->routerprio > prio
812 && c != dst
813 && c->conf != THISNODE
814 && c->ictx && c->octx)
815 {
816 prio = c->conf->routerprio;
817 router = c;
818 }
819 }
820 }
821
822 return router;
823}
824
825void
826vpn::connection_established (connection *c)
827{
706 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 828 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
707 { 829 {
708 connection *c = *i; 830 connection *o = *i;
709 831
710 if (c->conf->routerprio > prio 832 if (!o->is_direct
711 && c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use 833 && o->si.valid ()
712 && c->ictx && c->octx 834 && c->si != o->si
713 && c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode 835 && c == find_router_for (o))
714 {
715 prio = c->conf->routerprio;
716 router = c;
717 } 836 {
837 slog (L_DEBUG, _("%s: can now route packets via %s, re-keying connection."),
838 o->conf->nodename, c->conf->nodename);
839 o->rekey ();
840 }
718 } 841 }
719
720 return router;
721} 842}
722 843
844void
723void vpn::send_connect_request (int id) 845vpn::send_connect_request (connection *c)
724{ 846{
725 connection *c = find_router (); 847 connection *r = find_router_for (c);
726 848
727 if (c) 849 if (r)
850 {
851 slog (L_TRACE, _("%s: no address known, sending mediated connection request via %s."),
852 c->conf->nodename, r->conf->nodename);
728 c->send_connect_request (id); 853 r->send_connect_request (c->conf->id);
854 }
729 else 855 else
730 // no router found, aggressively connect to all routers 856 slog (L_DEBUG, _("%s: no way to connect and no router found: unable to connect at this time."),
731 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 857 c->conf->nodename);
732 if ((*i)->conf->routerprio && (*i)->conf != THISNODE)
733 (*i)->establish_connection ();
734} 858}
735 859
736void 860void
737connection::dump_status () 861connection::dump_status ()
738{ 862{
739 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id); 863 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);
740 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"), 864 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),
741 connectmode, conf->connectmode, (const char *)si, (int)prot_minor); 865 connectmode, conf->connectmode, (const char *)si, (int)prot_minor);
742 slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"), 866 slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"),
743 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt); 867 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt);
744 slog (L_NOTICE, _(" establish_conn %ld / rekey %ld / keepalive %ld"),
745 (long)(establish_connection.at), (long)(rekey.at), (long)(keepalive.at));
746} 868}
747 869
748void 870void
749vpn::dump_status () 871vpn::dump_status ()
750{ 872{
751 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 873 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
752 874
753 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 875 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
754 (*c)->dump_status (); 876 (*c)->dump_status ();
755 877
756 slog (L_NOTICE, _("END status dump")); 878 slog (L_NOTICE, _("END status dump"));
757} 879}
758 880
759vpn::vpn (void) 881vpn::vpn (void)
882{
760: event (this, &vpn::event_cb) 883 event .set<vpn, &vpn::event_cb > (this);
761, udpv4_ev_watcher (this, &vpn::udpv4_ev) 884 udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
762, ipv4_ev_watcher (this, &vpn::ipv4_ev) 885 ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
763#if ENABLE_TCP 886#if ENABLE_TCP
764, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 887 tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
765#endif 888#endif
766#if ENABLE_ICMP 889#if ENABLE_ICMP
767, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 890 icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
768#endif 891#endif
769#if ENABLE_DNS 892#if ENABLE_DNS
770, dnsv4_ev_watcher (this, &vpn::dnsv4_ev) 893 dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
771#endif 894#endif
772, tap_ev_watcher (this, &vpn::tap_ev) 895 tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
773{
774} 896}
775 897
776vpn::~vpn () 898vpn::~vpn ()
777{ 899{
778} 900}

Diff Legend

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