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.20 by pcg, Tue Oct 14 15:48:15 2003 UTC vs.
Revision 1.49 by pcg, Sat Mar 12 18:10:40 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>
… …
43# define RAND_pseudo_bytes RAND_bytes 44# define RAND_pseudo_bytes RAND_bytes
44#endif 45#endif
45 46
46#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 47#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
47 48
49#define ULTRA_FAST 1
50#define HLOG 15
51#include "lzf/lzf.h"
52#include "lzf/lzf_c.c"
53#include "lzf/lzf_d.c"
54
48struct crypto_ctx 55struct crypto_ctx
49{ 56{
50 EVP_CIPHER_CTX cctx; 57 EVP_CIPHER_CTX cctx;
51 HMAC_CTX hctx; 58 HMAC_CTX hctx;
52 59
… …
55}; 62};
56 63
57crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 64crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
58{ 65{
59 EVP_CIPHER_CTX_init (&cctx); 66 EVP_CIPHER_CTX_init (&cctx);
60 EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc); 67 require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));
61 HMAC_CTX_init (&hctx); 68 HMAC_CTX_init (&hctx);
62 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0); 69 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
63} 70}
64 71
65crypto_ctx::~crypto_ctx () 72crypto_ctx::~crypto_ctx ()
66{ 73{
67 EVP_CIPHER_CTX_cleanup (&cctx); 74 require (EVP_CIPHER_CTX_cleanup (&cctx));
68 HMAC_CTX_cleanup (&hctx); 75 HMAC_CTX_cleanup (&hctx);
69} 76}
70 77
71static void 78static void
72rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 79rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
73{ 80{
74 EVP_MD_CTX ctx; 81 EVP_MD_CTX ctx;
75 82
76 EVP_MD_CTX_init (&ctx); 83 EVP_MD_CTX_init (&ctx);
77 EVP_DigestInit (&ctx, RSA_HASH); 84 require (EVP_DigestInit (&ctx, RSA_HASH));
78 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 85 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
79 EVP_DigestUpdate(&ctx, &id, sizeof id); 86 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
80 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 87 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
81 EVP_MD_CTX_cleanup (&ctx); 88 EVP_MD_CTX_cleanup (&ctx);
82} 89}
83 90
84struct rsa_entry { 91struct rsa_entry {
85 tstamp expire; 92 tstamp expire;
… …
133 140
134} rsa_cache; 141} rsa_cache;
135 142
136void rsa_cache::cleaner_cb (time_watcher &w) 143void rsa_cache::cleaner_cb (time_watcher &w)
137{ 144{
138 if (empty ()) 145 if (!empty ())
139 w.at = TSTAMP_CANCEL;
140 else
141 { 146 {
142 w.at = NOW + RSA_TTL; 147 w.start (NOW + RSA_TTL);
143 148
144 for (iterator i = begin (); i != end (); ) 149 for (iterator i = begin (); i != end (); )
145 if (i->expire <= NOW) 150 if (i->expire <= NOW)
146 i = erase (i); 151 i = erase (i);
147 else 152 else
… …
199// only do action once every x seconds per host whole allowing bursts. 204// only do action once every x seconds per host whole allowing bursts.
200// this implementation ("splay list" ;) is inefficient, 205// this implementation ("splay list" ;) is inefficient,
201// but low on resources. 206// but low on resources.
202struct net_rate_limiter : list<net_rateinfo> 207struct net_rate_limiter : list<net_rateinfo>
203{ 208{
204 static const double ALPHA = 1. - 1. / 600.; // allow bursts 209# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
205 static const double CUTOFF = 10.; // one event every CUTOFF seconds 210# define NRL_CUTOFF 10. // one event every CUTOFF seconds
206 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 211# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
207 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 212# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
208 213
209 bool can (const sockinfo &si) { return can((u32)si.host); } 214 bool can (const sockinfo &si) { return can((u32)si.host); }
210 bool can (u32 host); 215 bool can (u32 host);
211}; 216};
212 217
… …
217 iterator i; 222 iterator i;
218 223
219 for (i = begin (); i != end (); ) 224 for (i = begin (); i != end (); )
220 if (i->host == host) 225 if (i->host == host)
221 break; 226 break;
222 else if (i->last < NOW - EXPIRE) 227 else if (i->last < NOW - NRL_EXPIRE)
223 i = erase (i); 228 i = erase (i);
224 else 229 else
225 i++; 230 i++;
226 231
227 if (i == end ()) 232 if (i == end ())
228 { 233 {
229 net_rateinfo ri; 234 net_rateinfo ri;
230 235
231 ri.host = host; 236 ri.host = host;
232 ri.pcnt = 1.; 237 ri.pcnt = 1.;
233 ri.diff = MAXDIF; 238 ri.diff = NRL_MAXDIF;
234 ri.last = NOW; 239 ri.last = NOW;
235 240
236 push_front (ri); 241 push_front (ri);
237 242
238 return true; 243 return true;
… …
240 else 245 else
241 { 246 {
242 net_rateinfo ri (*i); 247 net_rateinfo ri (*i);
243 erase (i); 248 erase (i);
244 249
245 ri.pcnt = ri.pcnt * ALPHA; 250 ri.pcnt = ri.pcnt * NRL_ALPHA;
246 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 251 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
247 252
248 ri.last = NOW; 253 ri.last = NOW;
249 254
250 double dif = ri.diff / ri.pcnt; 255 double dif = ri.diff / ri.pcnt;
251 256
252 bool send = dif > CUTOFF; 257 bool send = dif > NRL_CUTOFF;
253 258
254 if (dif > MAXDIF) 259 if (dif > NRL_MAXDIF)
255 { 260 {
256 ri.pcnt = 1.; 261 ri.pcnt = 1.;
257 ri.diff = MAXDIF; 262 ri.diff = NRL_MAXDIF;
258 } 263 }
259 else if (send) 264 else if (send)
260 ri.pcnt++; 265 ri.pcnt++;
261 266
262 push_front (ri); 267 push_front (ri);
… …
309} 314}
310 315
311#define MAXVPNDATA (MAX_MTU - 6 - 6) 316#define MAXVPNDATA (MAX_MTU - 6 - 6)
312#define DATAHDR (sizeof (u32) + RAND_SIZE) 317#define DATAHDR (sizeof (u32) + RAND_SIZE)
313 318
314struct vpndata_packet:vpn_packet 319struct vpndata_packet : vpn_packet
315 { 320 {
316 u8 data[MAXVPNDATA + DATAHDR]; // seqno 321 u8 data[MAXVPNDATA + DATAHDR]; // seqno
317 322
318 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno); 323 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
319 tap_packet *unpack (connection *conn, u32 &seqno); 324 tap_packet *unpack (connection *conn, u32 &seqno);
… …
332 int outl = 0, outl2; 337 int outl = 0, outl2;
333 ptype type = PT_DATA_UNCOMPRESSED; 338 ptype type = PT_DATA_UNCOMPRESSED;
334 339
335#if ENABLE_COMPRESSION 340#if ENABLE_COMPRESSION
336 u8 cdata[MAX_MTU]; 341 u8 cdata[MAX_MTU];
337 u32 cl;
338 342
343 if (conn->features & ENABLE_COMPRESSION)
344 {
339 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 345 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
346
340 if (cl) 347 if (cl)
341 { 348 {
342 type = PT_DATA_COMPRESSED; 349 type = PT_DATA_COMPRESSED;
343 d = cdata; 350 d = cdata;
344 l = cl + 2; 351 l = cl + 2;
345 352
346 d[0] = cl >> 8; 353 d[0] = cl >> 8;
347 d[1] = cl; 354 d[1] = cl;
355 }
348 } 356 }
349#endif 357#endif
350 358
351 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 359 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
352 360
353 struct { 361 struct {
354#if RAND_SIZE 362#if RAND_SIZE
355 u8 rnd[RAND_SIZE]; 363 u8 rnd[RAND_SIZE];
356#endif 364#endif
… …
360 datahdr.seqno = ntohl (seqno); 368 datahdr.seqno = ntohl (seqno);
361#if RAND_SIZE 369#if RAND_SIZE
362 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 370 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
363#endif 371#endif
364 372
365 EVP_EncryptUpdate (cctx, 373 require (EVP_EncryptUpdate (cctx,
366 (unsigned char *) data + outl, &outl2, 374 (unsigned char *) data + outl, &outl2,
367 (unsigned char *) &datahdr, DATAHDR); 375 (unsigned char *) &datahdr, DATAHDR));
368 outl += outl2; 376 outl += outl2;
369 377
370 EVP_EncryptUpdate (cctx, 378 require (EVP_EncryptUpdate (cctx,
371 (unsigned char *) data + outl, &outl2, 379 (unsigned char *) data + outl, &outl2,
372 (unsigned char *) d, l); 380 (unsigned char *) d, l));
373 outl += outl2; 381 outl += outl2;
374 382
375 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 383 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
376 outl += outl2; 384 outl += outl2;
377 385
378 len = outl + data_hdr_size (); 386 len = outl + data_hdr_size ();
379 387
380 set_hdr (type, dst); 388 set_hdr (type, dst);
… …
389 int outl = 0, outl2; 397 int outl = 0, outl2;
390 tap_packet *p = new tap_packet; 398 tap_packet *p = new tap_packet;
391 u8 *d; 399 u8 *d;
392 u32 l = len - data_hdr_size (); 400 u32 l = len - data_hdr_size ();
393 401
394 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 402 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
395 403
396#if ENABLE_COMPRESSION 404#if ENABLE_COMPRESSION
397 u8 cdata[MAX_MTU]; 405 u8 cdata[MAX_MTU];
398 406
399 if (type == PT_DATA_COMPRESSED) 407 if (type == PT_DATA_COMPRESSED)
… …
401 else 409 else
402#endif 410#endif
403 d = &(*p)[6 + 6 - DATAHDR]; 411 d = &(*p)[6 + 6 - DATAHDR];
404 412
405 /* this overwrites part of the src mac, but we fix that later */ 413 /* this overwrites part of the src mac, but we fix that later */
406 EVP_DecryptUpdate (cctx, 414 require (EVP_DecryptUpdate (cctx,
407 d, &outl2, 415 d, &outl2,
408 (unsigned char *)&data, len - data_hdr_size ()); 416 (unsigned char *)&data, len - data_hdr_size ()));
409 outl += outl2; 417 outl += outl2;
410 418
411 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 419 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
412 outl += outl2; 420 outl += outl2;
413 421
414 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 422 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
415 423
416 id2mac (dst () ? dst() : THISNODE->id, p->dst); 424 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
445{ 453{
446 // actually, hmaclen cannot be checked because the hmac 454 // actually, hmaclen cannot be checked because the hmac
447 // field comes before this data, so peers with other 455 // field comes before this data, so peers with other
448 // hmacs simply will not work. 456 // hmacs simply will not work.
449 u8 prot_major, prot_minor, randsize, hmaclen; 457 u8 prot_major, prot_minor, randsize, hmaclen;
450 u8 flags, challengelen, pad2, pad3; 458 u8 flags, challengelen, features, pad3;
451 u32 cipher_nid, digest_nid, hmac_nid; 459 u32 cipher_nid, digest_nid, hmac_nid;
452
453 const u8 curflags () const
454 {
455 return 0x80
456 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
457 }
458 460
459 void setup (ptype type, int dst); 461 void setup (ptype type, int dst);
460 bool chk_config () const; 462 bool chk_config () const;
463
464 static u8 get_features ()
465 {
466 u8 f = 0;
467#if ENABLE_COMPRESSION
468 f |= FEATURE_COMPRESSION;
469#endif
470#if ENABLE_ROHC
471 f |= FEATURE_ROHC;
472#endif
473 return f;
474 }
461}; 475};
462 476
463void config_packet::setup (ptype type, int dst) 477void config_packet::setup (ptype type, int dst)
464{ 478{
465 prot_major = PROTOCOL_MAJOR; 479 prot_major = PROTOCOL_MAJOR;
466 prot_minor = PROTOCOL_MINOR; 480 prot_minor = PROTOCOL_MINOR;
467 randsize = RAND_SIZE; 481 randsize = RAND_SIZE;
468 hmaclen = HMACLENGTH; 482 hmaclen = HMACLENGTH;
469 flags = curflags (); 483 flags = 0;
470 challengelen = sizeof (rsachallenge); 484 challengelen = sizeof (rsachallenge);
485 features = get_features ();
471 486
472 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
473 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 488 digest_nid = htonl (EVP_MD_type (RSA_HASH));
474 hmac_nid = htonl (EVP_MD_type (DIGEST)); 489 hmac_nid = htonl (EVP_MD_type (DIGEST));
475 490
… …
478} 493}
479 494
480bool config_packet::chk_config () const 495bool config_packet::chk_config () const
481{ 496{
482 if (prot_major != PROTOCOL_MAJOR) 497 if (prot_major != PROTOCOL_MAJOR)
483 slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR); 498 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
484 else if (randsize != RAND_SIZE) 499 else if (randsize != RAND_SIZE)
485 slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE); 500 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
486 else if (hmaclen != HMACLENGTH) 501 else if (hmaclen != HMACLENGTH)
487 slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH); 502 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)) 503 else if (challengelen != sizeof (rsachallenge))
491 slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge)); 504 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
492 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 505 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
493 slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 506 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))) 507 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)); 508 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))) 509 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
497 slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 510 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
498 else 511 else
499 return true; 512 return true;
500 513
501 return false; 514 return false;
502} 515}
503 516
504struct auth_req_packet : config_packet 517struct auth_req_packet : config_packet
505{ 518{
506 char magic[8]; 519 char magic[8];
507 u8 initiate; // false if this is just an automatic reply 520 u8 initiate; // false if this is just an automatic reply
508 u8 protocols; // supported protocols (will get patches on forward) 521 u8 protocols; // supported protocols (will be patched on forward)
509 u8 pad2, pad3; 522 u8 pad2, pad3;
510 rsaid id; 523 rsaid id;
511 rsaencrdata encr; 524 rsaencrdata encr;
512 525
513 auth_req_packet (int dst, bool initiate_, u8 protocols_) 526 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
574{ 587{
575 if (ictx && octx) 588 if (ictx && octx)
576 { 589 {
577 connectmode = conf->connectmode; 590 connectmode = conf->connectmode;
578 591
592 // make sure rekeying timeouts are slightly asymmetric
579 rekey.start (NOW + ::conf.rekey); 593 rekey.start (NOW + ::conf.rekey
594 + (conf->id > THISNODE->id ? 10 : 0));
580 keepalive.start (NOW + ::conf.keepalive); 595 keepalive.start (NOW + ::conf.keepalive);
581 596
582 // send queued packets 597 // send queued packets
583 if (ictx && octx) 598 if (ictx && octx)
584 { 599 {
… …
597 } 612 }
598 else 613 else
599 { 614 {
600 retry_cnt = 0; 615 retry_cnt = 0;
601 establish_connection.start (NOW + 5); 616 establish_connection.start (NOW + 5);
602 keepalive.reset (); 617 keepalive.stop ();
603 rekey.reset (); 618 rekey.stop ();
604 } 619 }
605} 620}
606 621
607void 622void
608connection::reset_si () 623connection::reset_si ()
… …
610 protocol = best_protocol (THISNODE->protocols & conf->protocols); 625 protocol = best_protocol (THISNODE->protocols & conf->protocols);
611 626
612 // mask out protocols we cannot establish 627 // mask out protocols we cannot establish
613 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 628 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
614 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 629 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
630 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
615 631
616 si.set (conf, protocol); 632 si.set (conf, protocol);
617} 633}
618 634
619// ensure sockinfo is valid, forward if necessary 635// ensure sockinfo is valid, forward if necessary
… …
624 { 640 {
625 connection *r = vpn->find_router (); 641 connection *r = vpn->find_router ();
626 642
627 if (r) 643 if (r)
628 { 644 {
629 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 645 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
630 conf->nodename, r->conf->nodename); 646 conf->nodename, r->conf->nodename, (const char *)r->si);
631 return r->si; 647 return r->si;
632 } 648 }
633 else 649 else
634 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 650 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
635 conf->nodename); 651 conf->nodename);
… …
674connection::send_auth_request (const sockinfo &si, bool initiate) 690connection::send_auth_request (const sockinfo &si, bool initiate)
675{ 691{
676 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 692 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
677 693
678 rsachallenge chg; 694 rsachallenge chg;
679
680 rsa_cache.gen (pkt->id, chg); 695 rsa_cache.gen (pkt->id, chg);
681 696 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 697
687 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 698 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
688 699
689 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 700 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
690 701
… …
724} 735}
725 736
726void 737void
727connection::establish_connection_cb (time_watcher &w) 738connection::establish_connection_cb (time_watcher &w)
728{ 739{
729 if (ictx || conf == THISNODE 740 if (!ictx
741 && conf != THISNODE
730 || connectmode == conf_node::C_NEVER 742 && connectmode != conf_node::C_NEVER
731 || connectmode == conf_node::C_DISABLED) 743 && connectmode != conf_node::C_DISABLED
732 w.at = TSTAMP_CANCEL; 744 && NOW > w.at)
733 else if (w.at <= NOW)
734 { 745 {
735 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 746 w.at = TSTAMP_MAX; // first disable this watcher in case of recursion
736 747
737 if (retry_int < 3600 * 8) 748 double retry_int = double (retry_cnt & 3
738 retry_cnt++; 749 ? (retry_cnt & 3) + 1
739 750 : 1 << (retry_cnt >> 2));
740 w.at = NOW + retry_int;
741 751
742 reset_si (); 752 reset_si ();
753
754 bool slow = si.prot & PROT_SLOW;
743 755
744 if (si.prot && !si.host) 756 if (si.prot && !si.host)
745 vpn->send_connect_request (conf->id); 757 vpn->send_connect_request (conf->id);
746 else 758 else
747 { 759 {
748 const sockinfo &dsi = forward_si (si); 760 const sockinfo &dsi = forward_si (si);
761
762 slow = slow || (dsi.prot & PROT_SLOW);
749 763
750 if (dsi.valid () && auth_rate_limiter.can (dsi)) 764 if (dsi.valid () && auth_rate_limiter.can (dsi))
751 { 765 {
752 if (retry_cnt < 4) 766 if (retry_cnt < 4)
753 send_auth_request (dsi, true); 767 send_auth_request (dsi, true);
754 else 768 else
755 send_ping (dsi, 0); 769 send_ping (dsi, 0);
756 } 770 }
757 } 771 }
772
773 retry_int *= slow ? 8. : 0.7;
774
775 if (retry_int < conf->max_retry)
776 retry_cnt++;
777 else
778 retry_int = conf->max_retry;
779
780 w.start (NOW + retry_int);
758 } 781 }
759} 782}
760 783
761void 784void
762connection::reset_connection () 785connection::reset_connection ()
… …
770 run_script (run_script_cb (this, &connection::script_node_down), false); 793 run_script (run_script_cb (this, &connection::script_node_down), false);
771 } 794 }
772 795
773 delete ictx; ictx = 0; 796 delete ictx; ictx = 0;
774 delete octx; octx = 0; 797 delete octx; octx = 0;
798#if ENABLE_DNS
799 dnsv4_reset_connection ();
800#endif
775 801
776 si.host= 0; 802 si.host = 0;
777 803
778 last_activity = 0; 804 last_activity = 0;
779 retry_cnt = 0; 805 retry_cnt = 0;
780 806
781 rekey.reset (); 807 rekey.stop ();
782 keepalive.reset (); 808 keepalive.stop ();
783 establish_connection.reset (); 809 establish_connection.stop ();
784} 810}
785 811
786void 812void
787connection::shutdown () 813connection::shutdown ()
788{ 814{
… …
793} 819}
794 820
795void 821void
796connection::rekey_cb (time_watcher &w) 822connection::rekey_cb (time_watcher &w)
797{ 823{
798 w.at = TSTAMP_CANCEL;
799
800 reset_connection (); 824 reset_connection ();
801 establish_connection (); 825 establish_connection ();
802} 826}
803 827
804void 828void
805connection::send_data_packet (tap_packet *pkt, bool broadcast) 829connection::send_data_packet (tap_packet *pkt)
806{ 830{
807 vpndata_packet *p = new vpndata_packet; 831 vpndata_packet *p = new vpndata_packet;
808 int tos = 0; 832 int tos = 0;
809 833
810 // I am not hilarious about peeking into packets, but so be it. 834 // I am not hilarious about peeking into packets, but so be it.
811 if (conf->inherit_tos 835 if (conf->inherit_tos && pkt->is_ipv4 ())
812 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
813 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
814 tos = (*pkt)[15] & IPTOS_TOS_MASK; 836 tos = (*pkt)[15] & IPTOS_TOS_MASK;
815 837
816 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 838 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
817 send_vpn_packet (p, si, tos); 839 send_vpn_packet (p, si, tos);
818 840
819 delete p; 841 delete p;
820 842
821 if (oseqno > MAX_SEQNO) 843 if (oseqno > MAX_SEQNO)
822 rekey (); 844 rekey ();
823} 845}
824 846
825void 847void
826connection::inject_data_packet (tap_packet *pkt, bool broadcast) 848connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
827{ 849{
828 if (ictx && octx) 850 if (ictx && octx)
829 send_data_packet (pkt, broadcast); 851 send_data_packet (pkt);
830 else 852 else
831 { 853 {
832 if (!broadcast)//DDDD 854 if (!broadcast)//DDDD
833 data_queue.put (new tap_packet (*pkt)); 855 data_queue.put (new tap_packet (*pkt));
834 856
… …
840{ 862{
841 if (ictx && octx) 863 if (ictx && octx)
842 send_vpn_packet (pkt, si, tos); 864 send_vpn_packet (pkt, si, tos);
843 else 865 else
844 { 866 {
845 vpn_queue.put (new vpn_packet (*pkt)); 867 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
846 868
847 establish_connection (); 869 establish_connection ();
848 } 870 }
849} 871}
850 872
… …
909 if (p->initiate) 931 if (p->initiate)
910 send_auth_request (rsi, false); 932 send_auth_request (rsi, false);
911 933
912 rsachallenge k; 934 rsachallenge k;
913 935
914 if (0 > RSA_private_decrypt (sizeof (p->encr), 936 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
915 (unsigned char *)&p->encr, (unsigned char *)&k, 937 {
916 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
917 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 938 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
918 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 939 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
940 break;
941 }
919 else 942 else
920 { 943 {
921 delete octx; 944 delete octx;
922 945
923 octx = new crypto_ctx (k, 1); 946 octx = new crypto_ctx (k, 1);
924 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 947 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
925 948
926 conf->protocols = p->protocols; 949 conf->protocols = p->protocols;
950 features = p->features & config_packet::get_features ();
927 951
928 send_auth_response (rsi, p->id, k); 952 send_auth_response (rsi, p->id, k);
929 953
930 connection_established (); 954 connection_established ();
931 955
… …
967 crypto_ctx *cctx = new crypto_ctx (chg, 0); 991 crypto_ctx *cctx = new crypto_ctx (chg, 0);
968 992
969 if (!p->hmac_chk (cctx)) 993 if (!p->hmac_chk (cctx))
970 { 994 {
971 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 995 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
972 "could be an attack, or just corruption or an synchronization error"), 996 "could be an attack, or just corruption or a synchronization error"),
973 conf->nodename, (const char *)rsi); 997 conf->nodename, (const char *)rsi);
974 break; 998 break;
975 } 999 }
976 else 1000 else
977 { 1001 {
… …
1026 { 1050 {
1027 vpndata_packet *p = (vpndata_packet *)pkt; 1051 vpndata_packet *p = (vpndata_packet *)pkt;
1028 1052
1029 if (!p->hmac_chk (ictx)) 1053 if (!p->hmac_chk (ictx))
1030 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"
1031 "could be an attack, or just corruption or an synchronization error"), 1055 "could be an attack, or just corruption or a synchronization error"),
1032 conf->nodename, (const char *)rsi); 1056 conf->nodename, (const char *)rsi);
1033 else 1057 else
1034 { 1058 {
1035 u32 seqno; 1059 u32 seqno;
1036 tap_packet *d = p->unpack (this, seqno); 1060 tap_packet *d = p->unpack (this, seqno);
1037 1061
1038 if (iseqno.recv_ok (seqno)) 1062 if (iseqno.recv_ok (seqno))
1039 { 1063 {
1040 vpn->tap->send (d); 1064 vpn->tap->send (d);
1041 1065
1042 if (p->dst () == 0) // re-broadcast
1043 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1044 {
1045 connection *c = *i;
1046
1047 if (c->conf != THISNODE && c->conf != conf)
1048 c->inject_data_packet (d);
1049 }
1050
1051 if (si != rsi) 1066 if (si != rsi)
1052 { 1067 {
1053 // fast re-sync on connection changes, useful especially for tcp/ip 1068 // fast re-sync on connection changes, useful especially for tcp/ip
1054 si = rsi; 1069 si = rsi;
1055 1070
1056 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1071 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1057 conf->nodename, (const char *)si, (const char *)rsi); 1072 conf->nodename, (const char *)si, (const char *)rsi);
1058 } 1073 }
1059
1060 delete d;
1061
1062 break;
1063 } 1074 }
1075
1076 delete d;
1077 break;
1064 } 1078 }
1065 } 1079 }
1066 1080
1067 send_reset (rsi); 1081 send_reset (rsi);
1068 break; 1082 break;
… …
1093 break; 1107 break;
1094 1108
1095 case vpn_packet::PT_CONNECT_INFO: 1109 case vpn_packet::PT_CONNECT_INFO:
1096 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1110 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1097 { 1111 {
1098 connect_info_packet *p = (connect_info_packet *) pkt; 1112 connect_info_packet *p = (connect_info_packet *)pkt;
1099 1113
1100 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
1101 1115 {
1102 connection *c = vpn->conns[p->id - 1]; 1116 connection *c = vpn->conns[p->id - 1];
1103 1117
1104 c->conf->protocols = p->protocols; 1118 c->conf->protocols = p->protocols;
1105 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));
1106 p->si.upgrade_protocol (protocol, c->conf); 1120 p->si.upgrade_protocol (protocol, c->conf);
1107 1121
1108 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1122 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1109 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);
1110 1124
1111 const sockinfo &dsi = forward_si (p->si); 1125 const sockinfo &dsi = forward_si (p->si);
1112 1126
1113 if (dsi.valid ()) 1127 if (dsi.valid ())
1114 c->send_auth_request (dsi, true); 1128 c->send_auth_request (dsi, true);
1129 }
1115 } 1130 }
1116 1131
1117 break; 1132 break;
1118 1133
1119 default: 1134 default:
… …
1128 { 1143 {
1129 reset_connection (); 1144 reset_connection ();
1130 establish_connection (); 1145 establish_connection ();
1131 } 1146 }
1132 else if (NOW < last_activity + ::conf.keepalive) 1147 else if (NOW < last_activity + ::conf.keepalive)
1133 w.at = last_activity + ::conf.keepalive; 1148 w.start (last_activity + ::conf.keepalive);
1134 else if (conf->connectmode != conf_node::C_ONDEMAND 1149 else if (conf->connectmode != conf_node::C_ONDEMAND
1135 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1150 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1136 { 1151 {
1137 send_ping (si); 1152 send_ping (si);
1138 w.at = NOW + 5; 1153 w.start (NOW + 5);
1139 } 1154 }
1140 else if (NOW < last_activity + ::conf.keepalive + 10) 1155 else if (NOW < last_activity + ::conf.keepalive + 10)
1141 // hold ondemand connections implicitly a few seconds longer 1156 // hold ondemand connections implicitly a few seconds longer
1142 // should delete octx, though, or something like that ;) 1157 // should delete octx, though, or something like that ;)
1143 w.at = last_activity + ::conf.keepalive + 10; 1158 w.start (last_activity + ::conf.keepalive + 10);
1144 else 1159 else
1145 reset_connection (); 1160 reset_connection ();
1146} 1161}
1147 1162
1148void connection::send_connect_request (int id) 1163void connection::send_connect_request (int id)
… …
1183 putenv ("STATE=down"); 1198 putenv ("STATE=down");
1184 1199
1185 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1200 return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1186} 1201}
1187 1202
1188connection::connection(struct vpn *vpn_) 1203connection::connection (struct vpn *vpn, conf_node *conf)
1189: vpn(vpn_) 1204: vpn(vpn), conf(conf)
1190, rekey (this, &connection::rekey_cb) 1205, rekey (this, &connection::rekey_cb)
1191, keepalive (this, &connection::keepalive_cb) 1206, keepalive (this, &connection::keepalive_cb)
1192, establish_connection (this, &connection::establish_connection_cb) 1207, establish_connection (this, &connection::establish_connection_cb)
1208#if ENABLE_DNS
1209, dns (0)
1210#endif
1193{ 1211{
1194 octx = ictx = 0; 1212 octx = ictx = 0;
1195 retry_cnt = 0; 1213 retry_cnt = 0;
1196 1214
1215 if (!conf->protocols) // make sure some protocol is enabled
1216 conf->protocols = PROT_UDPv4;
1217
1197 connectmode = conf_node::C_ALWAYS; // initial setting 1218 connectmode = conf_node::C_ALWAYS; // initial setting
1198 reset_connection (); 1219 reset_connection ();
1199} 1220}
1200 1221
1201connection::~connection () 1222connection::~connection ()

Diff Legend

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