ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/connection.C
(Generate patch)

Comparing gvpe/src/connection.C (file contents):
Revision 1.48 by pcg, Tue Mar 8 00:32:54 2005 UTC vs.
Revision 1.92 by root, Thu Feb 10 03:59:51 2011 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008,2010 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 <cassert>
25
26#include <list> 34#include <list>
35#include <queue>
36#include <utility>
27 37
28#include <openssl/rand.h> 38#include <openssl/rand.h>
29#include <openssl/evp.h> 39#include <openssl/evp.h>
30#include <openssl/rsa.h> 40#include <openssl/rsa.h>
31#include <openssl/err.h> 41#include <openssl/err.h>
32
33#include "gettext.h"
34 42
35#include "conf.h" 43#include "conf.h"
36#include "slog.h" 44#include "slog.h"
37#include "device.h" 45#include "device.h"
38#include "vpn.h" 46#include "vpn.h"
… …
42 50
43#if !HAVE_RAND_PSEUDO_BYTES 51#if !HAVE_RAND_PSEUDO_BYTES
44# define RAND_pseudo_bytes RAND_bytes 52# define RAND_pseudo_bytes RAND_bytes
45#endif 53#endif
46 54
47#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 55#define MAGIC_OLD "vped\xbd\xc6\xdb\x82" // 8 bytes of magic (still used in the protocol)
56#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic (understood but not generated)
48 57
49#define ULTRA_FAST 1 58#define ULTRA_FAST 1
50#define HLOG 15 59#define HLOG 15
51#include "lzf/lzf.h" 60#include "lzf/lzf.h"
52#include "lzf/lzf_c.c" 61#include "lzf/lzf_c.c"
53#include "lzf/lzf_d.c" 62#include "lzf/lzf_d.c"
63
64//////////////////////////////////////////////////////////////////////////////
65
66static std::queue< std::pair<run_script_cb *, const char *> > rs_queue;
67static ev::child rs_child_ev;
68
69namespace
70{
71 void // c++ requires external linkage here, apparently :(
72 rs_child_cb (ev::child &w, int revents)
73 {
74 w.stop ();
75
76 if (rs_queue.empty ())
77 return;
78
79 pid_t pid = run_script (*rs_queue.front ().first, false);
80 if (pid)
81 {
82 w.set (pid);
83 w.start ();
84 }
85 else
86 slog (L_WARN, rs_queue.front ().second);
87
88 delete rs_queue.front ().first;
89 rs_queue.pop ();
90 }
91};
92
93// despite the fancy name, this is quite a hack
94static void
95run_script_queued (run_script_cb *cb, const char *warnmsg)
96{
97 rs_queue.push (std::make_pair (cb, warnmsg));
98
99 if (!rs_child_ev.is_active ())
100 {
101 rs_child_ev.set<rs_child_cb> ();
102 rs_child_ev ();
103 }
104}
105
106//////////////////////////////////////////////////////////////////////////////
54 107
55struct crypto_ctx 108struct crypto_ctx
56{ 109{
57 EVP_CIPHER_CTX cctx; 110 EVP_CIPHER_CTX cctx;
58 HMAC_CTX hctx; 111 HMAC_CTX hctx;
… …
86 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 139 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
87 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 140 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
88 EVP_MD_CTX_cleanup (&ctx); 141 EVP_MD_CTX_cleanup (&ctx);
89} 142}
90 143
91struct rsa_entry { 144struct rsa_entry
145{
92 tstamp expire; 146 tstamp expire;
93 rsaid id; 147 rsaid id;
94 rsachallenge chg; 148 rsachallenge chg;
95}; 149};
96 150
97struct rsa_cache : list<rsa_entry> 151struct rsa_cache : list<rsa_entry>
98{ 152{
99 void cleaner_cb (time_watcher &w); time_watcher cleaner; 153 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
100 154
101 bool find (const rsaid &id, rsachallenge &chg) 155 bool find (const rsaid &id, rsachallenge &chg)
102 { 156 {
103 for (iterator i = begin (); i != end (); ++i) 157 for (iterator i = begin (); i != end (); ++i)
104 { 158 {
105 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 159 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
106 { 160 {
107 memcpy (&chg, &i->chg, sizeof chg); 161 memcpy (&chg, &i->chg, sizeof chg);
108 162
109 erase (i); 163 erase (i);
110 return true; 164 return true;
111 } 165 }
112 } 166 }
113 167
114 if (cleaner.at < NOW) 168 if (!cleaner.is_active ())
115 cleaner.start (NOW + RSA_TTL); 169 cleaner.again ();
116 170
117 return false; 171 return false;
118 } 172 }
119 173
120 void gen (rsaid &id, rsachallenge &chg) 174 void gen (rsaid &id, rsachallenge &chg)
121 { 175 {
122 rsa_entry e; 176 rsa_entry e;
123 177
124 RAND_bytes ((unsigned char *)&id, sizeof id); 178 RAND_bytes ((unsigned char *)&id, sizeof id);
125 RAND_bytes ((unsigned char *)&chg, sizeof chg); 179 RAND_bytes ((unsigned char *)&chg, sizeof chg);
126 180
127 e.expire = NOW + RSA_TTL; 181 e.expire = ev_now () + RSA_TTL;
128 e.id = id; 182 e.id = id;
129 memcpy (&e.chg, &chg, sizeof chg); 183 memcpy (&e.chg, &chg, sizeof chg);
130 184
131 push_back (e); 185 push_back (e);
132 186
133 if (cleaner.at < NOW) 187 if (!cleaner.is_active ())
134 cleaner.start (NOW + RSA_TTL); 188 cleaner.again ();
135 } 189 }
136 190
137 rsa_cache () 191 rsa_cache ()
138 : cleaner (this, &rsa_cache::cleaner_cb) 192 {
139 { } 193 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
194 cleaner.set (RSA_TTL, RSA_TTL);
195 }
140 196
141} rsa_cache; 197} rsa_cache;
142 198
143void rsa_cache::cleaner_cb (time_watcher &w) 199void
200rsa_cache::cleaner_cb (ev::timer &w, int revents)
144{ 201{
145 if (!empty ()) 202 if (empty ())
203 w.stop ();
204 else
146 { 205 {
147 w.start (NOW + RSA_TTL);
148
149 for (iterator i = begin (); i != end (); ) 206 for (iterator i = begin (); i != end (); )
150 if (i->expire <= NOW) 207 if (i->expire <= ev_now ())
151 i = erase (i); 208 i = erase (i);
152 else 209 else
153 ++i; 210 ++i;
154 } 211 }
155} 212}
156 213
157////////////////////////////////////////////////////////////////////////////// 214//////////////////////////////////////////////////////////////////////////////
158 215
159void pkt_queue::put (net_packet *p) 216pkt_queue::pkt_queue (double max_ttl, int max_queue)
217: max_ttl (max_ttl), max_queue (max_queue)
160{ 218{
161 if (queue[i]) 219 queue = new pkt [max_queue];
162 {
163 delete queue[i];
164 j = (j + 1) % QUEUEDEPTH;
165 }
166 220
167 queue[i] = p;
168
169 i = (i + 1) % QUEUEDEPTH;
170}
171
172net_packet *pkt_queue::get ()
173{
174 net_packet *p = queue[j];
175
176 if (p)
177 {
178 queue[j] = 0;
179 j = (j + 1) % QUEUEDEPTH;
180 }
181
182 return p;
183}
184
185pkt_queue::pkt_queue ()
186{
187 memset (queue, 0, sizeof (queue));
188 i = 0; 221 i = 0;
189 j = 0; 222 j = 0;
223
224 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
190} 225}
191 226
192pkt_queue::~pkt_queue () 227pkt_queue::~pkt_queue ()
193{ 228{
194 for (i = QUEUEDEPTH; --i > 0; ) 229 while (net_packet *p = get ())
230 delete p;
231
195 delete queue[i]; 232 delete [] queue;
196} 233}
197 234
235void
236pkt_queue::expire_cb (ev::timer &w, int revents)
237{
238 ev_tstamp expire = ev_now () - max_ttl;
239
240 for (;;)
241 {
242 if (empty ())
243 break;
244
245 double diff = queue[j].tstamp - expire;
246
247 if (diff >= 0.)
248 {
249 w.start (diff > 0.5 ? diff : 0.5);
250 break;
251 }
252
253 delete get ();
254 }
255}
256
257void
258pkt_queue::put (net_packet *p)
259{
260 ev_tstamp now = ev_now ();
261
262 // start expiry timer
263 if (empty ())
264 expire.start (max_ttl);
265
266 int ni = i + 1 == max_queue ? 0 : i + 1;
267
268 if (ni == j)
269 delete get ();
270
271 queue[i].pkt = p;
272 queue[i].tstamp = now;
273
274 i = ni;
275}
276
277net_packet *
278pkt_queue::get ()
279{
280 if (empty ())
281 return 0;
282
283 net_packet *p = queue[j].pkt;
284 queue[j].pkt = 0;
285
286 j = j + 1 == max_queue ? 0 : j + 1;
287
288 return p;
289}
290
198struct net_rateinfo { 291struct net_rateinfo
292{
199 u32 host; 293 u32 host;
200 double pcnt, diff; 294 double pcnt, diff;
201 tstamp last; 295 tstamp last;
202}; 296};
203 297
… …
213 307
214 bool can (const sockinfo &si) { return can((u32)si.host); } 308 bool can (const sockinfo &si) { return can((u32)si.host); }
215 bool can (u32 host); 309 bool can (u32 host);
216}; 310};
217 311
218net_rate_limiter auth_rate_limiter, reset_rate_limiter; 312static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
219 313
314bool
220bool net_rate_limiter::can (u32 host) 315net_rate_limiter::can (u32 host)
221{ 316{
222 iterator i; 317 iterator i;
223 318
224 for (i = begin (); i != end (); ) 319 for (i = begin (); i != end (); )
225 if (i->host == host) 320 if (i->host == host)
226 break; 321 break;
227 else if (i->last < NOW - NRL_EXPIRE) 322 else if (i->last < ev_now () - NRL_EXPIRE)
228 i = erase (i); 323 i = erase (i);
229 else 324 else
230 i++; 325 i++;
231 326
232 if (i == end ()) 327 if (i == end ())
… …
234 net_rateinfo ri; 329 net_rateinfo ri;
235 330
236 ri.host = host; 331 ri.host = host;
237 ri.pcnt = 1.; 332 ri.pcnt = 1.;
238 ri.diff = NRL_MAXDIF; 333 ri.diff = NRL_MAXDIF;
239 ri.last = NOW; 334 ri.last = ev_now ();
240 335
241 push_front (ri); 336 push_front (ri);
242 337
243 return true; 338 return true;
244 } 339 }
… …
246 { 341 {
247 net_rateinfo ri (*i); 342 net_rateinfo ri (*i);
248 erase (i); 343 erase (i);
249 344
250 ri.pcnt = ri.pcnt * NRL_ALPHA; 345 ri.pcnt = ri.pcnt * NRL_ALPHA;
251 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); 346 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
252 347
253 ri.last = NOW; 348 ri.last = ev_now ();
254 349
255 double dif = ri.diff / ri.pcnt; 350 double dif = ri.diff / ri.pcnt;
256 351
257 bool send = dif > NRL_CUTOFF; 352 bool send = dif > NRL_CUTOFF;
258 353
… …
272 367
273///////////////////////////////////////////////////////////////////////////// 368/////////////////////////////////////////////////////////////////////////////
274 369
275unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 370unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];
276 371
372void
277void hmac_packet::hmac_gen (crypto_ctx *ctx) 373hmac_packet::hmac_gen (crypto_ctx *ctx)
278{ 374{
279 unsigned int xlen; 375 unsigned int xlen;
280 376
281 HMAC_CTX *hctx = &ctx->hctx; 377 HMAC_CTX *hctx = &ctx->hctx;
282 378
… …
300 hmac_gen (ctx); 396 hmac_gen (ctx);
301 397
302 return !memcmp (hmac, hmac_digest, HMACLENGTH); 398 return !memcmp (hmac, hmac_digest, HMACLENGTH);
303} 399}
304 400
401void
305void vpn_packet::set_hdr (ptype type_, unsigned int dst) 402vpn_packet::set_hdr (ptype type_, unsigned int dst)
306{ 403{
307 type = type_; 404 type = type_;
308 405
309 int src = THISNODE->id; 406 int src = THISNODE->id;
310 407
… …
315 412
316#define MAXVPNDATA (MAX_MTU - 6 - 6) 413#define MAXVPNDATA (MAX_MTU - 6 - 6)
317#define DATAHDR (sizeof (u32) + RAND_SIZE) 414#define DATAHDR (sizeof (u32) + RAND_SIZE)
318 415
319struct vpndata_packet : vpn_packet 416struct vpndata_packet : vpn_packet
417{
418 u8 data[MAXVPNDATA + DATAHDR]; // seqno
419
420 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
421 tap_packet *unpack (connection *conn, u32 &seqno);
422
423private:
424 const u32 data_hdr_size () const
320 { 425 {
321 u8 data[MAXVPNDATA + DATAHDR]; // seqno
322
323 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
324 tap_packet *unpack (connection *conn, u32 &seqno);
325private:
326
327 const u32 data_hdr_size () const
328 {
329 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR; 426 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
330 }
331 }; 427 }
428};
332 429
333void 430void
334vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno) 431vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno)
335{ 432{
336 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 433 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
… …
338 ptype type = PT_DATA_UNCOMPRESSED; 435 ptype type = PT_DATA_UNCOMPRESSED;
339 436
340#if ENABLE_COMPRESSION 437#if ENABLE_COMPRESSION
341 u8 cdata[MAX_MTU]; 438 u8 cdata[MAX_MTU];
342 439
343 if (conn->features & ENABLE_COMPRESSION) 440 if (conn->features & FEATURE_COMPRESSION)
344 { 441 {
345 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 442 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
346 443
347 if (cl) 444 if (cl)
348 { 445 {
… …
468 f |= FEATURE_COMPRESSION; 565 f |= FEATURE_COMPRESSION;
469#endif 566#endif
470#if ENABLE_ROHC 567#if ENABLE_ROHC
471 f |= FEATURE_ROHC; 568 f |= FEATURE_ROHC;
472#endif 569#endif
570#if ENABLE_BRIDGING
571 f |= FEATURE_BRIDGING;
572#endif
473 return f; 573 return f;
474 } 574 }
475}; 575};
476 576
577void
477void config_packet::setup (ptype type, int dst) 578config_packet::setup (ptype type, int dst)
478{ 579{
479 prot_major = PROTOCOL_MAJOR; 580 prot_major = PROTOCOL_MAJOR;
480 prot_minor = PROTOCOL_MINOR; 581 prot_minor = PROTOCOL_MINOR;
481 randsize = RAND_SIZE; 582 randsize = RAND_SIZE;
482 hmaclen = HMACLENGTH; 583 hmaclen = HMACLENGTH;
… …
490 591
491 len = sizeof (*this) - sizeof (net_packet); 592 len = sizeof (*this) - sizeof (net_packet);
492 set_hdr (type, dst); 593 set_hdr (type, dst);
493} 594}
494 595
596bool
495bool config_packet::chk_config () const 597config_packet::chk_config () const
496{ 598{
497 if (prot_major != PROTOCOL_MAJOR) 599 if (prot_major != PROTOCOL_MAJOR)
498 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 600 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
499 else if (randsize != RAND_SIZE) 601 else if (randsize != RAND_SIZE)
500 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 602 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
… …
524 rsaencrdata encr; 626 rsaencrdata encr;
525 627
526 auth_req_packet (int dst, bool initiate_, u8 protocols_) 628 auth_req_packet (int dst, bool initiate_, u8 protocols_)
527 { 629 {
528 config_packet::setup (PT_AUTH_REQ, dst); 630 config_packet::setup (PT_AUTH_REQ, dst);
529 strncpy (magic, MAGIC, 8); 631 strncpy (magic, MAGIC_OLD, 8);
530 initiate = !!initiate_; 632 initiate = !!initiate_;
531 protocols = protocols_; 633 protocols = protocols_;
532 634
533 len = sizeof (*this) - sizeof (net_packet); 635 len = sizeof (*this) - sizeof (net_packet);
534 } 636 }
… …
583///////////////////////////////////////////////////////////////////////////// 685/////////////////////////////////////////////////////////////////////////////
584 686
585void 687void
586connection::connection_established () 688connection::connection_established ()
587{ 689{
690 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
691
588 if (ictx && octx) 692 if (ictx && octx)
589 { 693 {
590 connectmode = conf->connectmode;
591
592 // make sure rekeying timeouts are slightly asymmetric 694 // make sure rekeying timeouts are slightly asymmetric
593 rekey.start (NOW + ::conf.rekey 695 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
594 + (conf->id > THISNODE->id ? 10 : 0)); 696 rekey.start (rekey_interval, rekey_interval);
595 keepalive.start (NOW + ::conf.keepalive); 697 keepalive.start (::conf.keepalive);
596 698
597 // send queued packets 699 // send queued packets
598 if (ictx && octx) 700 if (ictx && octx)
599 { 701 {
600 while (tap_packet *p = (tap_packet *)data_queue.get ()) 702 while (tap_packet *p = (tap_packet *)data_queue.get ())
601 { 703 {
602 send_data_packet (p); 704 if (p->len) send_data_packet (p);
603 delete p; 705 delete p;
604 } 706 }
605 707
606 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 708 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
607 { 709 {
608 send_vpn_packet (p, si, IPTOS_RELIABILITY); 710 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
609 delete p; 711 delete p;
610 } 712 }
611 } 713 }
714
715 vpn->connection_established (this);
612 } 716 }
613 else 717 else
614 { 718 {
615 retry_cnt = 0; 719 retry_cnt = 0;
616 establish_connection.start (NOW + 5); 720 establish_connection.start (5);
617 keepalive.stop (); 721 keepalive.stop ();
618 rekey.stop (); 722 rekey.stop ();
619 } 723 }
620} 724}
621 725
622void 726void
623connection::reset_si () 727connection::reset_si ()
624{ 728{
729 if (vpn->can_direct (THISNODE, conf))
625 protocol = best_protocol (THISNODE->protocols & conf->protocols); 730 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
626 731 else
627 // mask out protocols we cannot establish 732 {
628 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 733 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
629 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 734 protocol = 0;
630 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 735 }
631 736
632 si.set (conf, protocol); 737 si.set (conf, protocol);
738
739 is_direct = si.valid ();
633} 740}
634 741
635// ensure sockinfo is valid, forward if necessary 742// ensure sockinfo is valid, forward if necessary
636const sockinfo & 743const sockinfo &
637connection::forward_si (const sockinfo &si) const 744connection::forward_si (const sockinfo &si) const
638{ 745{
639 if (!si.valid ()) 746 if (!si.valid ())
640 { 747 {
641 connection *r = vpn->find_router (); 748 connection *r = vpn->find_router_for (this);
642 749
643 if (r) 750 if (r)
644 { 751 {
645 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"), 752 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
646 conf->nodename, r->conf->nodename, (const char *)r->si); 753 conf->nodename, r->conf->nodename);
647 return r->si; 754 return r->si;
648 } 755 }
649 else 756 else
650 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 757 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
651 conf->nodename); 758 conf->nodename);
652 } 759 }
653 760
654 return si; 761 return si;
655} 762}
… …
665connection::send_ping (const sockinfo &si, u8 pong) 772connection::send_ping (const sockinfo &si, u8 pong)
666{ 773{
667 ping_packet *pkt = new ping_packet; 774 ping_packet *pkt = new ping_packet;
668 775
669 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 776 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
777
778 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
779
670 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 780 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
671 781
672 delete pkt; 782 delete pkt;
673} 783}
674 784
… …
693 803
694 rsachallenge chg; 804 rsachallenge chg;
695 rsa_cache.gen (pkt->id, chg); 805 rsa_cache.gen (pkt->id, chg);
696 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 806 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
697 807
698 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 808 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
699 809
700 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 810 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
701 811
702 delete pkt; 812 delete pkt;
703} 813}
… …
711 821
712 rsa_hash (id, chg, pkt->response); 822 rsa_hash (id, chg, pkt->response);
713 823
714 pkt->hmac_set (octx); 824 pkt->hmac_set (octx);
715 825
716 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 826 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
717 827
718 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 828 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
719 829
720 delete pkt; 830 delete pkt;
721} 831}
722 832
723void 833void
724connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 834connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
725{ 835{
726 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 836 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
727 conf->id, rid, (const char *)rsi); 837 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
728 838
729 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 839 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
730 840
731 r->hmac_set (octx); 841 r->hmac_set (octx);
732 send_vpn_packet (r, si); 842 send_vpn_packet (r, si);
733 843
734 delete r; 844 delete r;
735} 845}
736 846
737void 847inline void
738connection::establish_connection_cb (time_watcher &w) 848connection::establish_connection_cb (ev::timer &w, int revents)
739{ 849{
740 if (!ictx 850 if (!(ictx && octx)
741 && conf != THISNODE 851 && conf != THISNODE
742 && connectmode != conf_node::C_NEVER 852 && connectmode != conf_node::C_NEVER
743 && connectmode != conf_node::C_DISABLED 853 && connectmode != conf_node::C_DISABLED
744 && NOW > w.at) 854 && !w.is_active ())
745 { 855 {
746 w.at = TSTAMP_MAX; // first disable this watcher in case of recursion 856 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
857 // and stop trying. should probably be handled by a per-connection expire handler.
858 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
859 {
860 reset_connection ();
861 return;
862 }
747 863
748 double retry_int = double (retry_cnt & 3 864 last_establish_attempt = ev_now ();
865
866 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
749 ? (retry_cnt & 3) + 1 867 ? (retry_cnt & 3) + 1
750 : 1 << (retry_cnt >> 2)); 868 : 1 << (retry_cnt >> 2));
751 869
752 reset_si (); 870 reset_si ();
753 871
754 bool slow = si.prot & PROT_SLOW; 872 bool slow = si.prot & PROT_SLOW;
755 873
756 if (si.prot && !si.host) 874 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
875 {
876 /*TODO*/ /* start the timer so we don't recurse endlessly */
877 w.start (1);
757 vpn->send_connect_request (conf->id); 878 vpn->send_connect_request (this);
879 }
758 else 880 else
759 { 881 {
882 if (si.valid ())
883 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
884 conf->nodename, (const char *)si);
885
760 const sockinfo &dsi = forward_si (si); 886 const sockinfo &dsi = forward_si (si);
761 887
762 slow = slow || (dsi.prot & PROT_SLOW); 888 slow = slow || (dsi.prot & PROT_SLOW);
763 889
764 if (dsi.valid () && auth_rate_limiter.can (dsi)) 890 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
768 else 894 else
769 send_ping (dsi, 0); 895 send_ping (dsi, 0);
770 } 896 }
771 } 897 }
772 898
773 retry_int *= slow ? 3. : 0.7; 899 retry_int *= slow ? 8. : 0.9;
774 900
775 if (retry_int < conf->max_retry) 901 if (retry_int < conf->max_retry)
776 retry_cnt++; 902 retry_cnt++;
777 else 903 else
778 retry_int = conf->max_retry; 904 retry_int = conf->max_retry;
779 905
780 w.start (NOW + retry_int); 906 w.start (retry_int);
781 } 907 }
782} 908}
783 909
784void 910void
785connection::reset_connection () 911connection::reset_connection ()
… …
788 { 914 {
789 slog (L_INFO, _("%s(%s): connection lost"), 915 slog (L_INFO, _("%s(%s): connection lost"),
790 conf->nodename, (const char *)si); 916 conf->nodename, (const char *)si);
791 917
792 if (::conf.script_node_down) 918 if (::conf.script_node_down)
793 run_script (run_script_cb (this, &connection::script_node_down), false); 919 {
920 run_script_cb *cb = new run_script_cb;
921 cb->set<connection, &connection::script_node_down> (this);
922 run_script_queued (cb, _("node-down command execution failed, continuing."));
923 }
794 } 924 }
795 925
796 delete ictx; ictx = 0; 926 delete ictx; ictx = 0;
797 delete octx; octx = 0; 927 delete octx; octx = 0;
798#if ENABLE_DNS 928#if ENABLE_DNS
799 dnsv4_reset_connection (); 929 dnsv4_reset_connection ();
800#endif 930#endif
801 931
802 si.host = 0; 932 si.host = 0;
803 933
804 last_activity = 0; 934 last_activity = 0.;
935 //last_si_change = 0.;
805 retry_cnt = 0; 936 retry_cnt = 0;
806 937
807 rekey.stop (); 938 rekey.stop ();
808 keepalive.stop (); 939 keepalive.stop ();
809 establish_connection.stop (); 940 establish_connection.stop ();
… …
816 send_reset (si); 947 send_reset (si);
817 948
818 reset_connection (); 949 reset_connection ();
819} 950}
820 951
821void 952// poor-man's rekeying
822connection::rekey_cb (time_watcher &w) 953inline void
954connection::rekey_cb (ev::timer &w, int revents)
823{ 955{
824 reset_connection (); 956 reset_connection ();
825 establish_connection (); 957 establish_connection ();
826} 958}
827 959
… …
843 if (oseqno > MAX_SEQNO) 975 if (oseqno > MAX_SEQNO)
844 rekey (); 976 rekey ();
845} 977}
846 978
847void 979void
980connection::post_inject_queue ()
981{
982 // force a connection every now and when when packets are sent (max 1/s)
983 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
984 establish_connection.stop ();
985
986 establish_connection ();
987}
988
989void
848connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 990connection::inject_data_packet (tap_packet *pkt)
849{ 991{
850 if (ictx && octx) 992 if (ictx && octx)
851 send_data_packet (pkt); 993 send_data_packet (pkt);
852 else 994 else
853 { 995 {
854 if (!broadcast)//DDDD
855 data_queue.put (new tap_packet (*pkt)); 996 data_queue.put (new tap_packet (*pkt));
856 997 post_inject_queue ();
857 establish_connection ();
858 } 998 }
859} 999}
860 1000
1001void
861void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1002connection::inject_vpn_packet (vpn_packet *pkt, int tos)
862{ 1003{
863 if (ictx && octx) 1004 if (ictx && octx)
864 send_vpn_packet (pkt, si, tos); 1005 send_vpn_packet (pkt, si, tos);
865 else 1006 else
866 { 1007 {
867 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1008 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
868 1009 post_inject_queue ();
869 establish_connection ();
870 } 1010 }
871} 1011}
872 1012
873void 1013void
874connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1014connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
875{ 1015{
876 last_activity = NOW; 1016 last_activity = ev_now ();
877 1017
878 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1018 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
879 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1019 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
1020
1021 if (connectmode == conf_node::C_DISABLED)
1022 return;
880 1023
881 switch (pkt->typ ()) 1024 switch (pkt->typ ())
882 { 1025 {
883 case vpn_packet::PT_PING: 1026 case vpn_packet::PT_PING:
1027 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1028
884 // we send pings instead of auth packets after some retries, 1029 // we send pings instead of auth packets after some retries,
885 // so reset the retry counter and establish a connection 1030 // so reset the retry counter and establish a connection
886 // when we receive a ping. 1031 // when we receive a ping.
887 if (!ictx) 1032 if (!ictx)
888 { 1033 {
889 if (auth_rate_limiter.can (rsi)) 1034 if (auth_rate_limiter.can (rsi))
890 send_auth_request (rsi, true); 1035 send_auth_request (rsi, true);
891 } 1036 }
892 else 1037 else
1038 // we would love to change the socket address here, but ping's aren't
1039 // authenticated, so we best ignore it.
893 send_ping (rsi, 1); // pong 1040 send_ping (rsi, 1); // pong
894 1041
895 break; 1042 break;
896 1043
897 case vpn_packet::PT_PONG: 1044 case vpn_packet::PT_PONG:
1045 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1046
1047 // a PONG might mean that the other side doesn't really know
1048 // about our desire for communication.
1049 establish_connection ();
898 break; 1050 break;
899 1051
900 case vpn_packet::PT_RESET: 1052 case vpn_packet::PT_RESET:
901 { 1053 {
902 reset_connection (); 1054 reset_connection ();
903 1055
904 config_packet *p = (config_packet *) pkt; 1056 config_packet *p = (config_packet *) pkt;
905 1057
906 if (!p->chk_config ()) 1058 if (!p->chk_config ())
907 { 1059 {
908 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1060 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
909 conf->nodename, (const char *)rsi); 1061 conf->nodename, (const char *)rsi);
910 connectmode = conf_node::C_DISABLED; 1062 connectmode = conf_node::C_DISABLED;
911 } 1063 }
912 else if (connectmode == conf_node::C_ALWAYS) 1064 else if (connectmode == conf_node::C_ALWAYS)
913 establish_connection (); 1065 establish_connection ();
… …
917 case vpn_packet::PT_AUTH_REQ: 1069 case vpn_packet::PT_AUTH_REQ:
918 if (auth_rate_limiter.can (rsi)) 1070 if (auth_rate_limiter.can (rsi))
919 { 1071 {
920 auth_req_packet *p = (auth_req_packet *) pkt; 1072 auth_req_packet *p = (auth_req_packet *) pkt;
921 1073
922 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1074 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s)", conf->nodename, p->initiate ? "initiate" : "reply");
923 1075
924 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1076 if (p->chk_config ()
1077 && (!strncmp (p->magic, MAGIC_OLD, 8) || !strncmp (p->magic, MAGIC, 8)))
925 { 1078 {
926 if (p->prot_minor != PROTOCOL_MINOR) 1079 if (p->prot_minor != PROTOCOL_MINOR)
927 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1080 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
928 conf->nodename, (const char *)rsi, 1081 conf->nodename, (const char *)rsi,
929 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1082 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
955 1108
956 break; 1109 break;
957 } 1110 }
958 } 1111 }
959 else 1112 else
960 slog (L_WARN, _("%s(%s): protocol mismatch"), 1113 slog (L_WARN, _("%s(%s): protocol mismatch."),
961 conf->nodename, (const char *)rsi); 1114 conf->nodename, (const char *)rsi);
962 1115
963 send_reset (rsi); 1116 send_reset (rsi);
964 } 1117 }
965 1118
966 break; 1119 break;
967 1120
968 case vpn_packet::PT_AUTH_RES: 1121 case vpn_packet::PT_AUTH_RES:
969 { 1122 {
970 auth_res_packet *p = (auth_res_packet *) pkt; 1123 auth_res_packet *p = (auth_res_packet *)pkt;
971 1124
972 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1125 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
973 1126
974 if (p->chk_config ()) 1127 if (p->chk_config ())
975 { 1128 {
976 if (p->prot_minor != PROTOCOL_MINOR) 1129 if (p->prot_minor != PROTOCOL_MINOR)
977 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1130 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
… …
980 1133
981 rsachallenge chg; 1134 rsachallenge chg;
982 1135
983 if (!rsa_cache.find (p->id, chg)) 1136 if (!rsa_cache.find (p->id, chg))
984 { 1137 {
985 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1138 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
986 conf->nodename, (const char *)rsi); 1139 conf->nodename, (const char *)rsi);
987 break; 1140 break;
988 } 1141 }
989 else 1142 else
990 { 1143 {
991 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1144 crypto_ctx *cctx = new crypto_ctx (chg, 0);
992 1145
993 if (!p->hmac_chk (cctx)) 1146 if (!p->hmac_chk (cctx))
994 { 1147 {
995 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1148 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
996 "could be an attack, or just corruption or a synchronization error"), 1149 "could be an attack, or just corruption or a synchronization error."),
997 conf->nodename, (const char *)rsi); 1150 conf->nodename, (const char *)rsi);
998 break; 1151 break;
999 } 1152 }
1000 else 1153 else
1001 { 1154 {
… …
1012 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1165 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1013 1166
1014 si = rsi; 1167 si = rsi;
1015 protocol = rsi.prot; 1168 protocol = rsi.prot;
1016 1169
1170 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1171 conf->nodename, (const char *)rsi,
1172 is_direct ? "direct" : "forwarded",
1173 p->prot_major, p->prot_minor);
1174
1017 connection_established (); 1175 connection_established ();
1018 1176
1019 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1020 conf->nodename, (const char *)rsi,
1021 p->prot_major, p->prot_minor);
1022
1023 if (::conf.script_node_up) 1177 if (::conf.script_node_up)
1024 run_script (run_script_cb (this, &connection::script_node_up), false); 1178 {
1179 run_script_cb *cb = new run_script_cb;
1180 cb->set<connection, &connection::script_node_up> (this);
1181 run_script_queued (cb, _("node-up command execution failed, continuing."));
1182 }
1025 1183
1026 break; 1184 break;
1027 } 1185 }
1028 else 1186 else
1029 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1187 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1030 conf->nodename, (const char *)rsi); 1188 conf->nodename, (const char *)rsi);
1031 } 1189 }
1032 1190
1033 delete cctx; 1191 delete cctx;
1034 } 1192 }
… …
1050 { 1208 {
1051 vpndata_packet *p = (vpndata_packet *)pkt; 1209 vpndata_packet *p = (vpndata_packet *)pkt;
1052 1210
1053 if (!p->hmac_chk (ictx)) 1211 if (!p->hmac_chk (ictx))
1054 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1212 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1055 "could be an attack, or just corruption or a synchronization error"), 1213 "could be an attack, or just corruption or a synchronization error."),
1056 conf->nodename, (const char *)rsi); 1214 conf->nodename, (const char *)rsi);
1057 else 1215 else
1058 { 1216 {
1059 u32 seqno; 1217 u32 seqno;
1060 tap_packet *d = p->unpack (this, seqno); 1218 tap_packet *d = p->unpack (this, seqno);
1219 int seqclass = iseqno.seqno_classify (seqno);
1061 1220
1062 if (iseqno.recv_ok (seqno)) 1221 if (seqclass == 0) // ok
1063 { 1222 {
1064 vpn->tap->send (d); 1223 vpn->tap->send (d);
1065 1224
1066 if (si != rsi) 1225 if (si != rsi)
1067 { 1226 {
1068 // fast re-sync on connection changes, useful especially for tcp/ip 1227 // fast re-sync on source address changes, useful especially for tcp/ip
1228 //if (last_si_change < ev_now () + 5.)
1069 si = rsi; 1229 // {
1070
1071 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1230 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1072 conf->nodename, (const char *)si, (const char *)rsi); 1231 conf->nodename, (const char *)si, (const char *)rsi);
1232
1233 si = rsi;
1234
1235 if (::conf.script_node_change)
1236 {
1237 run_script_cb *cb = new run_script_cb;
1238 cb->set<connection, &connection::script_node_change> (this);
1239 run_script_queued (cb, _("node-change command execution failed, continuing."));
1240 }
1241
1242 // }
1243 //else
1244 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1245 // conf->nodename, (const char *)si, (const char *)rsi);
1073 } 1246 }
1247 }
1248 else if (seqclass == 1) // far history
1249 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1250 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1251 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1252 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1253 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1254 else if (seqclass == 3) // reset
1255 {
1256 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1257 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1258 send_reset (rsi);
1074 } 1259 }
1075 1260
1076 delete d; 1261 delete d;
1077 break; 1262 break;
1078 } 1263 }
… …
1082 break; 1267 break;
1083 1268
1084 case vpn_packet::PT_CONNECT_REQ: 1269 case vpn_packet::PT_CONNECT_REQ:
1085 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1270 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1086 { 1271 {
1087 connect_req_packet *p = (connect_req_packet *) pkt; 1272 connect_req_packet *p = (connect_req_packet *)pkt;
1088 1273
1089 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1274 if (p->id > 0 && p->id <= vpn->conns.size ())
1090 connection *c = vpn->conns[p->id - 1];
1091 conf->protocols = p->protocols;
1092
1093 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1094 conf->id, p->id, c->ictx && c->octx);
1095
1096 if (c->ictx && c->octx)
1097 { 1275 {
1276 connection *c = vpn->conns[p->id - 1];
1277 conf->protocols = p->protocols;
1278
1279 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1280 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1281
1282 if (c->ictx && c->octx)
1283 {
1098 // send connect_info packets to both sides, in case one is 1284 // send connect_info packets to both sides, in case one is
1099 // behind a nat firewall (or both ;) 1285 // behind a nat firewall (or both ;)
1100 c->send_connect_info (conf->id, si, conf->protocols); 1286 c->send_connect_info (conf->id, si, conf->protocols);
1101 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1287 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1288 }
1289 else
1290 c->establish_connection ();
1102 } 1291 }
1103 else 1292 else
1104 c->establish_connection (); 1293 slog (L_WARN,
1294 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1295 p->id);
1105 } 1296 }
1106 1297
1107 break; 1298 break;
1108 1299
1109 case vpn_packet::PT_CONNECT_INFO: 1300 case vpn_packet::PT_CONNECT_INFO:
1110 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1301 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1111 { 1302 {
1112 connect_info_packet *p = (connect_info_packet *)pkt; 1303 connect_info_packet *p = (connect_info_packet *)pkt;
1113 1304
1114 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything 1305 if (p->id > 0 && p->id <= vpn->conns.size ())
1115 { 1306 {
1116 connection *c = vpn->conns[p->id - 1]; 1307 connection *c = vpn->conns[p->id - 1];
1117 1308
1118 c->conf->protocols = p->protocols; 1309 c->conf->protocols = p->protocols;
1119 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1310 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1120 p->si.upgrade_protocol (protocol, c->conf); 1311 p->si.upgrade_protocol (protocol, c->conf);
1121 1312
1122 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1313 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s) [%d]",
1314 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1123 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1315 (const char *)p->si, !c->ictx && !c->octx);
1124 1316
1125 const sockinfo &dsi = forward_si (p->si); 1317 const sockinfo &dsi = forward_si (p->si);
1126 1318
1127 if (dsi.valid ()) 1319 if (dsi.valid ())
1128 c->send_auth_request (dsi, true); 1320 c->send_auth_request (dsi, true);
1129 } 1321 }
1322 else
1323 slog (L_WARN,
1324 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1325 p->id);
1130 } 1326 }
1131 1327
1132 break; 1328 break;
1133 1329
1134 default: 1330 default:
1135 send_reset (rsi); 1331 send_reset (rsi);
1136 break; 1332 break;
1137 } 1333 }
1138} 1334}
1139 1335
1140void connection::keepalive_cb (time_watcher &w) 1336inline void
1337connection::keepalive_cb (ev::timer &w, int revents)
1141{ 1338{
1142 if (NOW >= last_activity + ::conf.keepalive + 30) 1339 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1143 { 1340 {
1144 reset_connection (); 1341 reset_connection ();
1145 establish_connection (); 1342 establish_connection ();
1146 } 1343 }
1147 else if (NOW < last_activity + ::conf.keepalive) 1344 else if (ev_now () < last_activity + ::conf.keepalive)
1148 w.start (last_activity + ::conf.keepalive); 1345 w.start (last_activity + ::conf.keepalive - ev::now ());
1149 else if (conf->connectmode != conf_node::C_ONDEMAND 1346 else if (conf->connectmode != conf_node::C_ONDEMAND
1150 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1347 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1151 { 1348 {
1152 send_ping (si); 1349 send_ping (si);
1153 w.start (NOW + 5); 1350 w.start (3);
1154 } 1351 }
1155 else if (NOW < last_activity + ::conf.keepalive + 10) 1352 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1156 // hold ondemand connections implicitly a few seconds longer 1353 // hold ondemand connections implicitly a few seconds longer
1157 // should delete octx, though, or something like that ;) 1354 // should delete octx, though, or something like that ;)
1158 w.start (last_activity + ::conf.keepalive + 10); 1355 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1159 else 1356 else
1160 reset_connection (); 1357 reset_connection ();
1161} 1358}
1162 1359
1360void
1163void connection::send_connect_request (int id) 1361connection::send_connect_request (int id)
1164{ 1362{
1165 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1363 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1166 1364
1167 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1365 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s)",
1366 conf->nodename, vpn->conns[id - 1]->conf->nodename);
1168 p->hmac_set (octx); 1367 p->hmac_set (octx);
1169 send_vpn_packet (p, si); 1368 send_vpn_packet (p, si);
1170 1369
1171 delete p; 1370 delete p;
1172} 1371}
1173 1372
1174void connection::script_node () 1373void
1374connection::script_init_env (const char *ext)
1175{ 1375{
1176 vpn->script_if_up ();
1177
1178 char *env; 1376 char *env;
1377 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1378 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1379 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1380 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1381 conf->id & 0xff); putenv (env);
1382}
1383
1384void
1385connection::script_init_connect_env ()
1386{
1387 vpn->script_init_env ();
1388
1389 char *env;
1179 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1390 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1391 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1180 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1392 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1181 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1393 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1182 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1394 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1183} 1395}
1184 1396
1397inline const char *
1185const char *connection::script_node_up () 1398connection::script_node_up ()
1186{ 1399{
1187 script_node (); 1400 script_init_connect_env ();
1188 1401
1189 putenv ("STATE=up"); 1402 putenv ((char *)"STATE=up");
1190 1403
1404 char *filename;
1405 asprintf (&filename,
1406 "%s/%s",
1407 confbase,
1191 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1408 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1192}
1193 1409
1410 return filename;
1411}
1412
1413inline const char *
1414connection::script_node_change ()
1415{
1416 script_init_connect_env ();
1417
1418 putenv ((char *)"STATE=change");
1419
1420 char *filename;
1421 asprintf (&filename,
1422 "%s/%s",
1423 confbase,
1424 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1425
1426 return filename;
1427}
1428
1429inline const char *
1194const char *connection::script_node_down () 1430connection::script_node_down ()
1195{ 1431{
1196 script_node (); 1432 script_init_connect_env ();
1197 1433
1198 putenv ("STATE=down"); 1434 putenv ((char *)"STATE=down");
1199 1435
1200 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1436 char *filename;
1437 asprintf (&filename,
1438 "%s/%s",
1439 confbase,
1440 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1441
1442 return filename;
1201} 1443}
1202 1444
1203connection::connection (struct vpn *vpn, conf_node *conf) 1445connection::connection (struct vpn *vpn, conf_node *conf)
1204: vpn(vpn), conf(conf) 1446: vpn(vpn), conf(conf),
1205, rekey (this, &connection::rekey_cb)
1206, keepalive (this, &connection::keepalive_cb)
1207, establish_connection (this, &connection::establish_connection_cb)
1208#if ENABLE_DNS 1447#if ENABLE_DNS
1209, dns (0) 1448 dns (0),
1210#endif 1449#endif
1450 data_queue(conf->max_ttl, conf->max_queue + 1),
1451 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1211{ 1452{
1453 rekey .set<connection, &connection::rekey_cb > (this);
1454 keepalive .set<connection, &connection::keepalive_cb > (this);
1455 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1456
1457 last_establish_attempt = 0.;
1212 octx = ictx = 0; 1458 octx = ictx = 0;
1213 retry_cnt = 0;
1214 1459
1215 if (!conf->protocols) // make sure some protocol is enabled 1460 if (!conf->protocols) // make sure some protocol is enabled
1216 conf->protocols = PROT_UDPv4; 1461 conf->protocols = PROT_UDPv4;
1217 1462
1218 connectmode = conf_node::C_ALWAYS; // initial setting 1463 connectmode = conf->connectmode;
1464
1465 // queue a dummy packet to force an initial connection attempt
1466 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1467 vpn_queue.put (new net_packet);
1468
1219 reset_connection (); 1469 reset_connection ();
1220} 1470}
1221 1471
1222connection::~connection () 1472connection::~connection ()
1223{ 1473{
1224 shutdown (); 1474 shutdown ();
1225} 1475}
1226 1476
1477void
1227void connection_init () 1478connection_init ()
1228{ 1479{
1229 auth_rate_limiter.clear (); 1480 auth_rate_limiter.clear ();
1230 reset_rate_limiter.clear (); 1481 reset_rate_limiter.clear ();
1231} 1482}
1232 1483

Diff Legend

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