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.24 by pcg, Wed Oct 22 01:05:23 2003 UTC vs.
Revision 1.51 by pcg, Wed Mar 23 20:07:56 2005 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your option) any later version.
9 11
10 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,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 15 GNU General Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21 23
22extern "C" { 24#include <cassert>
23# include "lzf/lzf.h"
24}
25 25
26#include <list> 26#include <list>
27 27
28#include <openssl/rand.h> 28#include <openssl/rand.h>
29#include <openssl/evp.h> 29#include <openssl/evp.h>
30#include <openssl/rsa.h> 30#include <openssl/rsa.h>
31#include <openssl/err.h> 31#include <openssl/err.h>
32
33#include "gettext.h"
34 32
35#include "conf.h" 33#include "conf.h"
36#include "slog.h" 34#include "slog.h"
37#include "device.h" 35#include "device.h"
38#include "vpn.h" 36#include "vpn.h"
… …
44# define RAND_pseudo_bytes RAND_bytes 42# define RAND_pseudo_bytes RAND_bytes
45#endif 43#endif
46 44
47#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 45#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
48 46
47#define ULTRA_FAST 1
48#define HLOG 15
49#include "lzf/lzf.h"
50#include "lzf/lzf_c.c"
51#include "lzf/lzf_d.c"
52
49struct crypto_ctx 53struct crypto_ctx
50{ 54{
51 EVP_CIPHER_CTX cctx; 55 EVP_CIPHER_CTX cctx;
52 HMAC_CTX hctx; 56 HMAC_CTX hctx;
53 57
… …
56}; 60};
57 61
58crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 62crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
59{ 63{
60 EVP_CIPHER_CTX_init (&cctx); 64 EVP_CIPHER_CTX_init (&cctx);
61 EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc); 65 require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));
62 HMAC_CTX_init (&hctx); 66 HMAC_CTX_init (&hctx);
63 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0); 67 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
64} 68}
65 69
66crypto_ctx::~crypto_ctx () 70crypto_ctx::~crypto_ctx ()
67{ 71{
68 EVP_CIPHER_CTX_cleanup (&cctx); 72 require (EVP_CIPHER_CTX_cleanup (&cctx));
69 HMAC_CTX_cleanup (&hctx); 73 HMAC_CTX_cleanup (&hctx);
70} 74}
71 75
72static void 76static void
73rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 77rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
74{ 78{
75 EVP_MD_CTX ctx; 79 EVP_MD_CTX ctx;
76 80
77 EVP_MD_CTX_init (&ctx); 81 EVP_MD_CTX_init (&ctx);
78 EVP_DigestInit (&ctx, RSA_HASH); 82 require (EVP_DigestInit (&ctx, RSA_HASH));
79 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 83 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
80 EVP_DigestUpdate(&ctx, &id, sizeof id); 84 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
81 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
82 EVP_MD_CTX_cleanup (&ctx); 86 EVP_MD_CTX_cleanup (&ctx);
83} 87}
84 88
85struct rsa_entry { 89struct rsa_entry {
86 tstamp expire; 90 tstamp expire;
… …
91struct rsa_cache : list<rsa_entry> 95struct rsa_cache : list<rsa_entry>
92{ 96{
93 void cleaner_cb (time_watcher &w); time_watcher cleaner; 97 void cleaner_cb (time_watcher &w); time_watcher cleaner;
94 98
95 bool find (const rsaid &id, rsachallenge &chg) 99 bool find (const rsaid &id, rsachallenge &chg)
96 { 100 {
97 for (iterator i = begin (); i != end (); ++i) 101 for (iterator i = begin (); i != end (); ++i)
98 { 102 {
99 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 103 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)
100 { 104 {
101 memcpy (&chg, &i->chg, sizeof chg); 105 memcpy (&chg, &i->chg, sizeof chg);
102 106
103 erase (i); 107 erase (i);
104 return true; 108 return true;
105 } 109 }
106 } 110 }
107 111
108 if (cleaner.at < NOW) 112 if (cleaner.at < NOW)
109 cleaner.start (NOW + RSA_TTL); 113 cleaner.start (NOW + RSA_TTL);
110 114
111 return false; 115 return false;
112 } 116 }
113 117
114 void gen (rsaid &id, rsachallenge &chg) 118 void gen (rsaid &id, rsachallenge &chg)
115 { 119 {
116 rsa_entry e; 120 rsa_entry e;
117 121
118 RAND_bytes ((unsigned char *)&id, sizeof id); 122 RAND_bytes ((unsigned char *)&id, sizeof id);
119 RAND_bytes ((unsigned char *)&chg, sizeof chg); 123 RAND_bytes ((unsigned char *)&chg, sizeof chg);
120 124
121 e.expire = NOW + RSA_TTL; 125 e.expire = NOW + RSA_TTL;
122 e.id = id; 126 e.id = id;
123 memcpy (&e.chg, &chg, sizeof chg); 127 memcpy (&e.chg, &chg, sizeof chg);
124 128
125 push_back (e); 129 push_back (e);
126 130
127 if (cleaner.at < NOW) 131 if (cleaner.at < NOW)
128 cleaner.start (NOW + RSA_TTL); 132 cleaner.start (NOW + RSA_TTL);
129 } 133 }
130 134
131 rsa_cache () 135 rsa_cache ()
132 : cleaner (this, &rsa_cache::cleaner_cb) 136 : cleaner (this, &rsa_cache::cleaner_cb)
133 { } 137 { }
134 138
135} rsa_cache; 139} rsa_cache;
136 140
137void rsa_cache::cleaner_cb (time_watcher &w) 141void rsa_cache::cleaner_cb (time_watcher &w)
138{ 142{
139 if (empty ()) 143 if (!empty ())
140 w.at = TSTAMP_CANCEL;
141 else
142 { 144 {
143 w.at = NOW + RSA_TTL; 145 w.start (NOW + RSA_TTL);
144 146
145 for (iterator i = begin (); i != end (); ) 147 for (iterator i = begin (); i != end (); )
146 if (i->expire <= NOW) 148 if (i->expire <= NOW)
147 i = erase (i); 149 i = erase (i);
148 else 150 else
… …
200// only do action once every x seconds per host whole allowing bursts. 202// only do action once every x seconds per host whole allowing bursts.
201// this implementation ("splay list" ;) is inefficient, 203// this implementation ("splay list" ;) is inefficient,
202// but low on resources. 204// but low on resources.
203struct net_rate_limiter : list<net_rateinfo> 205struct net_rate_limiter : list<net_rateinfo>
204{ 206{
205 static const double ALPHA = 1. - 1. / 600.; // allow bursts 207# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
206 static const double CUTOFF = 10.; // one event every CUTOFF seconds 208# define NRL_CUTOFF 10. // one event every CUTOFF seconds
207 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 209# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
208 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 210# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
209 211
210 bool can (const sockinfo &si) { return can((u32)si.host); } 212 bool can (const sockinfo &si) { return can((u32)si.host); }
211 bool can (u32 host); 213 bool can (u32 host);
212}; 214};
213 215
… …
218 iterator i; 220 iterator i;
219 221
220 for (i = begin (); i != end (); ) 222 for (i = begin (); i != end (); )
221 if (i->host == host) 223 if (i->host == host)
222 break; 224 break;
223 else if (i->last < NOW - EXPIRE) 225 else if (i->last < NOW - NRL_EXPIRE)
224 i = erase (i); 226 i = erase (i);
225 else 227 else
226 i++; 228 i++;
227 229
228 if (i == end ()) 230 if (i == end ())
229 { 231 {
230 net_rateinfo ri; 232 net_rateinfo ri;
231 233
232 ri.host = host; 234 ri.host = host;
233 ri.pcnt = 1.; 235 ri.pcnt = 1.;
234 ri.diff = MAXDIF; 236 ri.diff = NRL_MAXDIF;
235 ri.last = NOW; 237 ri.last = NOW;
236 238
237 push_front (ri); 239 push_front (ri);
238 240
239 return true; 241 return true;
… …
241 else 243 else
242 { 244 {
243 net_rateinfo ri (*i); 245 net_rateinfo ri (*i);
244 erase (i); 246 erase (i);
245 247
246 ri.pcnt = ri.pcnt * ALPHA; 248 ri.pcnt = ri.pcnt * NRL_ALPHA;
247 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 249 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
248 250
249 ri.last = NOW; 251 ri.last = NOW;
250 252
251 double dif = ri.diff / ri.pcnt; 253 double dif = ri.diff / ri.pcnt;
252 254
253 bool send = dif > CUTOFF; 255 bool send = dif > NRL_CUTOFF;
254 256
255 if (dif > MAXDIF) 257 if (dif > NRL_MAXDIF)
256 { 258 {
257 ri.pcnt = 1.; 259 ri.pcnt = 1.;
258 ri.diff = MAXDIF; 260 ri.diff = NRL_MAXDIF;
259 } 261 }
260 else if (send) 262 else if (send)
261 ri.pcnt++; 263 ri.pcnt++;
262 264
263 push_front (ri); 265 push_front (ri);
… …
310} 312}
311 313
312#define MAXVPNDATA (MAX_MTU - 6 - 6) 314#define MAXVPNDATA (MAX_MTU - 6 - 6)
313#define DATAHDR (sizeof (u32) + RAND_SIZE) 315#define DATAHDR (sizeof (u32) + RAND_SIZE)
314 316
315struct vpndata_packet:vpn_packet 317struct vpndata_packet : vpn_packet
316 { 318 {
317 u8 data[MAXVPNDATA + DATAHDR]; // seqno 319 u8 data[MAXVPNDATA + DATAHDR]; // seqno
318 320
319 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno); 321 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
320 tap_packet *unpack (connection *conn, u32 &seqno); 322 tap_packet *unpack (connection *conn, u32 &seqno);
… …
333 int outl = 0, outl2; 335 int outl = 0, outl2;
334 ptype type = PT_DATA_UNCOMPRESSED; 336 ptype type = PT_DATA_UNCOMPRESSED;
335 337
336#if ENABLE_COMPRESSION 338#if ENABLE_COMPRESSION
337 u8 cdata[MAX_MTU]; 339 u8 cdata[MAX_MTU];
338 u32 cl;
339 340
341 if (conn->features & ENABLE_COMPRESSION)
342 {
340 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344
341 if (cl) 345 if (cl)
342 { 346 {
343 type = PT_DATA_COMPRESSED; 347 type = PT_DATA_COMPRESSED;
344 d = cdata; 348 d = cdata;
345 l = cl + 2; 349 l = cl + 2;
346 350
347 d[0] = cl >> 8; 351 d[0] = cl >> 8;
348 d[1] = cl; 352 d[1] = cl;
353 }
349 } 354 }
350#endif 355#endif
351 356
352 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 357 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
353 358
354 struct { 359 struct {
355#if RAND_SIZE 360#if RAND_SIZE
356 u8 rnd[RAND_SIZE]; 361 u8 rnd[RAND_SIZE];
357#endif 362#endif
… …
361 datahdr.seqno = ntohl (seqno); 366 datahdr.seqno = ntohl (seqno);
362#if RAND_SIZE 367#if RAND_SIZE
363 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 368 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
364#endif 369#endif
365 370
366 EVP_EncryptUpdate (cctx, 371 require (EVP_EncryptUpdate (cctx,
367 (unsigned char *) data + outl, &outl2, 372 (unsigned char *) data + outl, &outl2,
368 (unsigned char *) &datahdr, DATAHDR); 373 (unsigned char *) &datahdr, DATAHDR));
369 outl += outl2; 374 outl += outl2;
370 375
371 EVP_EncryptUpdate (cctx, 376 require (EVP_EncryptUpdate (cctx,
372 (unsigned char *) data + outl, &outl2, 377 (unsigned char *) data + outl, &outl2,
373 (unsigned char *) d, l); 378 (unsigned char *) d, l));
374 outl += outl2; 379 outl += outl2;
375 380
376 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 381 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
377 outl += outl2; 382 outl += outl2;
378 383
379 len = outl + data_hdr_size (); 384 len = outl + data_hdr_size ();
380 385
381 set_hdr (type, dst); 386 set_hdr (type, dst);
… …
390 int outl = 0, outl2; 395 int outl = 0, outl2;
391 tap_packet *p = new tap_packet; 396 tap_packet *p = new tap_packet;
392 u8 *d; 397 u8 *d;
393 u32 l = len - data_hdr_size (); 398 u32 l = len - data_hdr_size ();
394 399
395 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 400 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
396 401
397#if ENABLE_COMPRESSION 402#if ENABLE_COMPRESSION
398 u8 cdata[MAX_MTU]; 403 u8 cdata[MAX_MTU];
399 404
400 if (type == PT_DATA_COMPRESSED) 405 if (type == PT_DATA_COMPRESSED)
… …
402 else 407 else
403#endif 408#endif
404 d = &(*p)[6 + 6 - DATAHDR]; 409 d = &(*p)[6 + 6 - DATAHDR];
405 410
406 /* this overwrites part of the src mac, but we fix that later */ 411 /* this overwrites part of the src mac, but we fix that later */
407 EVP_DecryptUpdate (cctx, 412 require (EVP_DecryptUpdate (cctx,
408 d, &outl2, 413 d, &outl2,
409 (unsigned char *)&data, len - data_hdr_size ()); 414 (unsigned char *)&data, len - data_hdr_size ()));
410 outl += outl2; 415 outl += outl2;
411 416
412 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 417 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
413 outl += outl2; 418 outl += outl2;
414 419
415 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 420 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
416 421
417 id2mac (dst () ? dst() : THISNODE->id, p->dst); 422 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
446{ 451{
447 // actually, hmaclen cannot be checked because the hmac 452 // actually, hmaclen cannot be checked because the hmac
448 // field comes before this data, so peers with other 453 // field comes before this data, so peers with other
449 // hmacs simply will not work. 454 // hmacs simply will not work.
450 u8 prot_major, prot_minor, randsize, hmaclen; 455 u8 prot_major, prot_minor, randsize, hmaclen;
451 u8 flags, challengelen, pad2, pad3; 456 u8 flags, challengelen, features, pad3;
452 u32 cipher_nid, digest_nid, hmac_nid; 457 u32 cipher_nid, digest_nid, hmac_nid;
453
454 const u8 curflags () const
455 {
456 return 0x80
457 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
458 }
459 458
460 void setup (ptype type, int dst); 459 void setup (ptype type, int dst);
461 bool chk_config () const; 460 bool chk_config () const;
461
462 static u8 get_features ()
463 {
464 u8 f = 0;
465#if ENABLE_COMPRESSION
466 f |= FEATURE_COMPRESSION;
467#endif
468#if ENABLE_ROHC
469 f |= FEATURE_ROHC;
470#endif
471 return f;
472 }
462}; 473};
463 474
464void config_packet::setup (ptype type, int dst) 475void config_packet::setup (ptype type, int dst)
465{ 476{
466 prot_major = PROTOCOL_MAJOR; 477 prot_major = PROTOCOL_MAJOR;
467 prot_minor = PROTOCOL_MINOR; 478 prot_minor = PROTOCOL_MINOR;
468 randsize = RAND_SIZE; 479 randsize = RAND_SIZE;
469 hmaclen = HMACLENGTH; 480 hmaclen = HMACLENGTH;
470 flags = curflags (); 481 flags = 0;
471 challengelen = sizeof (rsachallenge); 482 challengelen = sizeof (rsachallenge);
483 features = get_features ();
472 484
473 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
474 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 486 digest_nid = htonl (EVP_MD_type (RSA_HASH));
475 hmac_nid = htonl (EVP_MD_type (DIGEST)); 487 hmac_nid = htonl (EVP_MD_type (DIGEST));
476 488
… …
484 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 496 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
485 else if (randsize != RAND_SIZE) 497 else if (randsize != RAND_SIZE)
486 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 498 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
487 else if (hmaclen != HMACLENGTH) 499 else if (hmaclen != HMACLENGTH)
488 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 500 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
489 else if (flags != curflags ())
490 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
491 else if (challengelen != sizeof (rsachallenge)) 501 else if (challengelen != sizeof (rsachallenge))
492 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 502 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
493 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 503 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
494 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 504 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
495 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 505 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
504 514
505struct auth_req_packet : config_packet 515struct auth_req_packet : config_packet
506{ 516{
507 char magic[8]; 517 char magic[8];
508 u8 initiate; // false if this is just an automatic reply 518 u8 initiate; // false if this is just an automatic reply
509 u8 protocols; // supported protocols (will get patches on forward) 519 u8 protocols; // supported protocols (will be patched on forward)
510 u8 pad2, pad3; 520 u8 pad2, pad3;
511 rsaid id; 521 rsaid id;
512 rsaencrdata encr; 522 rsaencrdata encr;
513 523
514 auth_req_packet (int dst, bool initiate_, u8 protocols_) 524 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
575{ 585{
576 if (ictx && octx) 586 if (ictx && octx)
577 { 587 {
578 connectmode = conf->connectmode; 588 connectmode = conf->connectmode;
579 589
590 // make sure rekeying timeouts are slightly asymmetric
580 rekey.start (NOW + ::conf.rekey); 591 rekey.start (NOW + ::conf.rekey
592 + (conf->id > THISNODE->id ? 10 : 0));
581 keepalive.start (NOW + ::conf.keepalive); 593 keepalive.start (NOW + ::conf.keepalive);
582 594
583 // send queued packets 595 // send queued packets
584 if (ictx && octx) 596 if (ictx && octx)
585 { 597 {
… …
598 } 610 }
599 else 611 else
600 { 612 {
601 retry_cnt = 0; 613 retry_cnt = 0;
602 establish_connection.start (NOW + 5); 614 establish_connection.start (NOW + 5);
603 keepalive.reset (); 615 keepalive.stop ();
604 rekey.reset (); 616 rekey.stop ();
605 } 617 }
606} 618}
607 619
608void 620void
609connection::reset_si () 621connection::reset_si ()
… …
611 protocol = best_protocol (THISNODE->protocols & conf->protocols); 623 protocol = best_protocol (THISNODE->protocols & conf->protocols);
612 624
613 // mask out protocols we cannot establish 625 // mask out protocols we cannot establish
614 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 626 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
615 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 627 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
628 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
616 629
617 si.set (conf, protocol); 630 si.set (conf, protocol);
618} 631}
619 632
620// ensure sockinfo is valid, forward if necessary 633// ensure sockinfo is valid, forward if necessary
… …
625 { 638 {
626 connection *r = vpn->find_router (); 639 connection *r = vpn->find_router ();
627 640
628 if (r) 641 if (r)
629 { 642 {
630 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 643 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
631 conf->nodename, r->conf->nodename); 644 conf->nodename, r->conf->nodename, (const char *)r->si);
632 return r->si; 645 return r->si;
633 } 646 }
634 else 647 else
635 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 648 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
636 conf->nodename); 649 conf->nodename);
… …
720} 733}
721 734
722void 735void
723connection::establish_connection_cb (time_watcher &w) 736connection::establish_connection_cb (time_watcher &w)
724{ 737{
725 if (ictx || conf == THISNODE 738 if (!ictx
739 && conf != THISNODE
726 || connectmode == conf_node::C_NEVER 740 && connectmode != conf_node::C_NEVER
727 || connectmode == conf_node::C_DISABLED) 741 && connectmode != conf_node::C_DISABLED
728 w.at = TSTAMP_CANCEL; 742 && NOW > w.at)
729 else if (w.at <= NOW)
730 { 743 {
731 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 744 w.at = TSTAMP_MAX; // first disable this watcher in case of recursion
732 745
733 if (retry_int < 3600 * 8) 746 double retry_int = double (retry_cnt & 3
734 retry_cnt++; 747 ? (retry_cnt & 3) + 1
735 748 : 1 << (retry_cnt >> 2));
736 w.at = NOW + retry_int;
737 749
738 reset_si (); 750 reset_si ();
751
752 bool slow = si.prot & PROT_SLOW;
739 753
740 if (si.prot && !si.host) 754 if (si.prot && !si.host)
741 vpn->send_connect_request (conf->id); 755 vpn->send_connect_request (conf->id);
742 else 756 else
743 { 757 {
744 const sockinfo &dsi = forward_si (si); 758 const sockinfo &dsi = forward_si (si);
759
760 slow = slow || (dsi.prot & PROT_SLOW);
745 761
746 if (dsi.valid () && auth_rate_limiter.can (dsi)) 762 if (dsi.valid () && auth_rate_limiter.can (dsi))
747 { 763 {
748 if (retry_cnt < 4) 764 if (retry_cnt < 4)
749 send_auth_request (dsi, true); 765 send_auth_request (dsi, true);
750 else 766 else
751 send_ping (dsi, 0); 767 send_ping (dsi, 0);
752 } 768 }
753 } 769 }
770
771 retry_int *= slow ? 8. : 0.7;
772
773 if (retry_int < conf->max_retry)
774 retry_cnt++;
775 else
776 retry_int = conf->max_retry;
777
778 w.start (NOW + retry_int);
754 } 779 }
755} 780}
756 781
757void 782void
758connection::reset_connection () 783connection::reset_connection ()
… …
766 run_script (run_script_cb (this, &connection::script_node_down), false); 791 run_script (run_script_cb (this, &connection::script_node_down), false);
767 } 792 }
768 793
769 delete ictx; ictx = 0; 794 delete ictx; ictx = 0;
770 delete octx; octx = 0; 795 delete octx; octx = 0;
796#if ENABLE_DNS
797 dnsv4_reset_connection ();
798#endif
771 799
772 si.host= 0; 800 si.host = 0;
773 801
774 last_activity = 0; 802 last_activity = 0;
775 retry_cnt = 0; 803 retry_cnt = 0;
776 804
777 rekey.reset (); 805 rekey.stop ();
778 keepalive.reset (); 806 keepalive.stop ();
779 establish_connection.reset (); 807 establish_connection.stop ();
780} 808}
781 809
782void 810void
783connection::shutdown () 811connection::shutdown ()
784{ 812{
… …
789} 817}
790 818
791void 819void
792connection::rekey_cb (time_watcher &w) 820connection::rekey_cb (time_watcher &w)
793{ 821{
794 w.at = TSTAMP_CANCEL;
795
796 reset_connection (); 822 reset_connection ();
797 establish_connection (); 823 establish_connection ();
798} 824}
799 825
800void 826void
… …
834{ 860{
835 if (ictx && octx) 861 if (ictx && octx)
836 send_vpn_packet (pkt, si, tos); 862 send_vpn_packet (pkt, si, tos);
837 else 863 else
838 { 864 {
839 vpn_queue.put (new vpn_packet (*pkt)); 865 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
840 866
841 establish_connection (); 867 establish_connection ();
842 } 868 }
843} 869}
844 870
… …
917 943
918 octx = new crypto_ctx (k, 1); 944 octx = new crypto_ctx (k, 1);
919 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 945 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
920 946
921 conf->protocols = p->protocols; 947 conf->protocols = p->protocols;
948 features = p->features & config_packet::get_features ();
922 949
923 send_auth_response (rsi, p->id, k); 950 send_auth_response (rsi, p->id, k);
924 951
925 connection_established (); 952 connection_established ();
926 953
… …
962 crypto_ctx *cctx = new crypto_ctx (chg, 0); 989 crypto_ctx *cctx = new crypto_ctx (chg, 0);
963 990
964 if (!p->hmac_chk (cctx)) 991 if (!p->hmac_chk (cctx))
965 { 992 {
966 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 993 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
967 "could be an attack, or just corruption or an synchronization error"), 994 "could be an attack, or just corruption or a synchronization error"),
968 conf->nodename, (const char *)rsi); 995 conf->nodename, (const char *)rsi);
969 break; 996 break;
970 } 997 }
971 else 998 else
972 { 999 {
… …
1021 { 1048 {
1022 vpndata_packet *p = (vpndata_packet *)pkt; 1049 vpndata_packet *p = (vpndata_packet *)pkt;
1023 1050
1024 if (!p->hmac_chk (ictx)) 1051 if (!p->hmac_chk (ictx))
1025 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1052 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1026 "could be an attack, or just corruption or an synchronization error"), 1053 "could be an attack, or just corruption or a synchronization error"),
1027 conf->nodename, (const char *)rsi); 1054 conf->nodename, (const char *)rsi);
1028 else 1055 else
1029 { 1056 {
1030 u32 seqno; 1057 u32 seqno;
1031 tap_packet *d = p->unpack (this, seqno); 1058 tap_packet *d = p->unpack (this, seqno);
… …
1040 si = rsi; 1067 si = rsi;
1041 1068
1042 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1069 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1043 conf->nodename, (const char *)si, (const char *)rsi); 1070 conf->nodename, (const char *)si, (const char *)rsi);
1044 } 1071 }
1045
1046 delete d;
1047
1048 break;
1049 } 1072 }
1073
1074 delete d;
1075 break;
1050 } 1076 }
1051 } 1077 }
1052 1078
1053 send_reset (rsi); 1079 send_reset (rsi);
1054 break; 1080 break;
… …
1079 break; 1105 break;
1080 1106
1081 case vpn_packet::PT_CONNECT_INFO: 1107 case vpn_packet::PT_CONNECT_INFO:
1082 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1108 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1083 { 1109 {
1084 connect_info_packet *p = (connect_info_packet *) pkt; 1110 connect_info_packet *p = (connect_info_packet *)pkt;
1085 1111
1086 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1112 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1087 1113 {
1088 connection *c = vpn->conns[p->id - 1]; 1114 connection *c = vpn->conns[p->id - 1];
1089 1115
1090 c->conf->protocols = p->protocols; 1116 c->conf->protocols = p->protocols;
1091 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1117 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1092 p->si.upgrade_protocol (protocol, c->conf); 1118 p->si.upgrade_protocol (protocol, c->conf);
1093 1119
1094 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1120 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1095 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1121 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1096 1122
1097 const sockinfo &dsi = forward_si (p->si); 1123 const sockinfo &dsi = forward_si (p->si);
1098 1124
1099 if (dsi.valid ()) 1125 if (dsi.valid ())
1100 c->send_auth_request (dsi, true); 1126 c->send_auth_request (dsi, true);
1127 }
1101 } 1128 }
1102 1129
1103 break; 1130 break;
1104 1131
1105 default: 1132 default:
… …
1114 { 1141 {
1115 reset_connection (); 1142 reset_connection ();
1116 establish_connection (); 1143 establish_connection ();
1117 } 1144 }
1118 else if (NOW < last_activity + ::conf.keepalive) 1145 else if (NOW < last_activity + ::conf.keepalive)
1119 w.at = last_activity + ::conf.keepalive; 1146 w.start (last_activity + ::conf.keepalive);
1120 else if (conf->connectmode != conf_node::C_ONDEMAND 1147 else if (conf->connectmode != conf_node::C_ONDEMAND
1121 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1148 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1122 { 1149 {
1123 send_ping (si); 1150 send_ping (si);
1124 w.at = NOW + 5; 1151 w.start (NOW + 5);
1125 } 1152 }
1126 else if (NOW < last_activity + ::conf.keepalive + 10) 1153 else if (NOW < last_activity + ::conf.keepalive + 10)
1127 // hold ondemand connections implicitly a few seconds longer 1154 // hold ondemand connections implicitly a few seconds longer
1128 // should delete octx, though, or something like that ;) 1155 // should delete octx, though, or something like that ;)
1129 w.at = last_activity + ::conf.keepalive + 10; 1156 w.start (last_activity + ::conf.keepalive + 10);
1130 else 1157 else
1131 reset_connection (); 1158 reset_connection ();
1132} 1159}
1133 1160
1134void connection::send_connect_request (int id) 1161void connection::send_connect_request (int id)
… …
1169 putenv ("STATE=down"); 1196 putenv ("STATE=down");
1170 1197
1171 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1198 return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1172} 1199}
1173 1200
1174connection::connection(struct vpn *vpn_) 1201connection::connection (struct vpn *vpn, conf_node *conf)
1175: vpn(vpn_) 1202: vpn(vpn), conf(conf)
1176, rekey (this, &connection::rekey_cb) 1203, rekey (this, &connection::rekey_cb)
1177, keepalive (this, &connection::keepalive_cb) 1204, keepalive (this, &connection::keepalive_cb)
1178, establish_connection (this, &connection::establish_connection_cb) 1205, establish_connection (this, &connection::establish_connection_cb)
1206#if ENABLE_DNS
1207, dns (0)
1208#endif
1179{ 1209{
1180 octx = ictx = 0; 1210 octx = ictx = 0;
1181 retry_cnt = 0; 1211 retry_cnt = 0;
1182 1212
1213 if (!conf->protocols) // make sure some protocol is enabled
1214 conf->protocols = PROT_UDPv4;
1215
1183 connectmode = conf_node::C_ALWAYS; // initial setting 1216 connectmode = conf_node::C_ALWAYS; // initial setting
1184 reset_connection (); 1217 reset_connection ();
1185} 1218}
1186 1219
1187connection::~connection () 1220connection::~connection ()

Diff Legend

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