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.31 by pcg, Sat Mar 5 19:13:16 2005 UTC vs.
Revision 1.51 by pcg, Sun Aug 10 14:48:57 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines