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.36 by pcg, Fri Apr 8 16:48:16 2005 UTC vs.
Revision 1.62 by root, Sat Dec 17 22:05:34 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#if 1//D2
153 ipv42_tos = -1;
103 ipv4_fd = -1; 154 ipv42_fd = -1;
104 155
105 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 156 if (THISNODE->protocols & PROT_IPv42 && ::conf.ip_proto)
106 { 157 {
107 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 158 ipv42_fd = setup_socket (PROT_IPv42, PF_INET, SOCK_RAW, ::conf.ip2_proto);
108 159
109 if (ipv4_fd < 0) 160 if (ipv42_fd < 0)
110 return -1; 161 return -1;
111
112 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
113 162
114#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 163#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
115 // this I really consider a linux bug. I am neither connected 164 // this I really consider a linux bug. I am neither connected
116 // nor do I fragment myself. Linux still sets DF and doesn't 165 // nor do I fragment myself. Linux still sets DF and doesn't
117 // fragment for me sometimes. 166 // fragment for me sometimes.
118 { 167 {
119 int oval = IP_PMTUDISC_DONT; 168 int oval = IP_PMTUDISC_DONT;
120 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 169 setsockopt (ipv42_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
121 } 170 }
122#endif 171#endif
123 172
124 sockinfo si (THISNODE, PROT_IPv4); 173 sockinfo si (THISNODE, PROT_IPv42);
125 174
126 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 175 if (bind (ipv42_fd, si.sav4 (), si.salenv4 ()))
127 { 176 {
128 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 177 slog (L_ERR, _("can't bind ipv42 socket on %s: %s, exiting."), (const char *)si, strerror (errno));
129 exit (EXIT_FAILURE); 178 return -1;
130 } 179 }
131 180
132 ipv4_ev_watcher.start (ipv4_fd, EVENT_READ); 181 ipv42_ev_watcher.start (ipv42_fd, EV_READ);
182 ++success;
133 } 183 }
184 else
185 THISNODE->protocols &= ~PROT_IPv42;
186#endif
134 187
188 ipv4_tos = -1;
135 udpv4_fd = -1; 189 ipv4_fd = -1;
136 190
137 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 191 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
138 { 192 {
139 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 193 ipv4_fd = setup_socket (PROT_IPv4, PF_INET, SOCK_RAW, ::conf.ip_proto);
140 194
141 if (udpv4_fd < 0) 195 if (ipv4_fd < 0)
142 return -1; 196 return -1;
143
144 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
145
146 // standard daemon practise...
147 {
148 int oval = 1;
149 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
150 }
151 197
152#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 198#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
153 // this I really consider a linux bug. I am neither connected 199 // this I really consider a linux bug. I am neither connected
154 // nor do I fragment myself. Linux still sets DF and doesn't 200 // nor do I fragment myself. Linux still sets DF and doesn't
155 // fragment for me sometimes. 201 // fragment for me sometimes.
156 { 202 {
157 int oval = IP_PMTUDISC_DONT; 203 int oval = IP_PMTUDISC_DONT;
204 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
205 }
206#endif
207
208 sockinfo si (THISNODE, PROT_IPv4);
209
210 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
211 {
212 slog (L_ERR, _("can't bind ipv4 socket on %s: %s, exiting."), (const char *)si, strerror (errno));
213 return -1;
214 }
215
216 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
217 ++success;
218 }
219 else
220 THISNODE->protocols &= ~PROT_IPv4;
221
222 udpv4_tos = -1;
223 udpv4_fd = -1;
224
225 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
226 {
227 udpv4_fd = setup_socket (PROT_UDPv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
228
229 if (udpv4_fd < 0)
230 return -1;
231
232 // standard daemon practise...
233 {
234 int oval = 1;
235 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
236 }
237
238#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
239 // this I really consider a linux bug. I am neither connected
240 // nor do I fragment myself. Linux still sets DF and doesn't
241 // fragment for me sometimes.
242 {
243 int oval = IP_PMTUDISC_DONT;
158 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 244 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
159 } 245 }
160#endif 246#endif
161 247
162 sockinfo si (THISNODE, PROT_UDPv4); 248 sockinfo si (THISNODE, PROT_UDPv4);
163 249
164 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 250 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
165 { 251 {
166 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 252 slog (L_ERR, _("can't bind udpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
167 exit (EXIT_FAILURE); 253 return -1;
168 } 254 }
169 255
170 udpv4_ev_watcher.start (udpv4_fd, EVENT_READ); 256 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
257 ++success;
171 } 258 }
259 else
260 THISNODE->protocols &= ~PROT_UDPv4;
172 261
262 icmpv4_tos = -1;
173 icmpv4_fd = -1; 263 icmpv4_fd = -1;
174 264
175#if ENABLE_ICMP 265#if ENABLE_ICMP
176 if (THISNODE->protocols & PROT_ICMPv4) 266 if (THISNODE->protocols & PROT_ICMPv4)
177 { 267 {
178 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 268 icmpv4_fd = setup_socket (PROT_ICMPv4, PF_INET, SOCK_RAW, IPPROTO_ICMP);
179 269
180 if (icmpv4_fd < 0) 270 if (icmpv4_fd < 0)
181 return -1; 271 return -1;
182
183 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
184 272
185#ifdef ICMP_FILTER 273#ifdef ICMP_FILTER
186 { 274 {
187 icmp_filter oval; 275 icmp_filter oval;
188 oval.data = 0xffffffff; 276 oval.data = 0xffffffff;
… …
205 293
206 sockinfo si (THISNODE, PROT_ICMPv4); 294 sockinfo si (THISNODE, PROT_ICMPv4);
207 295
208 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 296 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
209 { 297 {
210 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); 298 slog (L_ERR, _("can't bind icmpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
211 exit (EXIT_FAILURE); 299 return -1;
212 } 300 }
213 301
214 icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ); 302 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
303 ++success;
215 } 304 }
216#endif 305#endif
217 306
218 tcpv4_fd = -1; 307 tcpv4_fd = -1;
219 308
220#if ENABLE_TCP 309#if ENABLE_TCP
221 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port) 310 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
222 { 311 {
223 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 312 tcpv4_fd = setup_socket (PROT_TCPv4, PF_INET, SOCK_STREAM, IPPROTO_TCP);
224 313
225 if (tcpv4_fd < 0) 314 if (tcpv4_fd < 0)
226 return -1; 315 return -1;
227 316
228 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
229
230 // standard daemon practise... 317 // standard daemon practise...
231 { 318 {
232 int oval = 1; 319 int oval = 1;
233 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 320 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
234 } 321 }
235 322
236 sockinfo si (THISNODE, PROT_TCPv4); 323 sockinfo si (THISNODE, PROT_TCPv4);
237 324
238 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 325 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
239 { 326 {
240 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 327 slog (L_ERR, _("can't bind tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
241 exit (EXIT_FAILURE); 328 return -1;
242 } 329 }
243 330
244 if (listen (tcpv4_fd, 5)) 331 if (listen (tcpv4_fd, 5))
245 { 332 {
246 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 333 slog (L_ERR, _("can't listen tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
247 exit (EXIT_FAILURE); 334 return -1;
248 } 335 }
249 336
250 tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ); 337 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
338 ++success;
251 } 339 }
340 else
341 THISNODE->protocols &= ~PROT_TCPv4;
252#endif 342#endif
343
344 dnsv4_tos = -1;
345 dnsv4_fd = -1;
253 346
254#if ENABLE_DNS 347#if ENABLE_DNS
255 if (THISNODE->protocols & PROT_DNSv4) 348 if (THISNODE->protocols & PROT_DNSv4)
256 { 349 {
257 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4); 350 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
258 351
259 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 352 dnsv4_fd = setup_socket (PROT_DNSv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
260 353
261 if (dnsv4_fd < 0) 354 if (dnsv4_fd < 0)
262 return -1; 355 return -1;
263 356
264# if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 357# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
… …
281 THISNODE->dns_hostname ? THISNODE->dns_port : 0, 374 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
282 PROT_DNSv4); 375 PROT_DNSv4);
283 376
284 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ())) 377 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
285 { 378 {
286 slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno)); 379 slog (L_ERR, _("can't bind dnsv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
287 exit (EXIT_FAILURE); 380 return -1;
288 } 381 }
289 382
290 dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ); 383 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
384 ++success;
291 } 385 }
292#endif 386#endif
293 387
294 ///////////////////////////////////////////////////////////////////////////// 388 /////////////////////////////////////////////////////////////////////////////
389
390 if (!success)
391 {
392 slog (L_ERR, _("no protocols enabled."));
393 return -1;
394 }
295 395
296 reconnect_all (); 396 reconnect_all ();
297 397
298 ///////////////////////////////////////////////////////////////////////////// 398 /////////////////////////////////////////////////////////////////////////////
299 399
300 tap = new tap_device (); 400 tap = new tap_device ();
301 if (!tap) //D this, of course, never catches 401 if (!tap) //D this, of course, never catches
302 { 402 {
303 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 403 slog (L_ERR, _("cannot create network interface '%s'."), conf.ifname);
304 exit (EXIT_FAILURE); 404 return -1;
305 } 405 }
306 406
407 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
408
409 run_script_cb cb;
410 cb.set<vpn, &vpn::script_if_init> (this);
411
307 if (tap->if_up () && 412 if (tap->if_up () &&
308 !run_script (run_script_cb (this, &vpn::script_if_init), true)) 413 !run_script (cb, true))
309 { 414 {
310 slog (L_ERR, _("interface initialization command '%s' failed, exiting."), 415 slog (L_ERR, _("interface initialization command '%s' failed."),
311 tap->if_up ()); 416 tap->if_up ());
312 exit (EXIT_FAILURE); 417 return -1;
313 }
314
315 if (!run_script (run_script_cb (this, &vpn::script_if_up), true))
316 { 418 }
419
420 cb.set<vpn, &vpn::script_if_up> (this);
421 if (!run_script (cb, true))
422 {
317 slog (L_ERR, _("if-up command execution failed, exiting.")); 423 slog (L_ERR, _("if-up command execution failed."));
318 exit (EXIT_FAILURE); 424 return -1;
319 } 425 }
320 426
321 tap_ev_watcher.start (tap->fd, EVENT_READ); 427 tap_ev_watcher.start (tap->fd, EV_READ);
322 428
323 return 0; 429 return 0;
324} 430}
325 431
326bool 432bool
327vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 433vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
328{ 434{
329#if defined(SOL_IP) && defined(IP_TOS) 435 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 ()); 436 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
333 437
334 return true; 438 return true;
335} 439}
440
441#if 1 //D
442bool
443vpn::send_ipv42_packet (vpn_packet *pkt, const sockinfo &si, int tos)
444{
445 set_tos (ipv42_fd, ipv42_tos, tos);
446 sendto (ipv42_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
447
448 return true;
449}
450#endif
336 451
337static u16 452static u16
338ipv4_checksum (u16 *data, unsigned int len) 453ipv4_checksum (u16 *data, unsigned int len)
339{ 454{
340 // use 32 bit accumulator and fold back carry bits at the end 455 // use 32 bit accumulator and fold back carry bits at the end
… …
359 474
360#if ENABLE_ICMP 475#if ENABLE_ICMP
361bool 476bool
362vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 477vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
363{ 478{
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); 479 pkt->unshift_hdr (4);
369 480
370 icmp_header *hdr = (icmp_header *)&((*pkt)[0]); 481 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
371 hdr->type = ::conf.icmp_type; 482 hdr->type = ::conf.icmp_type;
372 hdr->code = 255; 483 hdr->code = 255;
373 hdr->checksum = 0; 484 hdr->checksum = 0;
374 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 485 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
375 486
487 set_tos (icmpv4_fd, icmpv4_tos, tos);
376 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 488 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
377 489
378 return true; 490 return true;
379} 491}
380#endif 492#endif
381 493
382bool 494bool
383vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 495vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
384{ 496{
385#if defined(SOL_IP) && defined(IP_TOS) 497 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 ()); 498 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
389 499
390 return true; 500 return true;
391} 501}
392 502
… …
403 { 513 {
404 // broadcast, this is ugly, but due to the security policy 514 // broadcast, this is ugly, but due to the security policy
405 // we have to connect to all hosts... 515 // we have to connect to all hosts...
406 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 516 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
407 if ((*c)->conf != THISNODE) 517 if ((*c)->conf != THISNODE)
408 (*c)->inject_data_packet (pkt, true); 518 (*c)->inject_data_packet (pkt);
409 } 519 }
410} 520}
411 521
412void 522void
413vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 523vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
414{ 524{
415 unsigned int src = pkt->src (); 525 unsigned int src = pkt->src ();
416 unsigned int dst = pkt->dst (); 526 unsigned int dst = pkt->dst ();
417 527
418 slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d"), 528 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); 529 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);
420 530
421 if (src == 0 || src > conns.size () 531 if (src == 0 || src > conns.size ()
422 || dst > conns.size () 532 || dst > conns.size ()
423 || pkt->typ () >= vpn_packet::PT_MAX) 533 || pkt->typ () >= vpn_packet::PT_MAX)
424 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), 534 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)."),
425 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 535 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
426 else if (dst > conns.size ())
427 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
428 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
429 else 536 else
430 { 537 {
431 connection *c = conns[src - 1]; 538 connection *c = conns[src - 1];
432 539
433 if (dst == 0) 540 if (dst == 0)
434 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"), 541 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)."),
435 c->conf->nodename, (const char *)rsi); 542 c->conf->nodename, (const char *)rsi);
436 else if (dst != THISNODE->id) 543 else if (dst != THISNODE->id)
437 { 544 {
438 if (THISNODE->routerprio) 545 if (THISNODE->routerprio)
439 // the tos setting gets lost here. who cares. 546 // the tos setting gets lost here. who cares.
440 conns[dst - 1]->inject_vpn_packet (pkt); 547 conns[dst - 1]->inject_vpn_packet (pkt);
441 else 548 else
442 slog (L_WARN, 549 slog (L_WARN,
443 _("%s(%s): forwarding request (=> %s), but we are no router"), 550 _("%s(%s): request to forward packet to %s, but we are no router (config mismatch?)."),
444 c->conf->nodename, (const char *)rsi, 551 c->conf->nodename, (const char *)rsi,
445 conns[dst - 1]->conf->nodename); 552 conns[dst - 1]->conf->nodename);
446 } 553 }
447 else 554 else
448 c->recv_vpn_packet (pkt, rsi); 555 c->recv_vpn_packet (pkt, rsi);
… …
452bool 559bool
453vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 560vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
454{ 561{
455 switch (si.prot) 562 switch (si.prot)
456 { 563 {
564#if 1//D2
565 case PROT_IPv42:
566 return send_ipv42_packet (pkt, si, tos);
567#endif
568
457 case PROT_IPv4: 569 case PROT_IPv4:
458 return send_ipv4_packet (pkt, si, tos); 570 return send_ipv4_packet (pkt, si, tos);
571
459 case PROT_UDPv4: 572 case PROT_UDPv4:
460 return send_udpv4_packet (pkt, si, tos); 573 return send_udpv4_packet (pkt, si, tos);
574
461#if ENABLE_TCP 575#if ENABLE_TCP
462 case PROT_TCPv4: 576 case PROT_TCPv4:
463 return send_tcpv4_packet (pkt, si, tos); 577 return send_tcpv4_packet (pkt, si, tos);
464#endif 578#endif
465#if ENABLE_ICMP 579#if ENABLE_ICMP
466 case PROT_ICMPv4: 580 case PROT_ICMPv4:
… …
468#endif 582#endif
469#if ENABLE_DNS 583#if ENABLE_DNS
470 case PROT_DNSv4: 584 case PROT_DNSv4:
471 return send_dnsv4_packet (pkt, si, tos); 585 return send_dnsv4_packet (pkt, si, tos);
472#endif 586#endif
473
474 default: 587 default:
475 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si); 588 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol."), (const char *)si);
476 } 589 }
477 590
478 return false; 591 return false;
479} 592}
480 593
481void 594#if 1//D2
595inline void
482vpn::ipv4_ev (io_watcher &w, short revents) 596vpn::ipv42_ev (ev::io &w, int revents)
483{ 597{
484 if (revents & EVENT_READ) 598 if (revents & EV_READ)
485 { 599 {
486 vpn_packet *pkt = new vpn_packet; 600 vpn_packet *pkt = new vpn_packet;
487 struct sockaddr_in sa; 601 struct sockaddr_in sa;
488 socklen_t sa_len = sizeof (sa); 602 socklen_t sa_len = sizeof (sa);
489 int len; 603 int len;
490 604
491 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 605 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
492 606
493 sockinfo si(sa, PROT_IPv4); 607 sockinfo si(sa, PROT_IPv42);
494 608
495 if (len > 0) 609 if (len > 0)
496 { 610 {
497 pkt->len = len; 611 pkt->len = len;
498 612
499 // raw sockets deliver the ipv4 header, but don't expect it on sends 613 // raw sockets deliver the ipv4 header, but don't expect it on sends
500 pkt->skip_hdr (IP_OVERHEAD); 614 pkt->skip_hdr (pkt->ipv4_hdr_len ());
501 615
502 recv_vpn_packet (pkt, si); 616 recv_vpn_packet (pkt, si);
503 } 617 }
504 else 618 else
505 { 619 {
506 // probably ECONNRESET or somesuch 620 // probably ECONNRESET or somesuch
507 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 621 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
508 } 622 }
509 623
510 delete pkt; 624 delete pkt;
511 } 625 }
512 else 626 else
513 { 627 {
514 slog (L_ERR, 628 slog (L_ERR,
515 _("FATAL: unknown revents %08x in socket, terminating\n"), 629 _("FATAL: unknown revents %08x in socket, exiting.\n"),
516 revents); 630 revents);
517 exit (EXIT_FAILURE); 631 exit (EXIT_FAILURE);
518 } 632 }
519} 633}
634#endif
635
636inline void
637vpn::ipv4_ev (ev::io &w, int revents)
638{
639 if (revents & EV_READ)
640 {
641 vpn_packet *pkt = new vpn_packet;
642 struct sockaddr_in sa;
643 socklen_t sa_len = sizeof (sa);
644 int len;
645
646 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
647
648 sockinfo si(sa, PROT_IPv4);
649
650 if (len > 0)
651 {
652 pkt->len = len;
653
654 // raw sockets deliver the ipv4 header, but don't expect it on sends
655 pkt->skip_hdr (pkt->ipv4_hdr_len ());
656
657 recv_vpn_packet (pkt, si);
658 }
659 else
660 {
661 // probably ECONNRESET or somesuch
662 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
663 }
664
665 delete pkt;
666 }
667 else
668 {
669 slog (L_ERR,
670 _("FATAL: unknown revents %08x in socket, exiting.\n"),
671 revents);
672 exit (EXIT_FAILURE);
673 }
674}
520 675
521#if ENABLE_ICMP 676#if ENABLE_ICMP
522void 677inline void
523vpn::icmpv4_ev (io_watcher &w, short revents) 678vpn::icmpv4_ev (ev::io &w, int revents)
524{ 679{
525 if (revents & EVENT_READ) 680 if (revents & EV_READ)
526 { 681 {
527 vpn_packet *pkt = new vpn_packet; 682 vpn_packet *pkt = new vpn_packet;
528 struct sockaddr_in sa; 683 struct sockaddr_in sa;
529 socklen_t sa_len = sizeof (sa); 684 socklen_t sa_len = sizeof (sa);
530 int len; 685 int len;
… …
542 if (hdr->type == ::conf.icmp_type 697 if (hdr->type == ::conf.icmp_type
543 && hdr->code == 255) 698 && hdr->code == 255)
544 { 699 {
545 // raw sockets deliver the ipv4, but don't expect it on sends 700 // raw sockets deliver the ipv4, but don't expect it on sends
546 // this is slow, but... 701 // this is slow, but...
547 pkt->skip_hdr (ICMP_OVERHEAD); 702 pkt->skip_hdr (pkt->ipv4_hdr_len () + (ICMP_OVERHEAD - IP_OVERHEAD));
548 703
549 recv_vpn_packet (pkt, si); 704 recv_vpn_packet (pkt, si);
550 } 705 }
551 } 706 }
552 else 707 else
553 { 708 {
554 // probably ECONNRESET or somesuch 709 // probably ECONNRESET or somesuch
555 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 710 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
556 } 711 }
557 712
558 delete pkt; 713 delete pkt;
559 } 714 }
560 else 715 else
561 { 716 {
562 slog (L_ERR, 717 slog (L_ERR,
563 _("FATAL: unknown revents %08x in socket, terminating\n"), 718 _("FATAL: unknown revents %08x in socket, exiting.\n"),
564 revents); 719 revents);
565 exit (EXIT_FAILURE); 720 exit (EXIT_FAILURE);
566 } 721 }
567} 722}
568#endif 723#endif
569 724
570void 725inline void
571vpn::udpv4_ev (io_watcher &w, short revents) 726vpn::udpv4_ev (ev::io &w, int revents)
572{ 727{
573 if (revents & EVENT_READ) 728 if (revents & EV_READ)
574 { 729 {
575 vpn_packet *pkt = new vpn_packet; 730 vpn_packet *pkt = new vpn_packet;
576 struct sockaddr_in sa; 731 struct sockaddr_in sa;
577 socklen_t sa_len = sizeof (sa); 732 socklen_t sa_len = sizeof (sa);
578 int len; 733 int len;
… …
588 recv_vpn_packet (pkt, si); 743 recv_vpn_packet (pkt, si);
589 } 744 }
590 else 745 else
591 { 746 {
592 // probably ECONNRESET or somesuch 747 // probably ECONNRESET or somesuch
593 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 748 slog (L_DEBUG, _("%s: fd %d, %s."), (const char *)si, w.fd, strerror (errno));
594 } 749 }
595 750
596 delete pkt; 751 delete pkt;
597 } 752 }
598 else 753 else
599 { 754 {
600 slog (L_ERR, 755 slog (L_ERR,
601 _("FATAL: unknown revents %08x in socket, terminating\n"), 756 _("FATAL: unknown revents %08x in socket, exiting.\n"),
602 revents); 757 revents);
603 exit (EXIT_FAILURE); 758 exit (EXIT_FAILURE);
604 } 759 }
605} 760}
606 761
607void 762inline void
608vpn::tap_ev (io_watcher &w, short revents) 763vpn::tap_ev (ev::io &w, int revents)
609{ 764{
610 if (revents & EVENT_READ) 765 if (revents & EV_READ)
611 { 766 {
612 /* process data */ 767 /* process data */
613 tap_packet *pkt; 768 tap_packet *pkt;
614 769
615 pkt = tap->recv (); 770 pkt = tap->recv ();
… …
644 } 799 }
645 else 800 else
646 abort (); 801 abort ();
647} 802}
648 803
649void 804inline void
650vpn::event_cb (time_watcher &w) 805vpn::event_cb (ev::timer &w, int)
651{ 806{
652 if (events) 807 if (events)
653 { 808 {
654 if (events & EVENT_SHUTDOWN) 809 if (events & EVENT_SHUTDOWN)
655 { 810 {
656 slog (L_INFO, _("preparing shutdown...")); 811 slog (L_INFO, _("preparing shutdown..."));
657 812
658 shutdown_all (); 813 shutdown_all ();
659 remove_pid (conf.pidfilename); 814 remove_pid (conf.pidfilename);
660 slog (L_INFO, _("terminating")); 815 slog (L_INFO, _("exiting."));
661 exit (EXIT_SUCCESS); 816 exit (EXIT_SUCCESS);
662 } 817 }
663 818
664 if (events & EVENT_RECONNECT) 819 if (events & EVENT_RECONNECT)
665 { 820 {
666 slog (L_INFO, _("forced reconnect")); 821 slog (L_INFO, _("forced reconnect."));
667 822
668 reconnect_all (); 823 reconnect_all ();
669 } 824 }
670 825
671 events = 0; 826 events = 0;
… …
687 842
688 conns.clear (); 843 conns.clear ();
689 844
690 connection_init (); 845 connection_init ();
691 846
692 for (configuration::node_vector::iterator i = conf.nodes.begin (); 847 for (configuration::node_vector::iterator i = conf.nodes.begin (); i != conf.nodes.end (); ++i)
693 i != conf.nodes.end (); ++i) 848 conns.push_back (new connection (this, *i));
694 { 849
695 connection *conn = new connection (this, *i); 850 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
696 conns.push_back (conn);
697 conn->establish_connection (); 851 (*c)->establish_connection ();
698 }
699} 852}
700 853
701connection *vpn::find_router () 854bool
855vpn::can_direct (conf_node *src, conf_node *dst) const
702{ 856{
703 u32 prio = 1; 857 return src != dst
858 && src->may_direct (dst)
859 && dst->may_direct (src)
860 && (((src->protocols & dst->protocols) && src->connectmode == conf_node::C_ALWAYS)
861 || (src->protocols & dst->connectable_protocols ()));
862}
863
864// only works for indirect and routed connections: find a router
865// from THISNODE to dst
866connection *
867vpn::find_router_for (const connection *dst)
868{
704 connection *router = 0; 869 connection *router = 0;
705 870
871 // first try to find a router with a direct connection, route there
872 // regardless of any other considerations.
873 {
874 u32 prio = 1;
875
876 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
877 {
878 connection *c = *i;
879
880 if (c->conf->routerprio > prio
881 && c->conf != THISNODE
882 && can_direct (c->conf, dst->conf)
883 && c->ictx && c->octx)
884 {
885 prio = c->conf->routerprio;
886 router = c;
887 }
888 }
889 }
890
891 if (router)
892 return router;
893
894 // second try find the router with the highest priority, higher than ours
895 {
896 u32 prio = THISNODE->routerprio ? THISNODE->routerprio : 1;
897
898 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
899 {
900 connection *c = *i;
901
902 if (c->conf->routerprio > prio
903 && c != dst
904 && c->conf != THISNODE
905 && c->ictx && c->octx)
906 {
907 prio = c->conf->routerprio;
908 router = c;
909 }
910 }
911 }
912
913 return router;
914}
915
916void
917vpn::connection_established (connection *c)
918{
706 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 919 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
707 { 920 {
708 connection *c = *i; 921 connection *o = *i;
709 922
710 if (c->conf->routerprio > prio 923 if (!o->is_direct
711 && c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use 924 && o->si.valid ()
712 && c->ictx && c->octx 925 && c->si != o->si
713 && c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode 926 && c == find_router_for (o))
714 {
715 prio = c->conf->routerprio;
716 router = c;
717 } 927 {
928 slog (L_DEBUG, _("%s: can now route packets via %s, re-keying connection."),
929 o->conf->nodename, c->conf->nodename);
930 o->rekey ();
931 }
718 } 932 }
719
720 return router;
721} 933}
722 934
935void
723void vpn::send_connect_request (int id) 936vpn::send_connect_request (connection *c)
724{ 937{
725 connection *c = find_router (); 938 connection *r = find_router_for (c);
726 939
727 if (c) 940 if (r)
941 {
942 slog (L_TRACE, _("%s: no address known, sending mediated connection request via %s."),
943 c->conf->nodename, r->conf->nodename);
728 c->send_connect_request (id); 944 r->send_connect_request (c->conf->id);
945 }
729 else 946 else
730 // no router found, aggressively connect to all routers 947 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) 948 c->conf->nodename);
732 if ((*i)->conf->routerprio && (*i)->conf != THISNODE)
733 (*i)->establish_connection ();
734} 949}
735 950
736void 951void
737connection::dump_status () 952connection::dump_status ()
738{ 953{
739 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id); 954 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);
740 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"), 955 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),
741 connectmode, conf->connectmode, (const char *)si, (int)prot_minor); 956 connectmode, conf->connectmode, (const char *)si, (int)prot_minor);
742 slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"), 957 slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"),
743 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt); 958 (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} 959}
747 960
748void 961void
749vpn::dump_status () 962vpn::dump_status ()
750{ 963{
751 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 964 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
752 965
753 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 966 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
754 (*c)->dump_status (); 967 (*c)->dump_status ();
755 968
756 slog (L_NOTICE, _("END status dump")); 969 slog (L_NOTICE, _("END status dump"));
757} 970}
758 971
759vpn::vpn (void) 972vpn::vpn (void)
973{
760: event (this, &vpn::event_cb) 974 event .set<vpn, &vpn::event_cb > (this);
761, udpv4_ev_watcher (this, &vpn::udpv4_ev) 975 udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
762, ipv4_ev_watcher (this, &vpn::ipv4_ev) 976 ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
977#if 1//D2
978 ipv42_ev_watcher .set<vpn, &vpn::ipv42_ev > (this);
979#endif
763#if ENABLE_TCP 980#if ENABLE_TCP
764, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 981 tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
765#endif 982#endif
766#if ENABLE_ICMP 983#if ENABLE_ICMP
767, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 984 icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
768#endif 985#endif
769#if ENABLE_DNS 986#if ENABLE_DNS
770, dnsv4_ev_watcher (this, &vpn::dnsv4_ev) 987 dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
771#endif 988#endif
772, tap_ev_watcher (this, &vpn::tap_ev) 989 tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
773{
774} 990}
775 991
776vpn::~vpn () 992vpn::~vpn ()
777{ 993{
778} 994}

Diff Legend

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