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.22 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.55 by pcg, Tue Apr 26 00:55: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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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
479} 491}
480 492
481bool config_packet::chk_config () const 493bool config_packet::chk_config () const
482{ 494{
483 if (prot_major != PROTOCOL_MAJOR) 495 if (prot_major != PROTOCOL_MAJOR)
484 slog (L_WARN, _("major version mismatch (%d <=> %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 (%d <=> %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 (%d <=> %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 (%x <=> %x)"), flags, curflags ());
491 else if (challengelen != sizeof (rsachallenge)) 501 else if (challengelen != sizeof (rsachallenge))
492 slog (L_WARN, _("challenge length mismatch (%d <=> %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 (%x <=> %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)))
496 slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH)); 506 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
497 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 507 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
498 slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 508 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
499 else 509 else
500 return true; 510 return true;
501 511
502 return false; 512 return false;
503} 513}
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);
675connection::send_auth_request (const sockinfo &si, bool initiate) 688connection::send_auth_request (const sockinfo &si, bool initiate)
676{ 689{
677 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 690 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
678 691
679 rsachallenge chg; 692 rsachallenge chg;
680
681 rsa_cache.gen (pkt->id, chg); 693 rsa_cache.gen (pkt->id, chg);
682 694 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
683 if (0 > RSA_public_encrypt (sizeof chg,
684 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
685 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
686 fatal ("RSA_public_encrypt error");
687 695
688 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 696 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
689 697
690 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 698 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
691 699
725} 733}
726 734
727void 735void
728connection::establish_connection_cb (time_watcher &w) 736connection::establish_connection_cb (time_watcher &w)
729{ 737{
730 if (ictx || conf == THISNODE 738 if (!ictx
739 && conf != THISNODE
731 || connectmode == conf_node::C_NEVER 740 && connectmode != conf_node::C_NEVER
732 || connectmode == conf_node::C_DISABLED) 741 && connectmode != conf_node::C_DISABLED
733 w.at = TSTAMP_CANCEL; 742 && NOW > w.at)
734 else if (w.at <= NOW)
735 { 743 {
736 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
737 745
738 if (retry_int < 3600 * 8) 746 double retry_int = double (retry_cnt & 3
739 retry_cnt++; 747 ? (retry_cnt & 3) + 1
740 748 : 1 << (retry_cnt >> 2));
741 w.at = NOW + retry_int;
742 749
743 reset_si (); 750 reset_si ();
751
752 bool slow = si.prot & PROT_SLOW;
744 753
745 if (si.prot && !si.host) 754 if (si.prot && !si.host)
746 vpn->send_connect_request (conf->id); 755 vpn->send_connect_request (conf->id);
747 else 756 else
748 { 757 {
749 const sockinfo &dsi = forward_si (si); 758 const sockinfo &dsi = forward_si (si);
759
760 slow = slow || (dsi.prot & PROT_SLOW);
750 761
751 if (dsi.valid () && auth_rate_limiter.can (dsi)) 762 if (dsi.valid () && auth_rate_limiter.can (dsi))
752 { 763 {
753 if (retry_cnt < 4) 764 if (retry_cnt < 4)
754 send_auth_request (dsi, true); 765 send_auth_request (dsi, true);
755 else 766 else
756 send_ping (dsi, 0); 767 send_ping (dsi, 0);
757 } 768 }
758 } 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);
759 } 779 }
760} 780}
761 781
762void 782void
763connection::reset_connection () 783connection::reset_connection ()
766 { 786 {
767 slog (L_INFO, _("%s(%s): connection lost"), 787 slog (L_INFO, _("%s(%s): connection lost"),
768 conf->nodename, (const char *)si); 788 conf->nodename, (const char *)si);
769 789
770 if (::conf.script_node_down) 790 if (::conf.script_node_down)
771 run_script (run_script_cb (this, &connection::script_node_down), false); 791 if (!run_script (run_script_cb (this, &connection::script_node_down), false))
792 slog (L_WARN, _("node-down command execution failed, continuing."));
772 } 793 }
773 794
774 delete ictx; ictx = 0; 795 delete ictx; ictx = 0;
775 delete octx; octx = 0; 796 delete octx; octx = 0;
797#if ENABLE_DNS
798 dnsv4_reset_connection ();
799#endif
776 800
777 si.host= 0; 801 si.host = 0;
778 802
779 last_activity = 0; 803 last_activity = 0;
780 retry_cnt = 0; 804 retry_cnt = 0;
781 805
782 rekey.reset (); 806 rekey.stop ();
783 keepalive.reset (); 807 keepalive.stop ();
784 establish_connection.reset (); 808 establish_connection.stop ();
785} 809}
786 810
787void 811void
788connection::shutdown () 812connection::shutdown ()
789{ 813{
794} 818}
795 819
796void 820void
797connection::rekey_cb (time_watcher &w) 821connection::rekey_cb (time_watcher &w)
798{ 822{
799 w.at = TSTAMP_CANCEL;
800
801 reset_connection (); 823 reset_connection ();
802 establish_connection (); 824 establish_connection ();
803} 825}
804 826
805void 827void
839{ 861{
840 if (ictx && octx) 862 if (ictx && octx)
841 send_vpn_packet (pkt, si, tos); 863 send_vpn_packet (pkt, si, tos);
842 else 864 else
843 { 865 {
844 vpn_queue.put (new vpn_packet (*pkt)); 866 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
845 867
846 establish_connection (); 868 establish_connection ();
847 } 869 }
848} 870}
849 871
908 if (p->initiate) 930 if (p->initiate)
909 send_auth_request (rsi, false); 931 send_auth_request (rsi, false);
910 932
911 rsachallenge k; 933 rsachallenge k;
912 934
913 if (0 > RSA_private_decrypt (sizeof (p->encr), 935 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
914 (unsigned char *)&p->encr, (unsigned char *)&k, 936 {
915 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
916 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 937 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
917 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 938 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
939 break;
940 }
918 else 941 else
919 { 942 {
920 delete octx; 943 delete octx;
921 944
922 octx = new crypto_ctx (k, 1); 945 octx = new crypto_ctx (k, 1);
923 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 946 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
924 947
925 conf->protocols = p->protocols; 948 conf->protocols = p->protocols;
949 features = p->features & config_packet::get_features ();
926 950
927 send_auth_response (rsi, p->id, k); 951 send_auth_response (rsi, p->id, k);
928 952
929 connection_established (); 953 connection_established ();
930 954
966 crypto_ctx *cctx = new crypto_ctx (chg, 0); 990 crypto_ctx *cctx = new crypto_ctx (chg, 0);
967 991
968 if (!p->hmac_chk (cctx)) 992 if (!p->hmac_chk (cctx))
969 { 993 {
970 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 994 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
971 "could be an attack, or just corruption or an synchronization error"), 995 "could be an attack, or just corruption or a synchronization error"),
972 conf->nodename, (const char *)rsi); 996 conf->nodename, (const char *)rsi);
973 break; 997 break;
974 } 998 }
975 else 999 else
976 { 1000 {
994 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1018 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
995 conf->nodename, (const char *)rsi, 1019 conf->nodename, (const char *)rsi,
996 p->prot_major, p->prot_minor); 1020 p->prot_major, p->prot_minor);
997 1021
998 if (::conf.script_node_up) 1022 if (::conf.script_node_up)
999 run_script (run_script_cb (this, &connection::script_node_up), false); 1023 if (!run_script (run_script_cb (this, &connection::script_node_up), false))
1024 slog (L_WARN, _("node-up command execution failed, continuing."));
1000 1025
1001 break; 1026 break;
1002 } 1027 }
1003 else 1028 else
1004 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1029 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
1025 { 1050 {
1026 vpndata_packet *p = (vpndata_packet *)pkt; 1051 vpndata_packet *p = (vpndata_packet *)pkt;
1027 1052
1028 if (!p->hmac_chk (ictx)) 1053 if (!p->hmac_chk (ictx))
1029 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1054 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1030 "could be an attack, or just corruption or an synchronization error"), 1055 "could be an attack, or just corruption or a synchronization error"),
1031 conf->nodename, (const char *)rsi); 1056 conf->nodename, (const char *)rsi);
1032 else 1057 else
1033 { 1058 {
1034 u32 seqno; 1059 u32 seqno;
1035 tap_packet *d = p->unpack (this, seqno); 1060 tap_packet *d = p->unpack (this, seqno);
1044 si = rsi; 1069 si = rsi;
1045 1070
1046 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1071 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1047 conf->nodename, (const char *)si, (const char *)rsi); 1072 conf->nodename, (const char *)si, (const char *)rsi);
1048 } 1073 }
1049
1050 delete d;
1051
1052 break;
1053 } 1074 }
1075
1076 delete d;
1077 break;
1054 } 1078 }
1055 } 1079 }
1056 1080
1057 send_reset (rsi); 1081 send_reset (rsi);
1058 break; 1082 break;
1083 break; 1107 break;
1084 1108
1085 case vpn_packet::PT_CONNECT_INFO: 1109 case vpn_packet::PT_CONNECT_INFO:
1086 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1110 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1087 { 1111 {
1088 connect_info_packet *p = (connect_info_packet *) pkt; 1112 connect_info_packet *p = (connect_info_packet *)pkt;
1089 1113
1090 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1114 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1091 1115 {
1092 connection *c = vpn->conns[p->id - 1]; 1116 connection *c = vpn->conns[p->id - 1];
1093 1117
1094 c->conf->protocols = p->protocols; 1118 c->conf->protocols = p->protocols;
1095 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1119 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1096 p->si.upgrade_protocol (protocol, c->conf); 1120 p->si.upgrade_protocol (protocol, c->conf);
1097 1121
1098 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1122 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1099 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1123 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1100 1124
1101 const sockinfo &dsi = forward_si (p->si); 1125 const sockinfo &dsi = forward_si (p->si);
1102 1126
1103 if (dsi.valid ()) 1127 if (dsi.valid ())
1104 c->send_auth_request (dsi, true); 1128 c->send_auth_request (dsi, true);
1129 }
1105 } 1130 }
1106 1131
1107 break; 1132 break;
1108 1133
1109 default: 1134 default:
1118 { 1143 {
1119 reset_connection (); 1144 reset_connection ();
1120 establish_connection (); 1145 establish_connection ();
1121 } 1146 }
1122 else if (NOW < last_activity + ::conf.keepalive) 1147 else if (NOW < last_activity + ::conf.keepalive)
1123 w.at = last_activity + ::conf.keepalive; 1148 w.start (last_activity + ::conf.keepalive);
1124 else if (conf->connectmode != conf_node::C_ONDEMAND 1149 else if (conf->connectmode != conf_node::C_ONDEMAND
1125 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1150 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1126 { 1151 {
1127 send_ping (si); 1152 send_ping (si);
1128 w.at = NOW + 5; 1153 w.start (NOW + 5);
1129 } 1154 }
1130 else if (NOW < last_activity + ::conf.keepalive + 10) 1155 else if (NOW < last_activity + ::conf.keepalive + 10)
1131 // hold ondemand connections implicitly a few seconds longer 1156 // hold ondemand connections implicitly a few seconds longer
1132 // should delete octx, though, or something like that ;) 1157 // should delete octx, though, or something like that ;)
1133 w.at = last_activity + ::conf.keepalive + 10; 1158 w.start (last_activity + ::conf.keepalive + 10);
1134 else 1159 else
1135 reset_connection (); 1160 reset_connection ();
1136} 1161}
1137 1162
1138void connection::send_connect_request (int id) 1163void connection::send_connect_request (int id)
1144 send_vpn_packet (p, si); 1169 send_vpn_packet (p, si);
1145 1170
1146 delete p; 1171 delete p;
1147} 1172}
1148 1173
1174void connection::script_init_env (const char *ext)
1175{
1176 char *env;
1177 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1178 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1179 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1180 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1181 conf->id & 0xff); putenv (env);
1182}
1183
1149void connection::script_node () 1184void connection::script_init_connect_env ()
1150{ 1185{
1151 vpn->script_if_up (); 1186 vpn->script_init_env ();
1152 1187
1153 char *env; 1188 char *env;
1154 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1189 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1155 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1190 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1156 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1191 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1157 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1192 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1158} 1193}
1159 1194
1160const char *connection::script_node_up () 1195const char *connection::script_node_up ()
1161{ 1196{
1162 script_node (); 1197 script_init_connect_env ();
1163 1198
1164 putenv ("STATE=up"); 1199 putenv ("STATE=up");
1165 1200
1201 char *filename;
1202 asprintf (&filename,
1203 "%s/%s",
1204 confbase,
1166 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1205 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1206
1207 return filename;
1167} 1208}
1168 1209
1169const char *connection::script_node_down () 1210const char *connection::script_node_down ()
1170{ 1211{
1171 script_node (); 1212 script_init_connect_env ();
1172 1213
1173 putenv ("STATE=down"); 1214 putenv ("STATE=down");
1174 1215
1175 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1216 char *filename;
1176} 1217 asprintf (&filename,
1218 "%s/%s",
1219 confbase,
1220 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1177 1221
1222 return filename;
1223}
1224
1178connection::connection(struct vpn *vpn_) 1225connection::connection (struct vpn *vpn, conf_node *conf)
1179: vpn(vpn_) 1226: vpn(vpn), conf(conf)
1180, rekey (this, &connection::rekey_cb) 1227, rekey (this, &connection::rekey_cb)
1181, keepalive (this, &connection::keepalive_cb) 1228, keepalive (this, &connection::keepalive_cb)
1182, establish_connection (this, &connection::establish_connection_cb) 1229, establish_connection (this, &connection::establish_connection_cb)
1230#if ENABLE_DNS
1231, dns (0)
1232#endif
1183{ 1233{
1184 octx = ictx = 0; 1234 octx = ictx = 0;
1185 retry_cnt = 0; 1235 retry_cnt = 0;
1186 1236
1237 if (!conf->protocols) // make sure some protocol is enabled
1238 conf->protocols = PROT_UDPv4;
1239
1187 connectmode = conf_node::C_ALWAYS; // initial setting 1240 connectmode = conf_node::C_ALWAYS; // initial setting
1188 reset_connection (); 1241 reset_connection ();
1189} 1242}
1190 1243
1191connection::~connection () 1244connection::~connection ()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines