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.93 by root, Tue Feb 15 13:31:23 2011 UTC vs.
Revision 1.112 by root, Fri Sep 12 10:40:43 2014 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2008,2010,2011 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008,2010,2011,2013 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 it 7 GVPE is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
… …
33 33
34#include <list> 34#include <list>
35#include <queue> 35#include <queue>
36#include <utility> 36#include <utility>
37 37
38#include <openssl/opensslv.h>
38#include <openssl/rand.h> 39#include <openssl/rand.h>
39#include <openssl/evp.h> 40#include <openssl/evp.h>
40#include <openssl/rsa.h> 41#include <openssl/rsa.h>
41#include <openssl/err.h> 42#include <openssl/err.h>
43
44// openssl 0.9.8 compatibility
45#if OPENSSL_VERSION_NUMBER < 0x10100000
46 #define require101(exp) exp
47#else
48 #define require101(exp) require (exp)
49#endif
42 50
43#include "conf.h" 51#include "conf.h"
44#include "slog.h" 52#include "slog.h"
45#include "device.h" 53#include "device.h"
46#include "vpn.h" 54#include "vpn.h"
47#include "connection.h" 55#include "connection.h"
56#include "hkdf.h"
48 57
49#include "netcompat.h" 58#include "netcompat.h"
50 59
51#if !HAVE_RAND_PSEUDO_BYTES
52# define RAND_pseudo_bytes RAND_bytes
53#endif
54
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) 60#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic
57 61
58#define ULTRA_FAST 1 62#define ULTRA_FAST 1
59#define HLOG 15 63#define HLOG 15
60#include "lzf/lzf.h" 64#include "lzf/lzf.h"
61#include "lzf/lzf_c.c" 65#include "lzf/lzf_c.c"
… …
108struct crypto_ctx 112struct crypto_ctx
109{ 113{
110 EVP_CIPHER_CTX cctx; 114 EVP_CIPHER_CTX cctx;
111 HMAC_CTX hctx; 115 HMAC_CTX hctx;
112 116
113 crypto_ctx (const rsachallenge &challenge, int enc); 117 crypto_ctx (const auth_data &auth1, const auth_data &auth2, const ecdh_key &a, const ecdh_key &b, int enc);
114 ~crypto_ctx (); 118 ~crypto_ctx ();
115}; 119};
116 120
117crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 121crypto_ctx::crypto_ctx (const auth_data &auth1, const auth_data &auth2, const ecdh_key &a, const ecdh_key &b, int enc)
118{ 122{
123 ecdh_key s;
124
125 curve25519_combine (a, b, s);
126
127 {
128 u8 mac_key[MAC_KEYSIZE];
129 static const unsigned char mac_info[] = "gvpe mac key";
130
131 hkdf kdf (auth2.rsa.hkdf_salt, sizeof (auth2.rsa.hkdf_salt), HKDF_XTR_HASH ());
132 kdf.extract (auth1.rsa.mac_key, sizeof (auth1.rsa.mac_key));
133 kdf.extract (s, sizeof (s));
134 kdf.extract_done (HKDF_PRF_HASH ());
135 kdf.expand (mac_key, sizeof (mac_key), mac_info, sizeof (mac_info));
136
137 HMAC_CTX_init (&hctx);
138 require101 (HMAC_Init_ex (&hctx, mac_key, MAC_KEYSIZE, MAC_DIGEST (), 0));
139 }
140
141 {
142 u8 cipher_key[CIPHER_KEYSIZE];
143 static const unsigned char cipher_info[] = "gvpe cipher key";
144
145 hkdf kdf (auth2.rsa.hkdf_salt, sizeof (auth2.rsa.hkdf_salt), HKDF_XTR_HASH ());
146 kdf.extract (auth1.rsa.cipher_key, sizeof (auth1.rsa.cipher_key));
147 kdf.extract (s, sizeof (s));
148 kdf.extract_done (HKDF_PRF_HASH ());
149 kdf.expand (cipher_key, sizeof (cipher_key), cipher_info, sizeof (cipher_info));
150
119 EVP_CIPHER_CTX_init (&cctx); 151 EVP_CIPHER_CTX_init (&cctx);
120 require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc)); 152 require (EVP_CipherInit_ex (&cctx, CIPHER (), 0, cipher_key, 0, enc));
121 HMAC_CTX_init (&hctx); 153 }
122 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
123} 154}
124 155
125crypto_ctx::~crypto_ctx () 156crypto_ctx::~crypto_ctx ()
126{ 157{
127 require (EVP_CIPHER_CTX_cleanup (&cctx)); 158 require (EVP_CIPHER_CTX_cleanup (&cctx));
128 HMAC_CTX_cleanup (&hctx); 159 HMAC_CTX_cleanup (&hctx);
129} 160}
130 161
162static inline void
163auth_encrypt (RSA *key, const auth_data &auth, auth_encr &encr)
164{
165 if (RSA_public_encrypt (sizeof (auth.rsa),
166 (unsigned char *)&auth.rsa, (unsigned char *)&encr.rsa,
167 key, RSA_PKCS1_OAEP_PADDING) < 0)
168 fatal ("RSA_public_encrypt error");
169
170 memcpy (&encr.ecdh, &auth.ecdh, sizeof (encr.ecdh));
171}
172
173static inline bool
174auth_decrypt (RSA *key, const auth_encr &encr, auth_data &auth)
175{
176 u8 rsa_decrypt[RSA_KEYLEN];
177
178 if (RSA_private_decrypt (sizeof (encr.rsa),
179 (const unsigned char *)&encr.rsa, (unsigned char *)rsa_decrypt,
180 key, RSA_PKCS1_OAEP_PADDING) != sizeof (auth.rsa))
181 return 0;
182
183 memcpy (&auth.rsa, rsa_decrypt, sizeof (auth.rsa));
184 memcpy (&auth.ecdh, &encr.ecdh, sizeof (auth.ecdh));
185
186 return 1;
187}
188
131static void 189static void
132rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 190auth_hash (const auth_data &auth, const ecdh_key &b, auth_mac &mac)
133{ 191{
134 EVP_MD_CTX ctx; 192 hkdf kdf (b, sizeof b, AUTH_DIGEST ()); // use response ecdh b as salt
135 193 kdf.extract (&auth.rsa, sizeof (auth.rsa));
136 EVP_MD_CTX_init (&ctx); 194 kdf.extract_done ();
137 require (EVP_DigestInit (&ctx, RSA_HASH)); 195 kdf.expand (mac, sizeof mac, auth.ecdh, sizeof (auth.ecdh)); // use challenge ecdh b as info
138 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
139 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
140 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
141 EVP_MD_CTX_cleanup (&ctx);
142} 196}
143 197
144struct rsa_entry 198void
199connection::generate_auth_data ()
145{ 200{
146 tstamp expire; 201 if (auth_expire < ev_now ())
147 rsaid id;
148 rsachallenge chg;
149};
150
151struct rsa_cache : list<rsa_entry>
152{
153 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
154
155 bool find (const rsaid &id, rsachallenge &chg)
156 {
157 for (iterator i = begin (); i != end (); ++i)
158 { 202 {
159 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ()) 203 // request data
160 { 204 rand_fill (snd_auth.rsa);
161 memcpy (&chg, &i->chg, sizeof chg); 205 curve25519_generate (snd_ecdh_a, snd_auth.ecdh);
162 206
163 erase (i); 207 // eventual response data
164 return true; 208 curve25519_generate (rcv_ecdh_a, rcv_ecdh_b);
165 }
166 } 209 }
167 210
168 if (!cleaner.is_active ()) 211 // every use prolongs the expiry
169 cleaner.again ();
170
171 return false;
172 }
173
174 void gen (rsaid &id, rsachallenge &chg)
175 {
176 rsa_entry e;
177
178 RAND_bytes ((unsigned char *)&id, sizeof id);
179 RAND_bytes ((unsigned char *)&chg, sizeof chg);
180
181 e.expire = ev_now () + RSA_TTL; 212 auth_expire = ev_now () + AUTH_TTL;
182 e.id = id;
183 memcpy (&e.chg, &chg, sizeof chg);
184
185 push_back (e);
186
187 if (!cleaner.is_active ())
188 cleaner.again ();
189 }
190
191 rsa_cache ()
192 {
193 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
194 cleaner.set (RSA_TTL, RSA_TTL);
195 }
196
197} rsa_cache;
198
199void
200rsa_cache::cleaner_cb (ev::timer &w, int revents)
201{
202 if (empty ())
203 w.stop ();
204 else
205 {
206 for (iterator i = begin (); i != end (); )
207 if (i->expire <= ev_now ())
208 i = erase (i);
209 else
210 ++i;
211 }
212} 213}
213 214
214////////////////////////////////////////////////////////////////////////////// 215//////////////////////////////////////////////////////////////////////////////
215 216
216pkt_queue::pkt_queue (double max_ttl, int max_queue) 217pkt_queue::pkt_queue (double max_ttl, int max_queue)
… …
365 } 366 }
366} 367}
367 368
368///////////////////////////////////////////////////////////////////////////// 369/////////////////////////////////////////////////////////////////////////////
369 370
370unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];
371
372void 371void
373hmac_packet::hmac_gen (crypto_ctx *ctx) 372hmac_packet::hmac_gen (crypto_ctx *ctx, u8 *hmac_digest)
374{ 373{
375 unsigned int xlen;
376
377 HMAC_CTX *hctx = &ctx->hctx; 374 HMAC_CTX *hctx = &ctx->hctx;
378 375
379 HMAC_Init_ex (hctx, 0, 0, 0, 0); 376 require101 (HMAC_Init_ex (hctx, 0, 0, 0, 0));
380 HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), 377 require101 (HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), len - sizeof (hmac_packet)));
381 len - sizeof (hmac_packet)); 378 require101 (HMAC_Final (hctx, hmac_digest, 0));
382 HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen);
383} 379}
384 380
385void 381void
386hmac_packet::hmac_set (crypto_ctx *ctx) 382hmac_packet::hmac_set (crypto_ctx *ctx)
387{ 383{
388 hmac_gen (ctx); 384 unsigned char hmac_digest[EVP_MAX_MD_SIZE];
389 385 hmac_gen (ctx, hmac_digest);
390 memcpy (hmac, hmac_digest, HMACLENGTH); 386 memcpy (hmac, hmac_digest, HMACLENGTH);
391} 387}
392 388
393bool 389bool
394hmac_packet::hmac_chk (crypto_ctx *ctx) 390hmac_packet::hmac_chk (crypto_ctx *ctx)
395{ 391{
396 hmac_gen (ctx); 392 unsigned char hmac_digest[EVP_MAX_MD_SIZE];
397 393 hmac_gen (ctx, hmac_digest);
398 return !memcmp (hmac, hmac_digest, HMACLENGTH); 394 return slow_memeq (hmac, hmac_digest, HMACLENGTH);
399} 395}
400 396
401void 397void
402vpn_packet::set_hdr (ptype type_, unsigned int dst) 398vpn_packet::set_hdr (ptype type_, unsigned int dst)
403{ 399{
… …
451 d[1] = cl; 447 d[1] = cl;
452 } 448 }
453 } 449 }
454#endif 450#endif
455 451
456 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 452 require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 1));
457 453
458 struct { 454 struct {
459#if RAND_SIZE 455#if RAND_SIZE
460 u8 rnd[RAND_SIZE]; 456 u8 rnd[RAND_SIZE];
461#endif 457#endif
462 u32 seqno; 458 u32 seqno;
463 } datahdr; 459 } datahdr;
464 460
465 datahdr.seqno = ntohl (seqno); 461 datahdr.seqno = ntohl (seqno);
466#if RAND_SIZE 462#if RAND_SIZE
467 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 463 // NB: a constant (per session) random prefix
464 // is likely enough, but we don't take any chances.
465 conn->oiv.get (datahdr.rnd, RAND_SIZE);
468#endif 466#endif
469 467
470 require (EVP_EncryptUpdate (cctx, 468 require (EVP_EncryptUpdate (cctx,
471 (unsigned char *) data + outl, &outl2, 469 (unsigned char *) data + outl, &outl2,
472 (unsigned char *) &datahdr, DATAHDR)); 470 (unsigned char *) &datahdr, DATAHDR));
… …
494 int outl = 0, outl2; 492 int outl = 0, outl2;
495 tap_packet *p = new tap_packet; 493 tap_packet *p = new tap_packet;
496 u8 *d; 494 u8 *d;
497 u32 l = len - data_hdr_size (); 495 u32 l = len - data_hdr_size ();
498 496
499 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0)); 497 require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 0));
500 498
501#if ENABLE_COMPRESSION 499#if ENABLE_COMPRESSION
502 u8 cdata[MAX_MTU]; 500 u8 cdata[MAX_MTU];
503 501
504 if (type == PT_DATA_COMPRESSED) 502 if (type == PT_DATA_COMPRESSED)
505 d = cdata; 503 d = cdata;
506 else 504 else
507#endif 505#endif
508 d = &(*p)[6 + 6 - DATAHDR]; 506 d = &(*p)[6 + 6] - DATAHDR;
509 507
510 /* this overwrites part of the src mac, but we fix that later */ 508 // we play do evil games with the struct layout atm.
509 // pending better solutions, we at least do some verification.
510 // this is fine, as we left ISO territory long ago.
511 require (DATAHDR <= 16);
512 require ((u8 *)(&p->len + 1) == &(*p)[0]);
513
514 // this can overwrite the len/dst/src fields
511 require (EVP_DecryptUpdate (cctx, 515 require (EVP_DecryptUpdate (cctx,
512 d, &outl2, 516 d, &outl2,
513 (unsigned char *)&data, len - data_hdr_size ())); 517 (unsigned char *)&data, len - data_hdr_size ()));
514 outl += outl2; 518 outl += outl2;
515 519
… …
546 } 550 }
547}; 551};
548 552
549struct config_packet : vpn_packet 553struct config_packet : vpn_packet
550{ 554{
551 // actually, hmaclen cannot be checked because the hmac 555 u8 serial[SERIAL_SIZE];
552 // field comes before this data, so peers with other
553 // hmacs simply will not work.
554 u8 prot_major, prot_minor, randsize, hmaclen; 556 u8 prot_major, prot_minor, randsize;
555 u8 flags, challengelen, features, pad3; 557 u8 flags, features, pad6, pad7, pad8;
556 u32 cipher_nid, digest_nid, hmac_nid; 558 u32 cipher_nid, mac_nid, auth_nid;
557 559
558 void setup (ptype type, int dst); 560 void setup (ptype type, int dst);
559 bool chk_config () const; 561 bool chk_config (const conf_node *conf, const sockinfo &rsi) const;
560 562
561 static u8 get_features () 563 static u8 get_features ()
562 { 564 {
563 u8 f = 0; 565 u8 f = 0;
564#if ENABLE_COMPRESSION 566#if ENABLE_COMPRESSION
… …
578config_packet::setup (ptype type, int dst) 580config_packet::setup (ptype type, int dst)
579{ 581{
580 prot_major = PROTOCOL_MAJOR; 582 prot_major = PROTOCOL_MAJOR;
581 prot_minor = PROTOCOL_MINOR; 583 prot_minor = PROTOCOL_MINOR;
582 randsize = RAND_SIZE; 584 randsize = RAND_SIZE;
583 hmaclen = HMACLENGTH;
584 flags = 0; 585 flags = 0;
585 challengelen = sizeof (rsachallenge);
586 features = get_features (); 586 features = get_features ();
587 587
588 strncpy ((char *)serial, conf.serial, sizeof (serial));
589
588 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 590 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER ()));
589 digest_nid = htonl (EVP_MD_type (RSA_HASH));
590 hmac_nid = htonl (EVP_MD_type (DIGEST)); 591 mac_nid = htonl (EVP_MD_type (MAC_DIGEST ()));
592 auth_nid = htonl (EVP_MD_type (AUTH_DIGEST ()));
591 593
592 len = sizeof (*this) - sizeof (net_packet); 594 len = sizeof (*this) - sizeof (net_packet);
593 set_hdr (type, dst); 595 set_hdr (type, dst);
594} 596}
595 597
596bool 598bool
597config_packet::chk_config () const 599config_packet::chk_config (const conf_node *conf, const sockinfo &rsi) const
598{ 600{
599 if (prot_major != PROTOCOL_MAJOR) 601 if (prot_major != PROTOCOL_MAJOR)
600 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 602 slog (L_WARN, _("%s(%s): major version mismatch (remote %d <=> local %d)"),
603 conf->nodename, (const char *)rsi, prot_major, PROTOCOL_MAJOR);
601 else if (randsize != RAND_SIZE) 604 else if (randsize != RAND_SIZE)
602 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 605 slog (L_WARN, _("%s(%s): rand size mismatch (remote %d <=> local %d)"),
603 else if (hmaclen != HMACLENGTH) 606 conf->nodename, (const char *)rsi, randsize, RAND_SIZE);
604 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
605 else if (challengelen != sizeof (rsachallenge))
606 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
607 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 607 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER ())))
608 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 608 slog (L_WARN, _("%s(%s): cipher algo mismatch (remote %x <=> local %x)"),
609 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 609 conf->nodename, (const char *)rsi, ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER ()));
610 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
611 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 610 else if (mac_nid != htonl (EVP_MD_type (MAC_DIGEST ())))
612 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 611 slog (L_WARN, _("%s(%s): mac algo mismatch (remote %x <=> local %x)"),
612 conf->nodename, (const char *)rsi, ntohl (mac_nid), EVP_MD_type (MAC_DIGEST ()));
613 else if (auth_nid != htonl (EVP_MD_type (AUTH_DIGEST ())))
614 slog (L_WARN, _("%s(%s): auth algo mismatch (remote %x <=> local %x)"),
615 conf->nodename, (const char *)rsi, ntohl (auth_nid), EVP_MD_type (AUTH_DIGEST ()));
613 else 616 else
617 {
618 int cmp = memcmp (serial, ::conf.serial, sizeof (serial));
619
620 if (cmp > 0)
621 slog (L_WARN, _("%s(%s): remote serial newer than local serial - outdated config?"),
622 conf->nodename, (const char *)rsi);
623 else if (cmp == 0)
614 return true; 624 return true;
625 }
615 626
616 return false; 627 return false;
617} 628}
618 629
619struct auth_req_packet : config_packet 630struct auth_req_packet : config_packet // UNPROTECTED
620{ 631{
621 char magic[8]; 632 char magic[8];
622 u8 initiate; // false if this is just an automatic reply 633 u8 initiate; // false if this is just an automatic reply
623 u8 protocols; // supported protocols (will be patched on forward) 634 u8 protocols; // supported protocols (will be patched on forward)
624 u8 pad2, pad3; 635 u8 pad2, pad3;
625 rsaid id; 636 auth_encr encr;
626 rsaencrdata encr;
627 637
628 auth_req_packet (int dst, bool initiate_, u8 protocols_) 638 auth_req_packet (int dst, bool initiate_, u8 protocols_)
629 { 639 {
630 config_packet::setup (PT_AUTH_REQ, dst); 640 config_packet::setup (PT_AUTH_REQ, dst);
631 strncpy (magic, MAGIC_OLD, 8); 641 memcpy (magic, MAGIC, 8);
632 initiate = !!initiate_; 642 initiate = !!initiate_;
633 protocols = protocols_; 643 protocols = protocols_;
634 644
635 len = sizeof (*this) - sizeof (net_packet); 645 len = sizeof (*this) - sizeof (net_packet);
636 } 646 }
637}; 647};
638 648
639struct auth_res_packet : config_packet 649struct auth_res_packet : vpn_packet // UNPROTECTED
640{ 650{
641 rsaid id;
642 u8 pad1, pad2, pad3;
643 u8 response_len; // encrypted length
644 rsaresponse response; 651 auth_response response;
645 652
646 auth_res_packet (int dst) 653 auth_res_packet (int dst)
647 { 654 {
648 config_packet::setup (PT_AUTH_RES, dst); 655 set_hdr (PT_AUTH_RES, dst);
649 656
650 len = sizeof (*this) - sizeof (net_packet); 657 len = sizeof (*this) - sizeof (net_packet);
651 } 658 }
652}; 659};
653 660
… …
683}; 690};
684 691
685///////////////////////////////////////////////////////////////////////////// 692/////////////////////////////////////////////////////////////////////////////
686 693
687void 694void
688connection::connection_established () 695connection::connection_established (const sockinfo &rsi)
689{ 696{
690 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx); 697 if (!have_snd_auth || !have_rcv_auth)
698 return;
691 699
692 if (ictx && octx) 700 si = rsi;
701 protocol = rsi.prot;
702
703 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
704 conf->nodename, (const char *)rsi,
705 vpn->can_direct (THISNODE, conf) ? "direct" : "forwarded",
706 PROTOCOL_MAJOR, prot_minor);
707
708 if (::conf.script_node_up)
709 {
710 run_script_cb *cb = new run_script_cb;
711 cb->set<connection, &connection::script_node_up> (this);
712 run_script_queued (cb, _("node-up command execution failed, continuing."));
693 { 713 }
714
715 delete ictx; ictx = new crypto_ctx (rcv_auth, snd_auth, rcv_ecdh_a, rcv_auth.ecdh, 0);
716 iseqno.reset (ntohl (rcv_auth.rsa.seqno) & 0x7fffffff);
717
718 delete octx; octx = new crypto_ctx (snd_auth, rcv_auth, snd_ecdh_a, snd_ecdh_b , 1);
719 oseqno = ntohl (snd_auth.rsa.seqno) & 0x7fffffff;
720
721 oiv.reset ();
722
694 // make sure rekeying timeouts are slightly asymmetric 723 // make sure rekeying timeouts are slightly asymmetric
695 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); 724 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
696 rekey.start (rekey_interval, rekey_interval); 725 rekey.start (rekey_interval, rekey_interval);
726
727 hmac_error = 0.;
728
697 keepalive.start (::conf.keepalive); 729 keepalive.start (::conf.keepalive);
698 730
699 // send queued packets 731 // send queued packets
700 if (ictx && octx)
701 {
702 while (tap_packet *p = (tap_packet *)data_queue.get ()) 732 while (tap_packet *p = (tap_packet *)data_queue.get ())
703 { 733 {
704 if (p->len) send_data_packet (p); 734 if (p->len) send_data_packet (p);
705 delete p; 735 delete p;
706 } 736 }
707 737
708 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 738 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
709 { 739 {
710 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY); 740 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
711 delete p; 741 delete p;
712 } 742 }
713 }
714 743
715 vpn->connection_established (this); 744 vpn->connection_established (this);
716 }
717 else
718 {
719 retry_cnt = 0;
720 establish_connection.start (5);
721 keepalive.stop ();
722 rekey.stop ();
723 }
724} 745}
725 746
726void 747void
727connection::reset_si () 748connection::reset_si ()
728{ 749{
… …
733 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename); 754 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
734 protocol = 0; 755 protocol = 0;
735 } 756 }
736 757
737 si.set (conf, protocol); 758 si.set (conf, protocol);
738
739 is_direct = si.valid ();
740} 759}
741 760
742// ensure sockinfo is valid, forward if necessary 761// ensure sockinfo is valid, forward if necessary
743const sockinfo & 762const sockinfo &
744connection::forward_si (const sockinfo &si) const 763connection::forward_si (const sockinfo &si) const
… …
763 782
764void 783void
765connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 784connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
766{ 785{
767 if (!vpn->send_vpn_packet (pkt, si, tos)) 786 if (!vpn->send_vpn_packet (pkt, si, tos))
768 reset_connection (); 787 reset_connection ("packet send error");
769} 788}
770 789
771void 790void
772connection::send_ping (const sockinfo &si, u8 pong) 791connection::send_ping (const sockinfo &si, u8 pong)
773{ 792{
774 ping_packet *pkt = new ping_packet; 793 ping_packet *pkt = new ping_packet;
775 794
776 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 795 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
777 796
778 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si); 797 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
779
780 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 798 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
781 799
782 delete pkt; 800 delete pkt;
783} 801}
784 802
… …
799void 817void
800connection::send_auth_request (const sockinfo &si, bool initiate) 818connection::send_auth_request (const sockinfo &si, bool initiate)
801{ 819{
802 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 820 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
803 821
804 rsachallenge chg; 822 generate_auth_data ();
805 rsa_cache.gen (pkt->id, chg);
806 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 823 auth_encrypt (conf->rsa_key, snd_auth, pkt->encr);
807 824
808 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si); 825 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
809
810 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 826 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
811 827
812 delete pkt; 828 delete pkt;
813} 829}
814 830
815void 831void
816connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 832connection::send_auth_response (const sockinfo &si)
817{ 833{
818 auth_res_packet *pkt = new auth_res_packet (conf->id); 834 auth_res_packet *pkt = new auth_res_packet (conf->id);
819 835
820 pkt->id = id; 836 memcpy (pkt->response.ecdh, rcv_ecdh_b, sizeof rcv_ecdh_b);
821 837 auth_hash (rcv_auth, rcv_ecdh_b, pkt->response.mac);
822 rsa_hash (id, chg, pkt->response);
823
824 pkt->hmac_set (octx);
825 838
826 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si); 839 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
827
828 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 840 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
829 841
830 delete pkt; 842 delete pkt;
831} 843}
832 844
… …
856 { 868 {
857 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection 869 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
858 // and stop trying. should probably be handled by a per-connection expire handler. 870 // and stop trying. should probably be handled by a per-connection expire handler.
859 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ()) 871 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
860 { 872 {
861 reset_connection (); 873 reset_connection ("no demand");
862 return; 874 return;
863 } 875 }
864 876
865 last_establish_attempt = ev_now (); 877 last_establish_attempt = ev_now ();
866 878
… …
868 ? (retry_cnt & 3) + 1 880 ? (retry_cnt & 3) + 1
869 : 1 << (retry_cnt >> 2)); 881 : 1 << (retry_cnt >> 2));
870 882
871 reset_si (); 883 reset_si ();
872 884
873 bool slow = si.prot & PROT_SLOW; 885 bool slow = (si.prot & PROT_SLOW) || (conf->low_power || THISNODE->low_power);
874 886
875 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf)) 887 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
876 { 888 {
877 /*TODO*/ /* start the timer so we don't recurse endlessly */ 889 /*TODO*/ /* start the timer so we don't recurse endlessly */
878 w.start (1); 890 w.start (1);
… …
888 900
889 slow = slow || (dsi.prot & PROT_SLOW); 901 slow = slow || (dsi.prot & PROT_SLOW);
890 902
891 if (dsi.valid () && auth_rate_limiter.can (dsi)) 903 if (dsi.valid () && auth_rate_limiter.can (dsi))
892 { 904 {
893 if (retry_cnt < 4) 905 // use ping after the first few retries
906 // TODO: on rekeys, the other node might not interpret ping correctly,
907 // TODO: as it will still have a valid connection
908 if (retry_cnt < 4 && (!conf->low_power || THISNODE->low_power))
894 send_auth_request (dsi, true); 909 send_auth_request (dsi, true);
895 else 910 else
896 send_ping (dsi, 0); 911 send_ping (dsi, 0);
897 } 912 }
898 } 913 }
899 914
900 retry_int *= slow ? 8. : 0.9; 915 retry_int *= slow ? 4. : 0.9;
901 916
902 if (retry_int < conf->max_retry) 917 if (retry_int < conf->max_retry)
903 retry_cnt++; 918 retry_cnt++;
904 else 919 else
905 retry_int = conf->max_retry; 920 retry_int = conf->max_retry;
… …
907 w.start (retry_int); 922 w.start (retry_int);
908 } 923 }
909} 924}
910 925
911void 926void
912connection::reset_connection () 927connection::reset_connection (const char *reason)
913{ 928{
914 if (ictx && octx) 929 if (ictx && octx)
915 { 930 {
916 slog (L_INFO, _("%s(%s): connection lost"), 931 slog (L_INFO, _("%s(%s): connection lost (%s)"),
917 conf->nodename, (const char *)si); 932 conf->nodename, (const char *)si, reason);
918 933
919 if (::conf.script_node_down) 934 if (::conf.script_node_down)
920 { 935 {
921 run_script_cb *cb = new run_script_cb; 936 run_script_cb *cb = new run_script_cb;
922 cb->set<connection, &connection::script_node_down> (this); 937 cb->set<connection, &connection::script_node_down> (this);
… …
924 } 939 }
925 } 940 }
926 941
927 delete ictx; ictx = 0; 942 delete ictx; ictx = 0;
928 delete octx; octx = 0; 943 delete octx; octx = 0;
929#if ENABLE_DNS
930 dnsv4_reset_connection ();
931#endif
932 944
933 si.host = 0; 945 si.host = 0;
946
947 have_snd_auth = false;
948 have_rcv_auth = false;
949 auth_expire = 0.;
934 950
935 last_activity = 0.; 951 last_activity = 0.;
936 //last_si_change = 0.; 952 //last_si_change = 0.;
937 retry_cnt = 0; 953 retry_cnt = 0;
938 954
… …
945connection::shutdown () 961connection::shutdown ()
946{ 962{
947 if (ictx && octx) 963 if (ictx && octx)
948 send_reset (si); 964 send_reset (si);
949 965
950 reset_connection (); 966 reset_connection ("shutdown");
951} 967}
952 968
953// poor-man's rekeying 969// poor-man's rekeying
954inline void 970inline void
955connection::rekey_cb (ev::timer &w, int revents) 971connection::rekey_cb (ev::timer &w, int revents)
956{ 972{
957 reset_connection (); 973 reset_connection ("rekeying");
958 establish_connection (); 974 establish_connection ();
959} 975}
960 976
961void 977void
962connection::send_data_packet (tap_packet *pkt) 978connection::send_data_packet (tap_packet *pkt)
… …
979 995
980void 996void
981connection::post_inject_queue () 997connection::post_inject_queue ()
982{ 998{
983 // force a connection every now and when when packets are sent (max 1/s) 999 // force a connection every now and when when packets are sent (max 1/s)
984 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary 1000 if (ev_now () - last_establish_attempt >= (conf->low_power || THISNODE->low_power ? 2.95 : 0.95)) // arbitrary
985 establish_connection.stop (); 1001 establish_connection.stop ();
986 1002
987 establish_connection (); 1003 establish_connection ();
988} 1004}
989 1005
… …
1049 // about our desire for communication. 1065 // about our desire for communication.
1050 establish_connection (); 1066 establish_connection ();
1051 break; 1067 break;
1052 1068
1053 case vpn_packet::PT_RESET: 1069 case vpn_packet::PT_RESET:
1070 slog (L_TRACE, "%s >> PT_RESET", conf->nodename);
1071
1072 if (ictx && octx)
1054 { 1073 {
1055 reset_connection (); 1074 reset_connection ("remote reset");
1056 1075
1057 config_packet *p = (config_packet *) pkt; 1076 config_packet *p = (config_packet *) pkt;
1058 1077
1059 if (!p->chk_config ()) 1078 if (p->chk_config (conf, rsi) && connectmode == conf_node::C_ALWAYS)
1060 {
1061 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
1062 conf->nodename, (const char *)rsi);
1063 connectmode = conf_node::C_DISABLED;
1064 }
1065 else if (connectmode == conf_node::C_ALWAYS)
1066 establish_connection (); 1079 establish_connection ();
1067 } 1080 }
1081
1068 break; 1082 break;
1069 1083
1070 case vpn_packet::PT_AUTH_REQ: 1084 case vpn_packet::PT_AUTH_REQ:
1071 if (auth_rate_limiter.can (rsi)) 1085 if (auth_rate_limiter.can (rsi))
1072 { 1086 {
… …
1074 1088
1075 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)", 1089 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
1076 conf->nodename, p->initiate ? "initiate" : "reply", 1090 conf->nodename, p->initiate ? "initiate" : "reply",
1077 p->protocols, p->features); 1091 p->protocols, p->features);
1078 1092
1093 if (memcmp (p->magic, MAGIC, 8))
1094 {
1095 slog (L_WARN, _("%s(%s): protocol magic mismatch - stray packet?"),
1096 conf->nodename, (const char *)rsi);
1097 }
1079 if (p->chk_config () 1098 else if (p->chk_config (conf, rsi))
1080 && (!memcmp (p->magic, MAGIC_OLD, 8) || !memcmp (p->magic, MAGIC, 8)))
1081 { 1099 {
1082 if (p->prot_minor != PROTOCOL_MINOR) 1100 if (p->prot_minor != PROTOCOL_MINOR)
1083 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1101 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1084 conf->nodename, (const char *)rsi, 1102 conf->nodename, (const char *)rsi,
1085 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1103 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1086 1104
1087 if (p->initiate) 1105 if (p->initiate)
1106 {
1088 send_auth_request (rsi, false); 1107 send_auth_request (rsi, false);
1089 1108
1090 rsachallenge k; 1109 if (ictx && octx)
1110 reset_connection ("reconnect");
1111 }
1091 1112
1113 auth_data auth;
1114
1092 if (!rsa_decrypt (::conf.rsa_key, p->encr, k)) 1115 if (!auth_decrypt (::conf.rsa_key, p->encr, auth))
1093 { 1116 {
1094 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 1117 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
1095 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 1118 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
1096 break;
1097 } 1119 }
1098 else 1120 else
1099 { 1121 {
1100 delete octx; 1122 bool chg = !have_rcv_auth || !slow_memeq (&rcv_auth, &auth, sizeof auth);
1101 1123
1102 octx = new crypto_ctx (k, 1); 1124 rcv_auth = auth;
1103 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1125 have_rcv_auth = true;
1104 1126
1127 send_auth_response (rsi);
1128
1129 if (chg)
1130 {
1105 conf->protocols = p->protocols; 1131 conf->protocols = p->protocols;
1106 features = p->features & config_packet::get_features (); 1132 features = p->features & config_packet::get_features ();
1107 1133
1108 send_auth_response (rsi, p->id, k);
1109
1110 connection_established (); 1134 connection_established (rsi);
1111
1112 break; 1135 }
1113 } 1136 }
1137
1138 break;
1114 } 1139 }
1115 else
1116 slog (L_WARN, _("%s(%s): protocol mismatch."),
1117 conf->nodename, (const char *)rsi);
1118 1140
1119 send_reset (rsi); 1141 send_reset (rsi);
1120 } 1142 }
1121 1143
1122 break; 1144 break;
… …
1125 { 1147 {
1126 auth_res_packet *p = (auth_res_packet *)pkt; 1148 auth_res_packet *p = (auth_res_packet *)pkt;
1127 1149
1128 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename); 1150 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1129 1151
1130 if (p->chk_config ()) 1152 auth_mac local_mac;
1153 auth_hash (snd_auth, p->response.ecdh, local_mac);
1154
1155 if (!slow_memeq (&p->response.mac, local_mac, sizeof local_mac))
1131 { 1156 {
1132 if (p->prot_minor != PROTOCOL_MINOR)
1133 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1134 conf->nodename, (const char *)rsi,
1135 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1136
1137 rsachallenge chg;
1138
1139 if (!rsa_cache.find (p->id, chg))
1140 {
1141 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."), 1157 slog (L_ERR, _("%s(%s): unrequested or outdated auth response, ignoring."),
1142 conf->nodename, (const char *)rsi); 1158 conf->nodename, (const char *)rsi);
1143 break;
1144 } 1159 }
1145 else 1160 else if (!have_snd_auth)
1146 { 1161 {
1147 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1162 memcpy (snd_ecdh_b, p->response.ecdh, sizeof snd_ecdh_b);
1148 1163
1149 if (!p->hmac_chk (cctx)) 1164 have_snd_auth = true;
1150 {
1151 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1152 "could be an attack, or just corruption or a synchronization error."),
1153 conf->nodename, (const char *)rsi);
1154 break;
1155 }
1156 else
1157 {
1158 rsaresponse h;
1159
1160 rsa_hash (p->id, chg, h);
1161
1162 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h))
1163 {
1164 prot_minor = p->prot_minor;
1165
1166 delete ictx; ictx = cctx;
1167
1168 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1169
1170 si = rsi;
1171 protocol = rsi.prot;
1172
1173 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1174 conf->nodename, (const char *)rsi,
1175 is_direct ? "direct" : "forwarded",
1176 p->prot_major, p->prot_minor);
1177
1178 connection_established (); 1165 connection_established (rsi);
1179
1180 if (::conf.script_node_up)
1181 {
1182 run_script_cb *cb = new run_script_cb;
1183 cb->set<connection, &connection::script_node_up> (this);
1184 run_script_queued (cb, _("node-up command execution failed, continuing."));
1185 }
1186
1187 break;
1188 }
1189 else
1190 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1191 conf->nodename, (const char *)rsi);
1192 }
1193
1194 delete cctx;
1195 }
1196 } 1166 }
1197 } 1167 }
1198
1199 send_reset (rsi);
1200 break; 1168 break;
1201 1169
1202 case vpn_packet::PT_DATA_COMPRESSED: 1170 case vpn_packet::PT_DATA_COMPRESSED:
1203#if !ENABLE_COMPRESSION 1171#if !ENABLE_COMPRESSION
1204 send_reset (rsi); 1172 send_reset (rsi);
… …
1210 if (ictx && octx) 1178 if (ictx && octx)
1211 { 1179 {
1212 vpndata_packet *p = (vpndata_packet *)pkt; 1180 vpndata_packet *p = (vpndata_packet *)pkt;
1213 1181
1214 if (!p->hmac_chk (ictx)) 1182 if (!p->hmac_chk (ictx))
1183 {
1184 // rekeying often creates temporary hmac auth floods
1185 // we assume they don't take longer than a few seconds normally,
1186 // and suppress messages and resets during that time.
1187 //TODO: should be done per source address
1188 if (!hmac_error)
1189 {
1190 hmac_error = ev_now () + 3;
1191 break;
1192 }
1193 else if (hmac_error >= ev_now ())
1194 break; // silently suppress
1195 else
1196 {
1215 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1197 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1216 "could be an attack, or just corruption or a synchronization error."), 1198 "could be an attack, or just corruption or a synchronization error."),
1217 conf->nodename, (const char *)rsi); 1199 conf->nodename, (const char *)rsi);
1200 // reset
1201 }
1202 }
1218 else 1203 else
1219 { 1204 {
1220 u32 seqno; 1205 u32 seqno;
1221 tap_packet *d = p->unpack (this, seqno); 1206 tap_packet *d = p->unpack (this, seqno);
1222 int seqclass = iseqno.seqno_classify (seqno); 1207 int seqclass = iseqno.seqno_classify (seqno);
1208
1209 hmac_error = 0;
1223 1210
1224 if (seqclass == 0) // ok 1211 if (seqclass == 0) // ok
1225 { 1212 {
1226 vpn->tap->send (d); 1213 vpn->tap->send (d);
1227 1214
… …
1313 1300
1314 c->conf->protocols = p->protocols; 1301 c->conf->protocols = p->protocols;
1315 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1302 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1316 p->si.upgrade_protocol (protocol, c->conf); 1303 p->si.upgrade_protocol (protocol, c->conf);
1317 1304
1318 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,p%02x) [%d]", 1305 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,protocols=%02x,protocol=%02x,upgradable=%02x) [%d]",
1319 conf->nodename, 1306 conf->nodename,
1320 vpn->conns[p->id - 1]->conf->nodename, 1307 vpn->conns[p->id - 1]->conf->nodename,
1321 (const char *)p->si, 1308 (const char *)p->si,
1322 p->protocols, 1309 p->protocols,
1310 protocol,
1311 p->si.supported_protocols (c->conf),
1323 !c->ictx && !c->octx); 1312 !c->ictx && !c->octx);
1324 1313
1325 const sockinfo &dsi = forward_si (p->si); 1314 const sockinfo &dsi = forward_si (p->si);
1326 1315
1327 if (dsi.valid ()) 1316 if (dsi.valid ())
1328 c->send_auth_request (dsi, true); 1317 c->send_auth_request (dsi, true);
1318 else
1319 slog (L_INFO, "connect info for %s received (%s), but still unable to contact.",
1320 vpn->conns[p->id - 1]->conf->nodename,
1321 (const char *)p->si);
1329 } 1322 }
1330 else 1323 else
1331 slog (L_WARN, 1324 slog (L_WARN,
1332 _("received authenticated connection request from unknown node #%d, config file mismatch?"), 1325 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1333 p->id); 1326 p->id);
… …
1342} 1335}
1343 1336
1344inline void 1337inline void
1345connection::keepalive_cb (ev::timer &w, int revents) 1338connection::keepalive_cb (ev::timer &w, int revents)
1346{ 1339{
1347 if (ev_now () >= last_activity + ::conf.keepalive + 15) 1340 ev_tstamp when = last_activity + ::conf.keepalive - ev::now ();
1341
1342 if (when >= 0)
1343 w.start (when);
1344 else if (when < -15)
1348 { 1345 {
1349 reset_connection (); 1346 reset_connection ("keepalive overdue");
1350 establish_connection (); 1347 establish_connection ();
1351 } 1348 }
1352 else if (ev_now () < last_activity + ::conf.keepalive)
1353 w.start (last_activity + ::conf.keepalive - ev::now ());
1354 else if (conf->connectmode != conf_node::C_ONDEMAND 1349 else if (conf->connectmode != conf_node::C_ONDEMAND
1355 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1350 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1356 { 1351 {
1352 w.start (3);
1357 send_ping (si); 1353 send_ping (si);
1358 w.start (3);
1359 } 1354 }
1360 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1355 else if (when >= -10)
1361 // hold ondemand connections implicitly a few seconds longer 1356 // hold ondemand connections implicitly a few seconds longer
1362 // should delete octx, though, or something like that ;) 1357 // should delete octx, though, or something like that ;)
1363 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1358 w.start (when + 10);
1364 else 1359 else
1365 reset_connection (); 1360 reset_connection ("keepalive timeout");
1366} 1361}
1367 1362
1368void 1363void
1369connection::send_connect_request (int id) 1364connection::send_connect_request (int id)
1370{ 1365{
… …
1470 1465
1471 // queue a dummy packet to force an initial connection attempt 1466 // queue a dummy packet to force an initial connection attempt
1472 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED) 1467 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1473 vpn_queue.put (new net_packet); 1468 vpn_queue.put (new net_packet);
1474 1469
1475 reset_connection (); 1470 reset_connection ("startup");
1476} 1471}
1477 1472
1478connection::~connection () 1473connection::~connection ()
1479{ 1474{
1480 shutdown (); 1475 shutdown ();

Diff Legend

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