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.67 by pcg, Thu Aug 7 16:34:21 2008 UTC vs.
Revision 1.114 by root, Thu Jun 30 11:43:38 2016 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,2011,2013,2016 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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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>
35#include <queue>
36#include <utility>
25 37
38#include <openssl/opensslv.h>
26#include <openssl/rand.h> 39#include <openssl/rand.h>
27#include <openssl/evp.h> 40#include <openssl/evp.h>
28#include <openssl/rsa.h> 41#include <openssl/rsa.h>
29#include <openssl/err.h> 42#include <openssl/err.h>
30 43
31#include "conf.h" 44#include "conf.h"
32#include "slog.h" 45#include "slog.h"
46#include "crypto.h"
33#include "device.h" 47#include "device.h"
34#include "vpn.h" 48#include "vpn.h"
35#include "connection.h" 49#include "connection.h"
50#include "hkdf.h"
36 51
37#include "netcompat.h" 52#include "netcompat.h"
38 53
39#if !HAVE_RAND_PSEUDO_BYTES
40# define RAND_pseudo_bytes RAND_bytes
41#endif
42
43#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 54#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic
44 55
45#define ULTRA_FAST 1 56#define ULTRA_FAST 1
46#define HLOG 15 57#define HLOG 15
47#include "lzf/lzf.h" 58#include "lzf/lzf.h"
48#include "lzf/lzf_c.c" 59#include "lzf/lzf_c.c"
49#include "lzf/lzf_d.c" 60#include "lzf/lzf_d.c"
50 61
62//////////////////////////////////////////////////////////////////////////////
63
64static std::queue< std::pair<run_script_cb *, const char *> > rs_queue;
65static ev::child rs_child_ev;
66
67namespace
68{
69 void // c++ requires external linkage here, apparently :(
70 rs_child_cb (ev::child &w, int revents)
71 {
72 w.stop ();
73
74 if (rs_queue.empty ())
75 return;
76
77 pid_t pid = run_script (*rs_queue.front ().first, false);
78 if (pid)
79 {
80 w.set (pid);
81 w.start ();
82 }
83 else
84 slog (L_WARN, rs_queue.front ().second);
85
86 delete rs_queue.front ().first;
87 rs_queue.pop ();
88 }
89};
90
91// despite the fancy name, this is quite a hack
92static void
93run_script_queued (run_script_cb *cb, const char *warnmsg)
94{
95 rs_queue.push (std::make_pair (cb, warnmsg));
96
97 if (!rs_child_ev.is_active ())
98 {
99 rs_child_ev.set<rs_child_cb> ();
100 rs_child_ev ();
101 }
102}
103
104//////////////////////////////////////////////////////////////////////////////
105
51struct crypto_ctx 106struct crypto_ctx
52{ 107{
53 EVP_CIPHER_CTX cctx; 108 EVP_CIPHER_CTX cctx;
54 HMAC_CTX hctx; 109 hmac hctx;
55 110
56 crypto_ctx (const rsachallenge &challenge, int enc); 111 crypto_ctx (const auth_data &auth1, const auth_data &auth2, const ecdh_key &a, const ecdh_key &b, int enc);
57 ~crypto_ctx (); 112 ~crypto_ctx ();
58}; 113};
59 114
60crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 115crypto_ctx::crypto_ctx (const auth_data &auth1, const auth_data &auth2, const ecdh_key &a, const ecdh_key &b, int enc)
61{ 116{
117 ecdh_key s;
118
119 curve25519_combine (a, b, s);
120
121 {
122 u8 mac_key[MAC_KEYSIZE];
123 static const unsigned char mac_info[] = "gvpe mac key";
124
125 hkdf kdf (auth2.rsa.hkdf_salt, sizeof (auth2.rsa.hkdf_salt), HKDF_XTR_HASH ());
126 kdf.extract (auth1.rsa.mac_key, sizeof (auth1.rsa.mac_key));
127 kdf.extract (s, sizeof (s));
128 kdf.extract_done (HKDF_PRF_HASH ());
129 kdf.expand (mac_key, sizeof (mac_key), mac_info, sizeof (mac_info));
130
131 hctx.init (mac_key, MAC_KEYSIZE, MAC_DIGEST ());
132 }
133
134 {
135 u8 cipher_key[CIPHER_KEYSIZE];
136 static const unsigned char cipher_info[] = "gvpe cipher key";
137
138 hkdf kdf (auth2.rsa.hkdf_salt, sizeof (auth2.rsa.hkdf_salt), HKDF_XTR_HASH ());
139 kdf.extract (auth1.rsa.cipher_key, sizeof (auth1.rsa.cipher_key));
140 kdf.extract (s, sizeof (s));
141 kdf.extract_done (HKDF_PRF_HASH ());
142 kdf.expand (cipher_key, sizeof (cipher_key), cipher_info, sizeof (cipher_info));
143
62 EVP_CIPHER_CTX_init (&cctx); 144 EVP_CIPHER_CTX_init (&cctx);
63 require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc)); 145 require (EVP_CipherInit_ex (&cctx, CIPHER (), 0, cipher_key, 0, enc));
64 HMAC_CTX_init (&hctx); 146 }
65 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
66} 147}
67 148
68crypto_ctx::~crypto_ctx () 149crypto_ctx::~crypto_ctx ()
69{ 150{
70 require (EVP_CIPHER_CTX_cleanup (&cctx)); 151 require (EVP_CIPHER_CTX_cleanup (&cctx));
71 HMAC_CTX_cleanup (&hctx); 152}
153
154static inline void
155auth_encrypt (RSA *key, const auth_data &auth, auth_encr &encr)
156{
157 if (RSA_public_encrypt (sizeof (auth.rsa),
158 (unsigned char *)&auth.rsa, (unsigned char *)&encr.rsa,
159 key, RSA_PKCS1_OAEP_PADDING) < 0)
160 fatal ("RSA_public_encrypt error");
161
162 memcpy (&encr.ecdh, &auth.ecdh, sizeof (encr.ecdh));
163}
164
165static inline bool
166auth_decrypt (RSA *key, const auth_encr &encr, auth_data &auth)
167{
168 u8 rsa_decrypt[RSA_KEYLEN];
169
170 if (RSA_private_decrypt (sizeof (encr.rsa),
171 (const unsigned char *)&encr.rsa, (unsigned char *)rsa_decrypt,
172 key, RSA_PKCS1_OAEP_PADDING) != sizeof (auth.rsa))
173 return 0;
174
175 memcpy (&auth.rsa, rsa_decrypt, sizeof (auth.rsa));
176 memcpy (&auth.ecdh, &encr.ecdh, sizeof (auth.ecdh));
177
178 return 1;
72} 179}
73 180
74static void 181static void
75rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 182auth_hash (const auth_data &auth, const ecdh_key &b, auth_mac &mac)
76{ 183{
77 EVP_MD_CTX ctx; 184 hkdf kdf (b, sizeof b, AUTH_DIGEST ()); // use response ecdh b as salt
78 185 kdf.extract (&auth.rsa, sizeof (auth.rsa));
79 EVP_MD_CTX_init (&ctx); 186 kdf.extract_done ();
80 require (EVP_DigestInit (&ctx, RSA_HASH)); 187 kdf.expand (mac, sizeof mac, auth.ecdh, sizeof (auth.ecdh)); // use challenge ecdh b as info
81 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
82 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
84 EVP_MD_CTX_cleanup (&ctx);
85} 188}
86 189
87struct rsa_entry 190void
191connection::generate_auth_data ()
88{ 192{
89 tstamp expire; 193 if (auth_expire < ev_now ())
90 rsaid id;
91 rsachallenge chg;
92};
93
94struct rsa_cache : list<rsa_entry>
95{
96 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
97
98 bool find (const rsaid &id, rsachallenge &chg)
99 {
100 for (iterator i = begin (); i != end (); ++i)
101 { 194 {
102 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ()) 195 // request data
103 { 196 rand_fill (snd_auth.rsa);
104 memcpy (&chg, &i->chg, sizeof chg); 197 curve25519_generate (snd_ecdh_a, snd_auth.ecdh);
105 198
106 erase (i); 199 // eventual response data
107 return true; 200 curve25519_generate (rcv_ecdh_a, rcv_ecdh_b);
108 }
109 } 201 }
110 202
111 if (!cleaner.is_active ()) 203 // every use prolongs the expiry
112 cleaner.again ();
113
114 return false;
115 }
116
117 void gen (rsaid &id, rsachallenge &chg)
118 {
119 rsa_entry e;
120
121 RAND_bytes ((unsigned char *)&id, sizeof id);
122 RAND_bytes ((unsigned char *)&chg, sizeof chg);
123
124 e.expire = ev_now () + RSA_TTL; 204 auth_expire = ev_now () + AUTH_TTL;
125 e.id = id;
126 memcpy (&e.chg, &chg, sizeof chg);
127
128 push_back (e);
129
130 if (!cleaner.is_active ())
131 cleaner.again ();
132 }
133
134 rsa_cache ()
135 {
136 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
137 cleaner.set (RSA_TTL, RSA_TTL);
138 }
139
140} rsa_cache;
141
142void rsa_cache::cleaner_cb (ev::timer &w, int revents)
143{
144 if (empty ())
145 w.stop ();
146 else
147 {
148 for (iterator i = begin (); i != end (); )
149 if (i->expire <= ev_now ())
150 i = erase (i);
151 else
152 ++i;
153 }
154} 205}
155 206
156////////////////////////////////////////////////////////////////////////////// 207//////////////////////////////////////////////////////////////////////////////
157 208
158pkt_queue::pkt_queue (double max_ttl, int max_queue) 209pkt_queue::pkt_queue (double max_ttl, int max_queue)
172 delete p; 223 delete p;
173 224
174 delete [] queue; 225 delete [] queue;
175} 226}
176 227
228void
177void pkt_queue::expire_cb (ev::timer &w, int revents) 229pkt_queue::expire_cb (ev::timer &w, int revents)
178{ 230{
179 ev_tstamp expire = ev_now () - max_ttl; 231 ev_tstamp expire = ev_now () - max_ttl;
180 232
181 for (;;) 233 for (;;)
182 { 234 {
193 245
194 delete get (); 246 delete get ();
195 } 247 }
196} 248}
197 249
250void
198void pkt_queue::put (net_packet *p) 251pkt_queue::put (net_packet *p)
199{ 252{
200 ev_tstamp now = ev_now (); 253 ev_tstamp now = ev_now ();
201 254
202 // start expiry timer 255 // start expiry timer
203 if (empty ()) 256 if (empty ())
212 queue[i].tstamp = now; 265 queue[i].tstamp = now;
213 266
214 i = ni; 267 i = ni;
215} 268}
216 269
217net_packet *pkt_queue::get () 270net_packet *
271pkt_queue::get ()
218{ 272{
219 if (empty ()) 273 if (empty ())
220 return 0; 274 return 0;
221 275
222 net_packet *p = queue[j].pkt; 276 net_packet *p = queue[j].pkt;
246 300
247 bool can (const sockinfo &si) { return can((u32)si.host); } 301 bool can (const sockinfo &si) { return can((u32)si.host); }
248 bool can (u32 host); 302 bool can (u32 host);
249}; 303};
250 304
251net_rate_limiter auth_rate_limiter, reset_rate_limiter; 305static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
252 306
307bool
253bool net_rate_limiter::can (u32 host) 308net_rate_limiter::can (u32 host)
254{ 309{
255 iterator i; 310 iterator i;
256 311
257 for (i = begin (); i != end (); ) 312 for (i = begin (); i != end (); )
258 if (i->host == host) 313 if (i->host == host)
303 } 358 }
304} 359}
305 360
306///////////////////////////////////////////////////////////////////////////// 361/////////////////////////////////////////////////////////////////////////////
307 362
308unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 363void
309
310void hmac_packet::hmac_gen (crypto_ctx *ctx) 364hmac_packet::hmac_gen (crypto_ctx *ctx, u8 *hmac_digest)
311{ 365{
312 unsigned int xlen; 366 ctx->hctx.init ();
313 367 ctx->hctx.add (((unsigned char *) this) + sizeof (hmac_packet), len - sizeof (hmac_packet));
314 HMAC_CTX *hctx = &ctx->hctx; 368 ctx->hctx.digest (hmac_digest);
315
316 HMAC_Init_ex (hctx, 0, 0, 0, 0);
317 HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet),
318 len - sizeof (hmac_packet));
319 HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen);
320} 369}
321 370
322void 371void
323hmac_packet::hmac_set (crypto_ctx *ctx) 372hmac_packet::hmac_set (crypto_ctx *ctx)
324{ 373{
325 hmac_gen (ctx); 374 unsigned char hmac_digest[EVP_MAX_MD_SIZE];
326 375 hmac_gen (ctx, hmac_digest);
327 memcpy (hmac, hmac_digest, HMACLENGTH); 376 memcpy (hmac, hmac_digest, HMACLENGTH);
328} 377}
329 378
330bool 379bool
331hmac_packet::hmac_chk (crypto_ctx *ctx) 380hmac_packet::hmac_chk (crypto_ctx *ctx)
332{ 381{
333 hmac_gen (ctx); 382 unsigned char hmac_digest[EVP_MAX_MD_SIZE];
334 383 hmac_gen (ctx, hmac_digest);
335 return !memcmp (hmac, hmac_digest, HMACLENGTH); 384 return slow_memeq (hmac, hmac_digest, HMACLENGTH);
336} 385}
337 386
387void
338void vpn_packet::set_hdr (ptype type_, unsigned int dst) 388vpn_packet::set_hdr (ptype type_, unsigned int dst)
339{ 389{
340 type = type_; 390 type = type_;
341 391
342 int src = THISNODE->id; 392 int src = THISNODE->id;
343 393
345 srcdst = ((src >> 8) << 4) | (dst >> 8); 395 srcdst = ((src >> 8) << 4) | (dst >> 8);
346 dst1 = dst; 396 dst1 = dst;
347} 397}
348 398
349#define MAXVPNDATA (MAX_MTU - 6 - 6) 399#define MAXVPNDATA (MAX_MTU - 6 - 6)
350#define DATAHDR (sizeof (u32) + RAND_SIZE)
351 400
352struct vpndata_packet : vpn_packet 401struct vpndata_packet : vpn_packet
402{
403 u32 ctr; // seqno
404 u8 data[MAXVPNDATA];
405
406 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
407 tap_packet *unpack (connection *conn, u32 &seqno);
408
409private:
410 const u32 data_hdr_size () const
353 { 411 {
354 u8 data[MAXVPNDATA + DATAHDR]; // seqno 412 // the distance from beginning of packet to data member
355 413 return data - at (0);
356 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
357 tap_packet *unpack (connection *conn, u32 &seqno);
358private:
359
360 const u32 data_hdr_size () const
361 {
362 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
363 }
364 }; 414 }
415};
416
417// expands packet counter (unlike seqno, in network byte order) to counter mode IV
418static unsigned char *
419expand_iv (u32 ctr)
420{
421 static u32 iv[IV_SIZE (CIPHER) / 4];
422
423 require (sizeof (iv) == 4 * 4);
424 require (IV_SIZE (CIPHER) % 4 == 0);
425
426 iv[0] =
427 iv[1] =
428 iv[2] = ctr;
429
430 // I would reuse ctr here to to avoid potential endianness issues,
431 // but it seems openssl wraps around. While this would be still ok,
432 // and I don't even know if its true, let's play safe and initialise
433 // to 0.
434 iv[3] = 0;
435
436 return (unsigned char *)iv;
437}
365 438
366void 439void
367vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno) 440vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno)
368{ 441{
369 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 442 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
371 ptype type = PT_DATA_UNCOMPRESSED; 444 ptype type = PT_DATA_UNCOMPRESSED;
372 445
373#if ENABLE_COMPRESSION 446#if ENABLE_COMPRESSION
374 u8 cdata[MAX_MTU]; 447 u8 cdata[MAX_MTU];
375 448
376 if (conn->features & ENABLE_COMPRESSION) 449 if (conn->features & FEATURE_COMPRESSION)
377 { 450 {
378 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 451 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
379 452
380 if (cl) 453 if (cl)
381 { 454 {
387 d[1] = cl; 460 d[1] = cl;
388 } 461 }
389 } 462 }
390#endif 463#endif
391 464
465 ctr = htonl (seqno);
466
392 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 467 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, expand_iv (ctr)));
393
394 struct {
395#if RAND_SIZE
396 u8 rnd[RAND_SIZE];
397#endif
398 u32 seqno;
399 } datahdr;
400
401 datahdr.seqno = ntohl (seqno);
402#if RAND_SIZE
403 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
404#endif
405 468
406 require (EVP_EncryptUpdate (cctx, 469 require (EVP_EncryptUpdate (cctx,
407 (unsigned char *) data + outl, &outl2, 470 (unsigned char *)data + outl, &outl2,
408 (unsigned char *) &datahdr, DATAHDR)); 471 (unsigned char *)d, l));
409 outl += outl2; 472 outl += outl2;
410 473
411 require (EVP_EncryptUpdate (cctx, 474 // it seems this is a nop for us, but we do it anyways
412 (unsigned char *) data + outl, &outl2, 475 require (EVP_EncryptFinal_ex (cctx, (unsigned char *)data + outl, &outl2));
413 (unsigned char *) d, l));
414 outl += outl2; 476 outl += outl2;
415 477
416 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
417 outl += outl2;
418
419 len = outl + data_hdr_size (); 478 len = data_hdr_size () + outl;
420 479
421 set_hdr (type, dst); 480 set_hdr (type, dst);
422 481
423 hmac_set (conn->octx); 482 hmac_set (conn->octx);
424} 483}
428{ 487{
429 EVP_CIPHER_CTX *cctx = &conn->ictx->cctx; 488 EVP_CIPHER_CTX *cctx = &conn->ictx->cctx;
430 int outl = 0, outl2; 489 int outl = 0, outl2;
431 tap_packet *p = new tap_packet; 490 tap_packet *p = new tap_packet;
432 u8 *d; 491 u8 *d;
433 u32 l = len - data_hdr_size ();
434 492
493 seqno = ntohl (ctr);
494
435 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0)); 495 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, expand_iv (ctr)));
436 496
437#if ENABLE_COMPRESSION 497#if ENABLE_COMPRESSION
438 u8 cdata[MAX_MTU]; 498 u8 cdata[MAX_MTU];
439 499
440 if (type == PT_DATA_COMPRESSED) 500 if (type == PT_DATA_COMPRESSED)
441 d = cdata; 501 d = cdata;
442 else 502 else
443#endif 503#endif
444 d = &(*p)[6 + 6 - DATAHDR]; 504 d = &(*p)[6 + 6];
445 505
446 /* this overwrites part of the src mac, but we fix that later */ 506 // this can overwrite the len/dst/src fields
447 require (EVP_DecryptUpdate (cctx, 507 require (EVP_DecryptUpdate (cctx,
448 d, &outl2, 508 d, &outl2,
449 (unsigned char *)&data, len - data_hdr_size ())); 509 (unsigned char *)&data, len - data_hdr_size ()));
450 outl += outl2; 510 outl += outl2;
451 511
512 // it seems this is a nop for us, but we do it anyways
452 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2)); 513 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
453 outl += outl2; 514 outl += outl2;
454 515
455 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
456
457 id2mac (dst () ? dst() : THISNODE->id, p->dst); 516 id2mac (dst () ? dst() : THISNODE->id, p->dst);
458 id2mac (src (), p->src); 517 id2mac (src (), p->src);
459 518
460#if ENABLE_COMPRESSION 519#if ENABLE_COMPRESSION
461 if (type == PT_DATA_COMPRESSED) 520 if (type == PT_DATA_COMPRESSED)
462 { 521 {
463 u32 cl = (d[DATAHDR] << 8) | d[DATAHDR + 1]; 522 u32 cl = (d[0] << 8) | d[1];
464 523
465 p->len = lzf_decompress (d + DATAHDR + 2, cl < MAX_MTU ? cl : 0, 524 p->len = lzf_decompress (d + 2, cl < MAX_MTU - 2 ? cl : 0,
466 &(*p)[6 + 6], MAX_MTU) 525 &(*p)[6 + 6], MAX_MTU)
467 + 6 + 6; 526 + 6 + 6;
468 } 527 }
469 else 528 else
470 p->len = outl + (6 + 6 - DATAHDR); 529 p->len = outl + (6 + 6);
471#endif 530#endif
472 531
473 return p; 532 return p;
474} 533}
475 534
482 } 541 }
483}; 542};
484 543
485struct config_packet : vpn_packet 544struct config_packet : vpn_packet
486{ 545{
487 // actually, hmaclen cannot be checked because the hmac 546 u8 serial[SERIAL_SIZE];
488 // field comes before this data, so peers with other
489 // hmacs simply will not work.
490 u8 prot_major, prot_minor, randsize, hmaclen; 547 u8 prot_major, prot_minor, randsize;
491 u8 flags, challengelen, features, pad3; 548 u8 flags, features, pad6, pad7, pad8;
492 u32 cipher_nid, digest_nid, hmac_nid; 549 u32 cipher_nid, mac_nid, auth_nid;
493 550
494 void setup (ptype type, int dst); 551 void setup (ptype type, int dst);
495 bool chk_config () const; 552 bool chk_config (const conf_node *conf, const sockinfo &rsi) const;
496 553
497 static u8 get_features () 554 static u8 get_features ()
498 { 555 {
499 u8 f = 0; 556 u8 f = 0;
500#if ENABLE_COMPRESSION 557#if ENABLE_COMPRESSION
508#endif 565#endif
509 return f; 566 return f;
510 } 567 }
511}; 568};
512 569
570void
513void config_packet::setup (ptype type, int dst) 571config_packet::setup (ptype type, int dst)
514{ 572{
515 prot_major = PROTOCOL_MAJOR; 573 prot_major = PROTOCOL_MAJOR;
516 prot_minor = PROTOCOL_MINOR; 574 prot_minor = PROTOCOL_MINOR;
517 randsize = RAND_SIZE;
518 hmaclen = HMACLENGTH;
519 flags = 0; 575 flags = 0;
520 challengelen = sizeof (rsachallenge);
521 features = get_features (); 576 features = get_features ();
522 577
578 strncpy ((char *)serial, conf.serial, sizeof (serial));
579
523 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 580 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER ()));
524 digest_nid = htonl (EVP_MD_type (RSA_HASH));
525 hmac_nid = htonl (EVP_MD_type (DIGEST)); 581 mac_nid = htonl (EVP_MD_type (MAC_DIGEST ()));
582 auth_nid = htonl (EVP_MD_type (AUTH_DIGEST ()));
526 583
527 len = sizeof (*this) - sizeof (net_packet); 584 len = sizeof (*this) - sizeof (net_packet);
528 set_hdr (type, dst); 585 set_hdr (type, dst);
529} 586}
530 587
531bool config_packet::chk_config () const 588bool
589config_packet::chk_config (const conf_node *conf, const sockinfo &rsi) const
532{ 590{
533 if (prot_major != PROTOCOL_MAJOR) 591 if (prot_major != PROTOCOL_MAJOR)
534 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 592 slog (L_WARN, _("%s(%s): major version mismatch (remote %d <=> local %d)"),
535 else if (randsize != RAND_SIZE) 593 conf->nodename, (const char *)rsi, prot_major, PROTOCOL_MAJOR);
536 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
537 else if (hmaclen != HMACLENGTH)
538 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
539 else if (challengelen != sizeof (rsachallenge))
540 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
541 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 594 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER ())))
542 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 595 slog (L_WARN, _("%s(%s): cipher algo mismatch (remote %x <=> local %x)"),
543 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 596 conf->nodename, (const char *)rsi, ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER ()));
544 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
545 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 597 else if (mac_nid != htonl (EVP_MD_type (MAC_DIGEST ())))
546 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 598 slog (L_WARN, _("%s(%s): mac algo mismatch (remote %x <=> local %x)"),
599 conf->nodename, (const char *)rsi, ntohl (mac_nid), EVP_MD_type (MAC_DIGEST ()));
600 else if (auth_nid != htonl (EVP_MD_type (AUTH_DIGEST ())))
601 slog (L_WARN, _("%s(%s): auth algo mismatch (remote %x <=> local %x)"),
602 conf->nodename, (const char *)rsi, ntohl (auth_nid), EVP_MD_type (AUTH_DIGEST ()));
547 else 603 else
604 {
605 int cmp = memcmp (serial, ::conf.serial, sizeof (serial));
606
607 if (cmp > 0)
608 slog (L_WARN, _("%s(%s): remote serial newer than local serial - outdated config?"),
609 conf->nodename, (const char *)rsi);
610 else if (cmp == 0)
548 return true; 611 return true;
612 }
549 613
550 return false; 614 return false;
551} 615}
552 616
553struct auth_req_packet : config_packet 617struct auth_req_packet : config_packet // UNPROTECTED
554{ 618{
555 char magic[8]; 619 char magic[8];
556 u8 initiate; // false if this is just an automatic reply 620 u8 initiate; // false if this is just an automatic reply
557 u8 protocols; // supported protocols (will be patched on forward) 621 u8 protocols; // supported protocols (will be patched on forward)
558 u8 pad2, pad3; 622 u8 pad2, pad3;
559 rsaid id; 623 auth_encr encr;
560 rsaencrdata encr;
561 624
562 auth_req_packet (int dst, bool initiate_, u8 protocols_) 625 auth_req_packet (int dst, bool initiate_, u8 protocols_)
563 { 626 {
564 config_packet::setup (PT_AUTH_REQ, dst); 627 config_packet::setup (PT_AUTH_REQ, dst);
565 strncpy (magic, MAGIC, 8); 628 memcpy (magic, MAGIC, 8);
566 initiate = !!initiate_; 629 initiate = !!initiate_;
567 protocols = protocols_; 630 protocols = protocols_;
568 631
569 len = sizeof (*this) - sizeof (net_packet); 632 len = sizeof (*this) - sizeof (net_packet);
570 } 633 }
571}; 634};
572 635
573struct auth_res_packet : config_packet 636struct auth_res_packet : vpn_packet // UNPROTECTED
574{ 637{
575 rsaid id;
576 u8 pad1, pad2, pad3;
577 u8 response_len; // encrypted length
578 rsaresponse response; 638 auth_response response;
579 639
580 auth_res_packet (int dst) 640 auth_res_packet (int dst)
581 { 641 {
582 config_packet::setup (PT_AUTH_RES, dst); 642 set_hdr (PT_AUTH_RES, dst);
583 643
584 len = sizeof (*this) - sizeof (net_packet); 644 len = sizeof (*this) - sizeof (net_packet);
585 } 645 }
586}; 646};
587 647
617}; 677};
618 678
619///////////////////////////////////////////////////////////////////////////// 679/////////////////////////////////////////////////////////////////////////////
620 680
621void 681void
622connection::connection_established () 682connection::connection_established (const sockinfo &rsi)
623{ 683{
624 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx); 684 if (!have_snd_auth || !have_rcv_auth)
685 return;
625 686
626 if (ictx && octx) 687 si = rsi;
688 protocol = rsi.prot;
689
690 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
691 conf->nodename, (const char *)rsi,
692 vpn->can_direct (THISNODE, conf) ? "direct" : "forwarded",
693 PROTOCOL_MAJOR, prot_minor);
694
695 if (::conf.script_node_up)
696 {
697 run_script_cb *cb = new run_script_cb;
698 cb->set<connection, &connection::script_node_up> (this);
699 run_script_queued (cb, _("node-up command execution failed, continuing."));
627 { 700 }
701
702 delete ictx; ictx = new crypto_ctx (rcv_auth, snd_auth, rcv_ecdh_a, rcv_auth.ecdh, 0);
703 iseqno.reset (ntohl (rcv_auth.rsa.seqno) & 0x7fffffff);
704
705 delete octx; octx = new crypto_ctx (snd_auth, rcv_auth, snd_ecdh_a, snd_ecdh_b , 1);
706 oseqno = ntohl (snd_auth.rsa.seqno) & 0x7fffffff;
707
628 // make sure rekeying timeouts are slightly asymmetric 708 // make sure rekeying timeouts are slightly asymmetric
629 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); 709 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
630 rekey.start (rekey_interval, rekey_interval); 710 rekey.start (rekey_interval, rekey_interval);
711
712 hmac_error = 0.;
713
631 keepalive.start (::conf.keepalive); 714 keepalive.start (::conf.keepalive);
632 715
633 // send queued packets 716 // send queued packets
634 if (ictx && octx)
635 {
636 while (tap_packet *p = (tap_packet *)data_queue.get ()) 717 while (tap_packet *p = (tap_packet *)data_queue.get ())
637 { 718 {
638 if (p->len) send_data_packet (p); 719 if (p->len) send_data_packet (p);
639 delete p; 720 delete p;
640 } 721 }
641 722
642 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 723 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
643 { 724 {
644 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY); 725 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
645 delete p; 726 delete p;
646 }
647 }
648 } 727 }
728
729 vpn->connection_established (this);
730}
731
732void
733connection::reset_si ()
734{
735 if (vpn->can_direct (THISNODE, conf))
736 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
649 else 737 else
650 { 738 {
651 retry_cnt = 0;
652 establish_connection.start (5);
653 keepalive.stop ();
654 rekey.stop ();
655 }
656}
657
658void
659connection::reset_si ()
660{
661 protocol = best_protocol (THISNODE->protocols & conf->protocols);
662
663 // mask out protocols we cannot establish
664 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
665 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
666 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
667
668 if (protocol
669 && (!conf->can_direct (THISNODE)
670 || !THISNODE->can_direct (conf)))
671 {
672 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 739 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
673 protocol = 0; 740 protocol = 0;
674 } 741 }
675 742
676 si.set (conf, protocol); 743 si.set (conf, protocol);
677} 744}
680const sockinfo & 747const sockinfo &
681connection::forward_si (const sockinfo &si) const 748connection::forward_si (const sockinfo &si) const
682{ 749{
683 if (!si.valid ()) 750 if (!si.valid ())
684 { 751 {
685 connection *r = vpn->find_router (); 752 connection *r = vpn->find_router_for (this);
686 753
687 if (r) 754 if (r)
688 { 755 {
689 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"), 756 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
690 conf->nodename, r->conf->nodename, (const char *)r->si); 757 conf->nodename, r->conf->nodename);
691 return r->si; 758 return r->si;
692 } 759 }
693 else 760 else
694 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 761 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
695 conf->nodename); 762 conf->nodename);
696 } 763 }
697 764
698 return si; 765 return si;
699} 766}
700 767
701void 768void
702connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 769connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
703{ 770{
704 if (!vpn->send_vpn_packet (pkt, si, tos)) 771 if (!vpn->send_vpn_packet (pkt, si, tos))
705 reset_connection (); 772 reset_connection ("packet send error");
706} 773}
707 774
708void 775void
709connection::send_ping (const sockinfo &si, u8 pong) 776connection::send_ping (const sockinfo &si, u8 pong)
710{ 777{
711 ping_packet *pkt = new ping_packet; 778 ping_packet *pkt = new ping_packet;
712 779
713 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 780 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
781
782 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
714 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 783 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
715 784
716 delete pkt; 785 delete pkt;
717} 786}
718 787
733void 802void
734connection::send_auth_request (const sockinfo &si, bool initiate) 803connection::send_auth_request (const sockinfo &si, bool initiate)
735{ 804{
736 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 805 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
737 806
738 rsachallenge chg; 807 generate_auth_data ();
739 rsa_cache.gen (pkt->id, chg);
740 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 808 auth_encrypt (conf->rsa_key, snd_auth, pkt->encr);
741 809
742 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 810 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
743
744 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 811 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
745 812
746 delete pkt; 813 delete pkt;
747} 814}
748 815
749void 816void
750connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 817connection::send_auth_response (const sockinfo &si)
751{ 818{
752 auth_res_packet *pkt = new auth_res_packet (conf->id); 819 auth_res_packet *pkt = new auth_res_packet (conf->id);
753 820
754 pkt->id = id; 821 memcpy (pkt->response.ecdh, rcv_ecdh_b, sizeof rcv_ecdh_b);
822 auth_hash (rcv_auth, rcv_ecdh_b, pkt->response.mac);
755 823
756 rsa_hash (id, chg, pkt->response);
757
758 pkt->hmac_set (octx);
759
760 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 824 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
761
762 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 825 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
763 826
764 delete pkt; 827 delete pkt;
765} 828}
766 829
767void 830void
768connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 831connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
769{ 832{
770 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 833 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
771 conf->id, rid, (const char *)rsi); 834 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
835 conf->protocols);
772 836
773 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 837 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
774 838
775 r->hmac_set (octx); 839 r->hmac_set (octx);
776 send_vpn_packet (r, si); 840 send_vpn_packet (r, si);
779} 843}
780 844
781inline void 845inline void
782connection::establish_connection_cb (ev::timer &w, int revents) 846connection::establish_connection_cb (ev::timer &w, int revents)
783{ 847{
784 if (!ictx 848 if (!(ictx && octx)
785 && conf != THISNODE 849 && conf != THISNODE
786 && connectmode != conf_node::C_NEVER 850 && connectmode != conf_node::C_NEVER
787 && connectmode != conf_node::C_DISABLED 851 && connectmode != conf_node::C_DISABLED
788 && !w.is_active ()) 852 && !w.is_active ())
789 { 853 {
790 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection 854 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
791 // and stop trying. should probably be handled by a per-connection expire handler. 855 // and stop trying. should probably be handled by a per-connection expire handler.
792 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ()) 856 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
793 { 857 {
794 reset_connection (); 858 reset_connection ("no demand");
795 return; 859 return;
796 } 860 }
861
862 last_establish_attempt = ev_now ();
797 863
798 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 864 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
799 ? (retry_cnt & 3) + 1 865 ? (retry_cnt & 3) + 1
800 : 1 << (retry_cnt >> 2)); 866 : 1 << (retry_cnt >> 2));
801 867
802 reset_si (); 868 reset_si ();
803 869
804 bool slow = si.prot & PROT_SLOW; 870 bool slow = (si.prot & PROT_SLOW) || (conf->low_power || THISNODE->low_power);
805 871
806 if (si.prot && !si.host) 872 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
807 { 873 {
808 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
809 /*TODO*/ /* start the timer so we don't recurse endlessly */ 874 /*TODO*/ /* start the timer so we don't recurse endlessly */
810 w.start (1); 875 w.start (1);
811 vpn->send_connect_request (conf->id); 876 vpn->send_connect_request (this);
812 } 877 }
813 else 878 else
814 { 879 {
815 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx); 880 if (si.valid ())
881 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
882 conf->nodename, (const char *)si);
816 883
817 const sockinfo &dsi = forward_si (si); 884 const sockinfo &dsi = forward_si (si);
818 885
819 slow = slow || (dsi.prot & PROT_SLOW); 886 slow = slow || (dsi.prot & PROT_SLOW);
820 887
821 if (dsi.valid () && auth_rate_limiter.can (dsi)) 888 if (dsi.valid () && auth_rate_limiter.can (dsi))
822 { 889 {
823 if (retry_cnt < 4) 890 // use ping after the first few retries
891 // TODO: on rekeys, the other node might not interpret ping correctly,
892 // TODO: as it will still have a valid connection
893 if (retry_cnt < 4 && (!conf->low_power || THISNODE->low_power))
824 send_auth_request (dsi, true); 894 send_auth_request (dsi, true);
825 else 895 else
826 send_ping (dsi, 0); 896 send_ping (dsi, 0);
827 } 897 }
828 } 898 }
829 899
830 retry_int *= slow ? 8. : 0.7; 900 retry_int *= slow ? 4. : 0.9;
831 901
832 if (retry_int < conf->max_retry) 902 if (retry_int < conf->max_retry)
833 retry_cnt++; 903 retry_cnt++;
834 else 904 else
835 retry_int = conf->max_retry; 905 retry_int = conf->max_retry;
837 w.start (retry_int); 907 w.start (retry_int);
838 } 908 }
839} 909}
840 910
841void 911void
842connection::reset_connection () 912connection::reset_connection (const char *reason)
843{ 913{
844 if (ictx && octx) 914 if (ictx && octx)
845 { 915 {
846 slog (L_INFO, _("%s(%s): connection lost"), 916 slog (L_INFO, _("%s(%s): connection lost (%s)"),
847 conf->nodename, (const char *)si); 917 conf->nodename, (const char *)si, reason);
848 918
849 if (::conf.script_node_down) 919 if (::conf.script_node_down)
850 { 920 {
851 run_script_cb cb; 921 run_script_cb *cb = new run_script_cb;
852 cb.set<connection, &connection::script_node_down> (this); 922 cb->set<connection, &connection::script_node_down> (this);
853 if (!run_script (cb, false))
854 slog (L_WARN, _("node-down command execution failed, continuing.")); 923 run_script_queued (cb, _("node-down command execution failed, continuing."));
855 } 924 }
856 } 925 }
857 926
858 delete ictx; ictx = 0; 927 delete ictx; ictx = 0;
859 delete octx; octx = 0; 928 delete octx; octx = 0;
860#if ENABLE_DNS
861 dnsv4_reset_connection ();
862#endif
863 929
864 si.host = 0; 930 si.host = 0;
865 931
932 have_snd_auth = false;
933 have_rcv_auth = false;
934 auth_expire = 0.;
935
866 last_activity = 0; 936 last_activity = 0.;
937 //last_si_change = 0.;
867 retry_cnt = 0; 938 retry_cnt = 0;
868 939
869 rekey.stop (); 940 rekey.stop ();
870 keepalive.stop (); 941 keepalive.stop ();
871 establish_connection.stop (); 942 establish_connection.stop ();
875connection::shutdown () 946connection::shutdown ()
876{ 947{
877 if (ictx && octx) 948 if (ictx && octx)
878 send_reset (si); 949 send_reset (si);
879 950
880 reset_connection (); 951 reset_connection ("shutdown");
881} 952}
882 953
954// poor-man's rekeying
883inline void 955inline void
884connection::rekey_cb (ev::timer &w, int revents) 956connection::rekey_cb (ev::timer &w, int revents)
885{ 957{
886 reset_connection (); 958 reset_connection ("rekeying");
887 establish_connection (); 959 establish_connection ();
888} 960}
889 961
890void 962void
891connection::send_data_packet (tap_packet *pkt) 963connection::send_data_packet (tap_packet *pkt)
905 if (oseqno > MAX_SEQNO) 977 if (oseqno > MAX_SEQNO)
906 rekey (); 978 rekey ();
907} 979}
908 980
909void 981void
982connection::post_inject_queue ()
983{
984 // force a connection every now and when when packets are sent (max 1/s)
985 if (ev_now () - last_establish_attempt >= (conf->low_power || THISNODE->low_power ? 2.95 : 0.95)) // arbitrary
986 establish_connection.stop ();
987
988 establish_connection ();
989}
990
991void
910connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 992connection::inject_data_packet (tap_packet *pkt)
911{ 993{
912 if (ictx && octx) 994 if (ictx && octx)
913 send_data_packet (pkt); 995 send_data_packet (pkt);
914 else 996 else
915 { 997 {
916 if (!broadcast)
917 data_queue.put (new tap_packet (*pkt)); 998 data_queue.put (new tap_packet (*pkt));
918 999 post_inject_queue ();
919 establish_connection ();
920 } 1000 }
921} 1001}
922 1002
1003void
923void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1004connection::inject_vpn_packet (vpn_packet *pkt, int tos)
924{ 1005{
925 if (ictx && octx) 1006 if (ictx && octx)
926 send_vpn_packet (pkt, si, tos); 1007 send_vpn_packet (pkt, si, tos);
927 else 1008 else
928 { 1009 {
929 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1010 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
930 1011 post_inject_queue ();
931 establish_connection ();
932 } 1012 }
933} 1013}
934 1014
935void 1015void
936connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1016connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
937{ 1017{
938 last_activity = ev_now (); 1018 last_activity = ev_now ();
939 1019
940 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1020 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
941 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1021 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
942 1022
943 if (connectmode == conf_node::C_DISABLED) 1023 if (connectmode == conf_node::C_DISABLED)
944 return; 1024 return;
945 1025
946 switch (pkt->typ ()) 1026 switch (pkt->typ ())
947 { 1027 {
948 case vpn_packet::PT_PING: 1028 case vpn_packet::PT_PING:
1029 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1030
949 // we send pings instead of auth packets after some retries, 1031 // we send pings instead of auth packets after some retries,
950 // so reset the retry counter and establish a connection 1032 // so reset the retry counter and establish a connection
951 // when we receive a ping. 1033 // when we receive a ping.
952 if (!ictx) 1034 if (!ictx)
953 { 1035 {
954 if (auth_rate_limiter.can (rsi)) 1036 if (auth_rate_limiter.can (rsi))
955 send_auth_request (rsi, true); 1037 send_auth_request (rsi, true);
956 } 1038 }
957 else 1039 else
1040 // we would love to change the socket address here, but ping's aren't
1041 // authenticated, so we best ignore it.
958 send_ping (rsi, 1); // pong 1042 send_ping (rsi, 1); // pong
959 1043
960 break; 1044 break;
961 1045
962 case vpn_packet::PT_PONG: 1046 case vpn_packet::PT_PONG:
1047 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1048
1049 // a PONG might mean that the other side doesn't really know
1050 // about our desire for communication.
1051 establish_connection ();
963 break; 1052 break;
964 1053
965 case vpn_packet::PT_RESET: 1054 case vpn_packet::PT_RESET:
1055 slog (L_TRACE, "%s >> PT_RESET", conf->nodename);
1056
1057 if (ictx && octx)
966 { 1058 {
967 reset_connection (); 1059 reset_connection ("remote reset");
968 1060
969 config_packet *p = (config_packet *) pkt; 1061 config_packet *p = (config_packet *) pkt;
970 1062
971 if (!p->chk_config ()) 1063 if (p->chk_config (conf, rsi) && connectmode == conf_node::C_ALWAYS)
972 {
973 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"),
974 conf->nodename, (const char *)rsi);
975 connectmode = conf_node::C_DISABLED;
976 }
977 else if (connectmode == conf_node::C_ALWAYS)
978 establish_connection (); 1064 establish_connection ();
979 } 1065 }
1066
980 break; 1067 break;
981 1068
982 case vpn_packet::PT_AUTH_REQ: 1069 case vpn_packet::PT_AUTH_REQ:
983 if (auth_rate_limiter.can (rsi)) 1070 if (auth_rate_limiter.can (rsi))
984 { 1071 {
985 auth_req_packet *p = (auth_req_packet *) pkt; 1072 auth_req_packet *p = (auth_req_packet *)pkt;
986 1073
987 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1074 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
1075 conf->nodename, p->initiate ? "initiate" : "reply",
1076 p->protocols, p->features);
988 1077
989 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1078 if (memcmp (p->magic, MAGIC, 8))
1079 {
1080 slog (L_WARN, _("%s(%s): protocol magic mismatch - stray packet?"),
1081 conf->nodename, (const char *)rsi);
1082 }
1083 else if (p->chk_config (conf, rsi))
990 { 1084 {
991 if (p->prot_minor != PROTOCOL_MINOR) 1085 if (p->prot_minor != PROTOCOL_MINOR)
992 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1086 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
993 conf->nodename, (const char *)rsi, 1087 conf->nodename, (const char *)rsi,
994 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1088 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
995 1089
996 if (p->initiate) 1090 if (p->initiate)
1091 {
997 send_auth_request (rsi, false); 1092 send_auth_request (rsi, false);
998 1093
999 rsachallenge k; 1094 if (ictx && octx)
1095 reset_connection ("reconnect");
1096 }
1000 1097
1098 auth_data auth;
1099
1001 if (!rsa_decrypt (::conf.rsa_key, p->encr, k)) 1100 if (!auth_decrypt (::conf.rsa_key, p->encr, auth))
1002 { 1101 {
1003 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 1102 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
1004 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 1103 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
1005 break;
1006 } 1104 }
1007 else 1105 else
1008 { 1106 {
1009 delete octx; 1107 bool chg = !have_rcv_auth || !slow_memeq (&rcv_auth, &auth, sizeof auth);
1010 1108
1011 octx = new crypto_ctx (k, 1); 1109 rcv_auth = auth;
1012 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1110 have_rcv_auth = true;
1013 1111
1112 send_auth_response (rsi);
1113
1114 if (chg)
1115 {
1014 conf->protocols = p->protocols; 1116 conf->protocols = p->protocols;
1015 features = p->features & config_packet::get_features (); 1117 features = p->features & config_packet::get_features ();
1016 1118
1017 send_auth_response (rsi, p->id, k);
1018
1019 connection_established (); 1119 connection_established (rsi);
1020
1021 break; 1120 }
1022 } 1121 }
1122
1123 break;
1023 } 1124 }
1024 else
1025 slog (L_WARN, _("%s(%s): protocol mismatch"),
1026 conf->nodename, (const char *)rsi);
1027 1125
1028 send_reset (rsi); 1126 send_reset (rsi);
1029 } 1127 }
1030 1128
1031 break; 1129 break;
1032 1130
1033 case vpn_packet::PT_AUTH_RES: 1131 case vpn_packet::PT_AUTH_RES:
1034 { 1132 {
1035 auth_res_packet *p = (auth_res_packet *) pkt; 1133 auth_res_packet *p = (auth_res_packet *)pkt;
1036 1134
1037 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1135 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1038 1136
1039 if (p->chk_config ()) 1137 auth_mac local_mac;
1138 auth_hash (snd_auth, p->response.ecdh, local_mac);
1139
1140 if (!slow_memeq (&p->response.mac, local_mac, sizeof local_mac))
1040 { 1141 {
1041 if (p->prot_minor != PROTOCOL_MINOR)
1042 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1043 conf->nodename, (const char *)rsi,
1044 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1045
1046 rsachallenge chg;
1047
1048 if (!rsa_cache.find (p->id, chg))
1049 {
1050 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1142 slog (L_ERR, _("%s(%s): unrequested or outdated auth response, ignoring."),
1051 conf->nodename, (const char *)rsi); 1143 conf->nodename, (const char *)rsi);
1052 break;
1053 } 1144 }
1054 else 1145 else if (!have_snd_auth)
1055 { 1146 {
1056 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1147 memcpy (snd_ecdh_b, p->response.ecdh, sizeof snd_ecdh_b);
1057 1148
1058 if (!p->hmac_chk (cctx)) 1149 have_snd_auth = true;
1059 {
1060 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1061 "could be an attack, or just corruption or a synchronization error"),
1062 conf->nodename, (const char *)rsi);
1063 break;
1064 }
1065 else
1066 {
1067 rsaresponse h;
1068
1069 rsa_hash (p->id, chg, h);
1070
1071 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h))
1072 {
1073 prot_minor = p->prot_minor;
1074
1075 delete ictx; ictx = cctx;
1076
1077 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1078
1079 si = rsi;
1080 protocol = rsi.prot;
1081
1082 connection_established (); 1150 connection_established (rsi);
1083
1084 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1085 conf->nodename, (const char *)rsi,
1086 p->prot_major, p->prot_minor);
1087
1088 if (::conf.script_node_up)
1089 {
1090 run_script_cb cb;
1091 cb.set<connection, &connection::script_node_up> (this);
1092 if (!run_script (cb, false))
1093 slog (L_WARN, _("node-up command execution failed, continuing."));
1094 }
1095
1096 break;
1097 }
1098 else
1099 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
1100 conf->nodename, (const char *)rsi);
1101 }
1102
1103 delete cctx;
1104 }
1105 } 1151 }
1106 } 1152 }
1107
1108 send_reset (rsi);
1109 break; 1153 break;
1110 1154
1111 case vpn_packet::PT_DATA_COMPRESSED: 1155 case vpn_packet::PT_DATA_COMPRESSED:
1112#if !ENABLE_COMPRESSION 1156#if !ENABLE_COMPRESSION
1113 send_reset (rsi); 1157 send_reset (rsi);
1119 if (ictx && octx) 1163 if (ictx && octx)
1120 { 1164 {
1121 vpndata_packet *p = (vpndata_packet *)pkt; 1165 vpndata_packet *p = (vpndata_packet *)pkt;
1122 1166
1123 if (!p->hmac_chk (ictx)) 1167 if (!p->hmac_chk (ictx))
1168 {
1169 // rekeying often creates temporary hmac auth floods
1170 // we assume they don't take longer than a few seconds normally,
1171 // and suppress messages and resets during that time.
1172 //TODO: should be done per source address
1173 if (!hmac_error)
1174 {
1175 hmac_error = ev_now () + 3;
1176 break;
1177 }
1178 else if (hmac_error >= ev_now ())
1179 break; // silently suppress
1180 else
1181 {
1124 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1182 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1125 "could be an attack, or just corruption or a synchronization error"), 1183 "could be an attack, or just corruption or a synchronization error."),
1126 conf->nodename, (const char *)rsi); 1184 conf->nodename, (const char *)rsi);
1185 // reset
1186 }
1187 }
1127 else 1188 else
1128 { 1189 {
1129 u32 seqno; 1190 u32 seqno;
1130 tap_packet *d = p->unpack (this, seqno); 1191 tap_packet *d = p->unpack (this, seqno);
1192 int seqclass = iseqno.seqno_classify (seqno);
1131 1193
1132 if (iseqno.recv_ok (seqno)) 1194 hmac_error = 0;
1195
1196 if (seqclass == 0) // ok
1133 { 1197 {
1134 vpn->tap->send (d); 1198 vpn->tap->send (d);
1135 1199
1136 if (si != rsi) 1200 if (si != rsi)
1137 { 1201 {
1138 // fast re-sync on source address changes, useful especially for tcp/ip 1202 // fast re-sync on source address changes, useful especially for tcp/ip
1203 //if (last_si_change < ev_now () + 5.)
1139 si = rsi; 1204 // {
1140
1141 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1205 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1142 conf->nodename, (const char *)si, (const char *)rsi); 1206 conf->nodename, (const char *)si, (const char *)rsi);
1207
1208 si = rsi;
1209
1210 if (::conf.script_node_change)
1211 {
1212 run_script_cb *cb = new run_script_cb;
1213 cb->set<connection, &connection::script_node_change> (this);
1214 run_script_queued (cb, _("node-change command execution failed, continuing."));
1215 }
1216
1217 // }
1218 //else
1219 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1220 // conf->nodename, (const char *)si, (const char *)rsi);
1143 } 1221 }
1222 }
1223 else if (seqclass == 1) // far history
1224 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1225 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1226 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1227 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1228 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1229 else if (seqclass == 3) // reset
1230 {
1231 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1232 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1233 send_reset (rsi);
1144 } 1234 }
1145 1235
1146 delete d; 1236 delete d;
1147 break; 1237 break;
1148 } 1238 }
1152 break; 1242 break;
1153 1243
1154 case vpn_packet::PT_CONNECT_REQ: 1244 case vpn_packet::PT_CONNECT_REQ:
1155 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1245 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1156 { 1246 {
1157 connect_req_packet *p = (connect_req_packet *) pkt; 1247 connect_req_packet *p = (connect_req_packet *)pkt;
1158 1248
1159 if (p->id > 0 && p->id <= vpn->conns.size ()) 1249 if (p->id > 0 && p->id <= vpn->conns.size ())
1160 { 1250 {
1161 connection *c = vpn->conns[p->id - 1]; 1251 connection *c = vpn->conns[p->id - 1];
1162 conf->protocols = p->protocols; 1252 conf->protocols = p->protocols;
1163 1253
1164 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1254 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
1255 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1256 p->protocols,
1165 conf->id, p->id, c->ictx && c->octx); 1257 c->ictx && c->octx);
1166 1258
1167 if (c->ictx && c->octx) 1259 if (c->ictx && c->octx)
1168 { 1260 {
1169 // send connect_info packets to both sides, in case one is 1261 // send connect_info packets to both sides, in case one is
1170 // behind a nat firewall (or both ;) 1262 // behind a nat firewall (or both ;)
1193 1285
1194 c->conf->protocols = p->protocols; 1286 c->conf->protocols = p->protocols;
1195 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1287 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1196 p->si.upgrade_protocol (protocol, c->conf); 1288 p->si.upgrade_protocol (protocol, c->conf);
1197 1289
1198 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1290 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,protocols=%02x,protocol=%02x,upgradable=%02x) [%d]",
1199 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1291 conf->nodename,
1292 vpn->conns[p->id - 1]->conf->nodename,
1293 (const char *)p->si,
1294 p->protocols,
1295 protocol,
1296 p->si.supported_protocols (c->conf),
1297 !c->ictx && !c->octx);
1200 1298
1201 const sockinfo &dsi = forward_si (p->si); 1299 const sockinfo &dsi = forward_si (p->si);
1202 1300
1203 if (dsi.valid ()) 1301 if (dsi.valid ())
1204 c->send_auth_request (dsi, true); 1302 c->send_auth_request (dsi, true);
1303 else
1304 slog (L_INFO, "connect info for %s received (%s), but still unable to contact.",
1305 vpn->conns[p->id - 1]->conf->nodename,
1306 (const char *)p->si);
1205 } 1307 }
1206 else 1308 else
1207 slog (L_WARN, 1309 slog (L_WARN,
1208 _("received authenticated connection request from unknown node #%d, config file mismatch?"), 1310 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1209 p->id); 1311 p->id);
1218} 1320}
1219 1321
1220inline void 1322inline void
1221connection::keepalive_cb (ev::timer &w, int revents) 1323connection::keepalive_cb (ev::timer &w, int revents)
1222{ 1324{
1223 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1325 ev_tstamp when = last_activity + ::conf.keepalive - ev::now ();
1326
1327 if (when >= 0)
1328 w.start (when);
1329 else if (when < -15)
1224 { 1330 {
1225 reset_connection (); 1331 reset_connection ("keepalive overdue");
1226 establish_connection (); 1332 establish_connection ();
1227 } 1333 }
1228 else if (ev_now () < last_activity + ::conf.keepalive)
1229 w.start (last_activity + ::conf.keepalive - ev::now ());
1230 else if (conf->connectmode != conf_node::C_ONDEMAND 1334 else if (conf->connectmode != conf_node::C_ONDEMAND
1231 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1335 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1232 { 1336 {
1337 w.start (3);
1233 send_ping (si); 1338 send_ping (si);
1234 w.start (5);
1235 } 1339 }
1236 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1340 else if (when >= -10)
1237 // hold ondemand connections implicitly a few seconds longer 1341 // hold ondemand connections implicitly a few seconds longer
1238 // should delete octx, though, or something like that ;) 1342 // should delete octx, though, or something like that ;)
1239 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1343 w.start (when + 10);
1240 else 1344 else
1241 reset_connection (); 1345 reset_connection ("keepalive timeout");
1242} 1346}
1243 1347
1348void
1244void connection::send_connect_request (int id) 1349connection::send_connect_request (int id)
1245{ 1350{
1246 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1351 connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1247 1352
1248 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1353 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1354 conf->nodename, vpn->conns[id - 1]->conf->nodename,
1355 THISNODE->protocols);
1249 p->hmac_set (octx); 1356 p->hmac_set (octx);
1250 send_vpn_packet (p, si); 1357 send_vpn_packet (p, si);
1251 1358
1252 delete p; 1359 delete p;
1253} 1360}
1254 1361
1362void
1255void connection::script_init_env (const char *ext) 1363connection::script_init_env (const char *ext)
1256{ 1364{
1257 char *env; 1365 char *env;
1258 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env); 1366 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1259 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1367 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1260 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1368 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1261 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1369 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1262 conf->id & 0xff); putenv (env); 1370 conf->id & 0xff); putenv (env);
1263} 1371}
1264 1372
1373void
1265void connection::script_init_connect_env () 1374connection::script_init_connect_env ()
1266{ 1375{
1267 vpn->script_init_env (); 1376 vpn->script_init_env ();
1268 1377
1269 char *env; 1378 char *env;
1270 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1379 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1380 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1271 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1381 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1272 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1382 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1273 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1383 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1274} 1384}
1275 1385
1276inline const char * 1386inline const char *
1277connection::script_node_up () 1387connection::script_node_up ()
1278{ 1388{
1288 1398
1289 return filename; 1399 return filename;
1290} 1400}
1291 1401
1292inline const char * 1402inline const char *
1403connection::script_node_change ()
1404{
1405 script_init_connect_env ();
1406
1407 putenv ((char *)"STATE=change");
1408
1409 char *filename;
1410 asprintf (&filename,
1411 "%s/%s",
1412 confbase,
1413 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1414
1415 return filename;
1416}
1417
1418inline const char *
1293connection::script_node_down () 1419connection::script_node_down ()
1294{ 1420{
1295 script_init_connect_env (); 1421 script_init_connect_env ();
1296 1422
1297 putenv ((char *)"STATE=down"); 1423 putenv ((char *)"STATE=down");
1308connection::connection (struct vpn *vpn, conf_node *conf) 1434connection::connection (struct vpn *vpn, conf_node *conf)
1309: vpn(vpn), conf(conf), 1435: vpn(vpn), conf(conf),
1310#if ENABLE_DNS 1436#if ENABLE_DNS
1311 dns (0), 1437 dns (0),
1312#endif 1438#endif
1313 data_queue(conf->max_ttl, conf->max_queue), 1439 data_queue(conf->max_ttl, conf->max_queue + 1),
1314 vpn_queue(conf->max_ttl, conf->max_queue) 1440 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1315{ 1441{
1316 rekey .set<connection, &connection::rekey_cb > (this); 1442 rekey .set<connection, &connection::rekey_cb > (this);
1317 keepalive .set<connection, &connection::keepalive_cb > (this); 1443 keepalive .set<connection, &connection::keepalive_cb > (this);
1318 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1444 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1319 1445
1446 last_establish_attempt = 0.;
1320 octx = ictx = 0; 1447 octx = ictx = 0;
1321 retry_cnt = 0;
1322
1323 if (!conf->protocols) // make sure some protocol is enabled
1324 conf->protocols = PROT_UDPv4;
1325 1448
1326 connectmode = conf->connectmode; 1449 connectmode = conf->connectmode;
1327 1450
1328 // queue a dummy packet to force an initial connection attempt 1451 // queue a dummy packet to force an initial connection attempt
1329 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED) 1452 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1330 { 1453 vpn_queue.put (new net_packet);
1331 net_packet *p = new net_packet;
1332 p->len = 0;
1333 vpn_queue.put (p);
1334 }
1335 1454
1336 reset_connection (); 1455 reset_connection ("startup");
1337} 1456}
1338 1457
1339connection::~connection () 1458connection::~connection ()
1340{ 1459{
1341 shutdown (); 1460 shutdown ();
1342} 1461}
1343 1462
1463void
1344void connection_init () 1464connection_init ()
1345{ 1465{
1346 auth_rate_limiter.clear (); 1466 auth_rate_limiter.clear ();
1347 reset_rate_limiter.clear (); 1467 reset_rate_limiter.clear ();
1348} 1468}
1349 1469

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines