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.21 by pcg, Thu Oct 16 02:28:36 2003 UTC vs.
Revision 1.50 by pcg, Fri Mar 18 01:53:05 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines