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.19 by pcg, Tue Oct 14 03:22:09 2003 UTC vs.
Revision 1.48 by pcg, Tue Mar 8 00:32:54 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>
… …
35#include "slog.h" 36#include "slog.h"
36#include "device.h" 37#include "device.h"
37#include "vpn.h" 38#include "vpn.h"
38#include "connection.h" 39#include "connection.h"
39 40
40#include <sys/socket.h> 41#include "netcompat.h"
41#ifdef HAVE_NETINET_IN_H
42# include <netinet/in.h>
43#endif
44#include <arpa/inet.h>
45#include <net/if.h>
46#ifdef HAVE_NETINET_IN_SYSTM_H
47# include <netinet/in_systm.h>
48#endif
49#ifdef HAVE_NETINET_IP_H
50# include <netinet/ip.h>
51#endif
52
53#ifndef IPTOS_TOS_MASK
54# define IPTOS_TOS_MASK (IPTOS_LOWDELAY | IPTOS_THROUGHPUT | IPTOS_RELIABILITY | IPTOS_MINCOST)
55#endif
56 42
57#if !HAVE_RAND_PSEUDO_BYTES 43#if !HAVE_RAND_PSEUDO_BYTES
58# define RAND_pseudo_bytes RAND_bytes 44# define RAND_pseudo_bytes RAND_bytes
59#endif 45#endif
60 46
61#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 47#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
62 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
63struct crypto_ctx 55struct crypto_ctx
64{ 56{
65 EVP_CIPHER_CTX cctx; 57 EVP_CIPHER_CTX cctx;
66 HMAC_CTX hctx; 58 HMAC_CTX hctx;
67 59
… …
70}; 62};
71 63
72crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 64crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
73{ 65{
74 EVP_CIPHER_CTX_init (&cctx); 66 EVP_CIPHER_CTX_init (&cctx);
75 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));
76 HMAC_CTX_init (&hctx); 68 HMAC_CTX_init (&hctx);
77 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);
78} 70}
79 71
80crypto_ctx::~crypto_ctx () 72crypto_ctx::~crypto_ctx ()
81{ 73{
82 EVP_CIPHER_CTX_cleanup (&cctx); 74 require (EVP_CIPHER_CTX_cleanup (&cctx));
83 HMAC_CTX_cleanup (&hctx); 75 HMAC_CTX_cleanup (&hctx);
84} 76}
85 77
86static void 78static void
87rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 79rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
88{ 80{
89 EVP_MD_CTX ctx; 81 EVP_MD_CTX ctx;
90 82
91 EVP_MD_CTX_init (&ctx); 83 EVP_MD_CTX_init (&ctx);
92 EVP_DigestInit (&ctx, RSA_HASH); 84 require (EVP_DigestInit (&ctx, RSA_HASH));
93 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 85 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
94 EVP_DigestUpdate(&ctx, &id, sizeof id); 86 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
95 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 87 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
96 EVP_MD_CTX_cleanup (&ctx); 88 EVP_MD_CTX_cleanup (&ctx);
97} 89}
98 90
99struct rsa_entry { 91struct rsa_entry {
100 tstamp expire; 92 tstamp expire;
… …
148 140
149} rsa_cache; 141} rsa_cache;
150 142
151void rsa_cache::cleaner_cb (time_watcher &w) 143void rsa_cache::cleaner_cb (time_watcher &w)
152{ 144{
153 if (empty ()) 145 if (!empty ())
154 w.at = TSTAMP_CANCEL;
155 else
156 { 146 {
157 w.at = NOW + RSA_TTL; 147 w.start (NOW + RSA_TTL);
158 148
159 for (iterator i = begin (); i != end (); ) 149 for (iterator i = begin (); i != end (); )
160 if (i->expire <= NOW) 150 if (i->expire <= NOW)
161 i = erase (i); 151 i = erase (i);
162 else 152 else
… …
214// 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.
215// this implementation ("splay list" ;) is inefficient, 205// this implementation ("splay list" ;) is inefficient,
216// but low on resources. 206// but low on resources.
217struct net_rate_limiter : list<net_rateinfo> 207struct net_rate_limiter : list<net_rateinfo>
218{ 208{
219 static const double ALPHA = 1. - 1. / 600.; // allow bursts 209# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
220 static const double CUTOFF = 10.; // one event every CUTOFF seconds 210# define NRL_CUTOFF 10. // one event every CUTOFF seconds
221 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 211# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
222 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
223 213
224 bool can (const sockinfo &si) { return can((u32)si.host); } 214 bool can (const sockinfo &si) { return can((u32)si.host); }
225 bool can (u32 host); 215 bool can (u32 host);
226}; 216};
227 217
… …
232 iterator i; 222 iterator i;
233 223
234 for (i = begin (); i != end (); ) 224 for (i = begin (); i != end (); )
235 if (i->host == host) 225 if (i->host == host)
236 break; 226 break;
237 else if (i->last < NOW - EXPIRE) 227 else if (i->last < NOW - NRL_EXPIRE)
238 i = erase (i); 228 i = erase (i);
239 else 229 else
240 i++; 230 i++;
241 231
242 if (i == end ()) 232 if (i == end ())
243 { 233 {
244 net_rateinfo ri; 234 net_rateinfo ri;
245 235
246 ri.host = host; 236 ri.host = host;
247 ri.pcnt = 1.; 237 ri.pcnt = 1.;
248 ri.diff = MAXDIF; 238 ri.diff = NRL_MAXDIF;
249 ri.last = NOW; 239 ri.last = NOW;
250 240
251 push_front (ri); 241 push_front (ri);
252 242
253 return true; 243 return true;
… …
255 else 245 else
256 { 246 {
257 net_rateinfo ri (*i); 247 net_rateinfo ri (*i);
258 erase (i); 248 erase (i);
259 249
260 ri.pcnt = ri.pcnt * ALPHA; 250 ri.pcnt = ri.pcnt * NRL_ALPHA;
261 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 251 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
262 252
263 ri.last = NOW; 253 ri.last = NOW;
264 254
265 double dif = ri.diff / ri.pcnt; 255 double dif = ri.diff / ri.pcnt;
266 256
267 bool send = dif > CUTOFF; 257 bool send = dif > NRL_CUTOFF;
268 258
269 if (dif > MAXDIF) 259 if (dif > NRL_MAXDIF)
270 { 260 {
271 ri.pcnt = 1.; 261 ri.pcnt = 1.;
272 ri.diff = MAXDIF; 262 ri.diff = NRL_MAXDIF;
273 } 263 }
274 else if (send) 264 else if (send)
275 ri.pcnt++; 265 ri.pcnt++;
276 266
277 push_front (ri); 267 push_front (ri);
… …
324} 314}
325 315
326#define MAXVPNDATA (MAX_MTU - 6 - 6) 316#define MAXVPNDATA (MAX_MTU - 6 - 6)
327#define DATAHDR (sizeof (u32) + RAND_SIZE) 317#define DATAHDR (sizeof (u32) + RAND_SIZE)
328 318
329struct vpndata_packet:vpn_packet 319struct vpndata_packet : vpn_packet
330 { 320 {
331 u8 data[MAXVPNDATA + DATAHDR]; // seqno 321 u8 data[MAXVPNDATA + DATAHDR]; // seqno
332 322
333 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);
334 tap_packet *unpack (connection *conn, u32 &seqno); 324 tap_packet *unpack (connection *conn, u32 &seqno);
… …
347 int outl = 0, outl2; 337 int outl = 0, outl2;
348 ptype type = PT_DATA_UNCOMPRESSED; 338 ptype type = PT_DATA_UNCOMPRESSED;
349 339
350#if ENABLE_COMPRESSION 340#if ENABLE_COMPRESSION
351 u8 cdata[MAX_MTU]; 341 u8 cdata[MAX_MTU];
352 u32 cl;
353 342
343 if (conn->features & ENABLE_COMPRESSION)
344 {
354 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 345 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
346
355 if (cl) 347 if (cl)
356 { 348 {
357 type = PT_DATA_COMPRESSED; 349 type = PT_DATA_COMPRESSED;
358 d = cdata; 350 d = cdata;
359 l = cl + 2; 351 l = cl + 2;
360 352
361 d[0] = cl >> 8; 353 d[0] = cl >> 8;
362 d[1] = cl; 354 d[1] = cl;
355 }
363 } 356 }
364#endif 357#endif
365 358
366 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 359 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
367 360
368 struct { 361 struct {
369#if RAND_SIZE 362#if RAND_SIZE
370 u8 rnd[RAND_SIZE]; 363 u8 rnd[RAND_SIZE];
371#endif 364#endif
… …
375 datahdr.seqno = ntohl (seqno); 368 datahdr.seqno = ntohl (seqno);
376#if RAND_SIZE 369#if RAND_SIZE
377 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 370 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
378#endif 371#endif
379 372
380 EVP_EncryptUpdate (cctx, 373 require (EVP_EncryptUpdate (cctx,
381 (unsigned char *) data + outl, &outl2, 374 (unsigned char *) data + outl, &outl2,
382 (unsigned char *) &datahdr, DATAHDR); 375 (unsigned char *) &datahdr, DATAHDR));
383 outl += outl2; 376 outl += outl2;
384 377
385 EVP_EncryptUpdate (cctx, 378 require (EVP_EncryptUpdate (cctx,
386 (unsigned char *) data + outl, &outl2, 379 (unsigned char *) data + outl, &outl2,
387 (unsigned char *) d, l); 380 (unsigned char *) d, l));
388 outl += outl2; 381 outl += outl2;
389 382
390 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 383 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
391 outl += outl2; 384 outl += outl2;
392 385
393 len = outl + data_hdr_size (); 386 len = outl + data_hdr_size ();
394 387
395 set_hdr (type, dst); 388 set_hdr (type, dst);
… …
404 int outl = 0, outl2; 397 int outl = 0, outl2;
405 tap_packet *p = new tap_packet; 398 tap_packet *p = new tap_packet;
406 u8 *d; 399 u8 *d;
407 u32 l = len - data_hdr_size (); 400 u32 l = len - data_hdr_size ();
408 401
409 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 402 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
410 403
411#if ENABLE_COMPRESSION 404#if ENABLE_COMPRESSION
412 u8 cdata[MAX_MTU]; 405 u8 cdata[MAX_MTU];
413 406
414 if (type == PT_DATA_COMPRESSED) 407 if (type == PT_DATA_COMPRESSED)
… …
416 else 409 else
417#endif 410#endif
418 d = &(*p)[6 + 6 - DATAHDR]; 411 d = &(*p)[6 + 6 - DATAHDR];
419 412
420 /* 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 */
421 EVP_DecryptUpdate (cctx, 414 require (EVP_DecryptUpdate (cctx,
422 d, &outl2, 415 d, &outl2,
423 (unsigned char *)&data, len - data_hdr_size ()); 416 (unsigned char *)&data, len - data_hdr_size ()));
424 outl += outl2; 417 outl += outl2;
425 418
426 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 419 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
427 outl += outl2; 420 outl += outl2;
428 421
429 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 422 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
430 423
431 id2mac (dst () ? dst() : THISNODE->id, p->dst); 424 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
460{ 453{
461 // actually, hmaclen cannot be checked because the hmac 454 // actually, hmaclen cannot be checked because the hmac
462 // field comes before this data, so peers with other 455 // field comes before this data, so peers with other
463 // hmacs simply will not work. 456 // hmacs simply will not work.
464 u8 prot_major, prot_minor, randsize, hmaclen; 457 u8 prot_major, prot_minor, randsize, hmaclen;
465 u8 flags, challengelen, pad2, pad3; 458 u8 flags, challengelen, features, pad3;
466 u32 cipher_nid, digest_nid, hmac_nid; 459 u32 cipher_nid, digest_nid, hmac_nid;
467
468 const u8 curflags () const
469 {
470 return 0x80
471 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
472 }
473 460
474 void setup (ptype type, int dst); 461 void setup (ptype type, int dst);
475 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 }
476}; 475};
477 476
478void config_packet::setup (ptype type, int dst) 477void config_packet::setup (ptype type, int dst)
479{ 478{
480 prot_major = PROTOCOL_MAJOR; 479 prot_major = PROTOCOL_MAJOR;
481 prot_minor = PROTOCOL_MINOR; 480 prot_minor = PROTOCOL_MINOR;
482 randsize = RAND_SIZE; 481 randsize = RAND_SIZE;
483 hmaclen = HMACLENGTH; 482 hmaclen = HMACLENGTH;
484 flags = curflags (); 483 flags = 0;
485 challengelen = sizeof (rsachallenge); 484 challengelen = sizeof (rsachallenge);
485 features = get_features ();
486 486
487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
488 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 488 digest_nid = htonl (EVP_MD_type (RSA_HASH));
489 hmac_nid = htonl (EVP_MD_type (DIGEST)); 489 hmac_nid = htonl (EVP_MD_type (DIGEST));
490 490
… …
493} 493}
494 494
495bool config_packet::chk_config () const 495bool config_packet::chk_config () const
496{ 496{
497 if (prot_major != PROTOCOL_MAJOR) 497 if (prot_major != PROTOCOL_MAJOR)
498 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);
499 else if (randsize != RAND_SIZE) 499 else if (randsize != RAND_SIZE)
500 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);
501 else if (hmaclen != HMACLENGTH) 501 else if (hmaclen != HMACLENGTH)
502 slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH); 502 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
503 else if (flags != curflags ())
504 slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ());
505 else if (challengelen != sizeof (rsachallenge)) 503 else if (challengelen != sizeof (rsachallenge))
506 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));
507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 505 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
508 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));
509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 507 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
510 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));
511 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 509 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
512 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));
513 else 511 else
514 return true; 512 return true;
515 513
516 return false; 514 return false;
517} 515}
518 516
519struct auth_req_packet : config_packet 517struct auth_req_packet : config_packet
520{ 518{
521 char magic[8]; 519 char magic[8];
522 u8 initiate; // false if this is just an automatic reply 520 u8 initiate; // false if this is just an automatic reply
523 u8 protocols; // supported protocols (will get patches on forward) 521 u8 protocols; // supported protocols (will be patched on forward)
524 u8 pad2, pad3; 522 u8 pad2, pad3;
525 rsaid id; 523 rsaid id;
526 rsaencrdata encr; 524 rsaencrdata encr;
527 525
528 auth_req_packet (int dst, bool initiate_, u8 protocols_) 526 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
589{ 587{
590 if (ictx && octx) 588 if (ictx && octx)
591 { 589 {
592 connectmode = conf->connectmode; 590 connectmode = conf->connectmode;
593 591
592 // make sure rekeying timeouts are slightly asymmetric
594 rekey.start (NOW + ::conf.rekey); 593 rekey.start (NOW + ::conf.rekey
594 + (conf->id > THISNODE->id ? 10 : 0));
595 keepalive.start (NOW + ::conf.keepalive); 595 keepalive.start (NOW + ::conf.keepalive);
596 596
597 // send queued packets 597 // send queued packets
598 if (ictx && octx) 598 if (ictx && octx)
599 { 599 {
… …
612 } 612 }
613 else 613 else
614 { 614 {
615 retry_cnt = 0; 615 retry_cnt = 0;
616 establish_connection.start (NOW + 5); 616 establish_connection.start (NOW + 5);
617 keepalive.reset (); 617 keepalive.stop ();
618 rekey.reset (); 618 rekey.stop ();
619 } 619 }
620} 620}
621 621
622void 622void
623connection::reset_si () 623connection::reset_si ()
… …
625 protocol = best_protocol (THISNODE->protocols & conf->protocols); 625 protocol = best_protocol (THISNODE->protocols & conf->protocols);
626 626
627 // mask out protocols we cannot establish 627 // mask out protocols we cannot establish
628 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 628 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
629 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 629 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
630 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
630 631
631 si.set (conf, protocol); 632 si.set (conf, protocol);
632} 633}
633 634
634// ensure sockinfo is valid, forward if necessary 635// ensure sockinfo is valid, forward if necessary
… …
639 { 640 {
640 connection *r = vpn->find_router (); 641 connection *r = vpn->find_router ();
641 642
642 if (r) 643 if (r)
643 { 644 {
644 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 645 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
645 conf->nodename, r->conf->nodename); 646 conf->nodename, r->conf->nodename, (const char *)r->si);
646 return r->si; 647 return r->si;
647 } 648 }
648 else 649 else
649 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 650 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
650 conf->nodename); 651 conf->nodename);
… …
689connection::send_auth_request (const sockinfo &si, bool initiate) 690connection::send_auth_request (const sockinfo &si, bool initiate)
690{ 691{
691 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);
692 693
693 rsachallenge chg; 694 rsachallenge chg;
694
695 rsa_cache.gen (pkt->id, chg); 695 rsa_cache.gen (pkt->id, chg);
696 696 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
697 if (0 > RSA_public_encrypt (sizeof chg,
698 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
699 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
700 fatal ("RSA_public_encrypt error");
701 697
702 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);
703 699
704 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
705 701
… …
739} 735}
740 736
741void 737void
742connection::establish_connection_cb (time_watcher &w) 738connection::establish_connection_cb (time_watcher &w)
743{ 739{
744 if (ictx || conf == THISNODE 740 if (!ictx
741 && conf != THISNODE
745 || connectmode == conf_node::C_NEVER 742 && connectmode != conf_node::C_NEVER
746 || connectmode == conf_node::C_DISABLED) 743 && connectmode != conf_node::C_DISABLED
747 w.at = TSTAMP_CANCEL; 744 && NOW > w.at)
748 else if (w.at <= NOW)
749 { 745 {
750 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
751 747
752 if (retry_int < 3600 * 8) 748 double retry_int = double (retry_cnt & 3
753 retry_cnt++; 749 ? (retry_cnt & 3) + 1
754 750 : 1 << (retry_cnt >> 2));
755 w.at = NOW + retry_int;
756 751
757 reset_si (); 752 reset_si ();
753
754 bool slow = si.prot & PROT_SLOW;
758 755
759 if (si.prot && !si.host) 756 if (si.prot && !si.host)
760 vpn->send_connect_request (conf->id); 757 vpn->send_connect_request (conf->id);
761 else 758 else
762 { 759 {
763 const sockinfo &dsi = forward_si (si); 760 const sockinfo &dsi = forward_si (si);
761
762 slow = slow || (dsi.prot & PROT_SLOW);
764 763
765 if (dsi.valid () && auth_rate_limiter.can (dsi)) 764 if (dsi.valid () && auth_rate_limiter.can (dsi))
766 { 765 {
767 if (retry_cnt < 4) 766 if (retry_cnt < 4)
768 send_auth_request (dsi, true); 767 send_auth_request (dsi, true);
769 else 768 else
770 send_ping (dsi, 0); 769 send_ping (dsi, 0);
771 } 770 }
772 } 771 }
772
773 retry_int *= slow ? 3. : 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);
773 } 781 }
774} 782}
775 783
776void 784void
777connection::reset_connection () 785connection::reset_connection ()
… …
785 run_script (run_script_cb (this, &connection::script_node_down), false); 793 run_script (run_script_cb (this, &connection::script_node_down), false);
786 } 794 }
787 795
788 delete ictx; ictx = 0; 796 delete ictx; ictx = 0;
789 delete octx; octx = 0; 797 delete octx; octx = 0;
798#if ENABLE_DNS
799 dnsv4_reset_connection ();
800#endif
790 801
791 si.host= 0; 802 si.host = 0;
792 803
793 last_activity = 0; 804 last_activity = 0;
794 retry_cnt = 0; 805 retry_cnt = 0;
795 806
796 rekey.reset (); 807 rekey.stop ();
797 keepalive.reset (); 808 keepalive.stop ();
798 establish_connection.reset (); 809 establish_connection.stop ();
799} 810}
800 811
801void 812void
802connection::shutdown () 813connection::shutdown ()
803{ 814{
… …
808} 819}
809 820
810void 821void
811connection::rekey_cb (time_watcher &w) 822connection::rekey_cb (time_watcher &w)
812{ 823{
813 w.at = TSTAMP_CANCEL;
814
815 reset_connection (); 824 reset_connection ();
816 establish_connection (); 825 establish_connection ();
817} 826}
818 827
819void 828void
820connection::send_data_packet (tap_packet *pkt, bool broadcast) 829connection::send_data_packet (tap_packet *pkt)
821{ 830{
822 vpndata_packet *p = new vpndata_packet; 831 vpndata_packet *p = new vpndata_packet;
823 int tos = 0; 832 int tos = 0;
824 833
825 // 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.
826 if (conf->inherit_tos 835 if (conf->inherit_tos && pkt->is_ipv4 ())
827 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
828 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
829 tos = (*pkt)[15] & IPTOS_TOS_MASK; 836 tos = (*pkt)[15] & IPTOS_TOS_MASK;
830 837
831 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
832 send_vpn_packet (p, si, tos); 839 send_vpn_packet (p, si, tos);
833 840
834 delete p; 841 delete p;
835 842
836 if (oseqno > MAX_SEQNO) 843 if (oseqno > MAX_SEQNO)
837 rekey (); 844 rekey ();
838} 845}
839 846
840void 847void
841connection::inject_data_packet (tap_packet *pkt, bool broadcast) 848connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
842{ 849{
843 if (ictx && octx) 850 if (ictx && octx)
844 send_data_packet (pkt, broadcast); 851 send_data_packet (pkt);
845 else 852 else
846 { 853 {
847 if (!broadcast)//DDDD 854 if (!broadcast)//DDDD
848 data_queue.put (new tap_packet (*pkt)); 855 data_queue.put (new tap_packet (*pkt));
849 856
… …
855{ 862{
856 if (ictx && octx) 863 if (ictx && octx)
857 send_vpn_packet (pkt, si, tos); 864 send_vpn_packet (pkt, si, tos);
858 else 865 else
859 { 866 {
860 vpn_queue.put (new vpn_packet (*pkt)); 867 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
861 868
862 establish_connection (); 869 establish_connection ();
863 } 870 }
864} 871}
865 872
… …
924 if (p->initiate) 931 if (p->initiate)
925 send_auth_request (rsi, false); 932 send_auth_request (rsi, false);
926 933
927 rsachallenge k; 934 rsachallenge k;
928 935
929 if (0 > RSA_private_decrypt (sizeof (p->encr), 936 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
930 (unsigned char *)&p->encr, (unsigned char *)&k, 937 {
931 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
932 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?"),
933 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 }
934 else 942 else
935 { 943 {
936 delete octx; 944 delete octx;
937 945
938 octx = new crypto_ctx (k, 1); 946 octx = new crypto_ctx (k, 1);
939 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 947 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
940 948
941 conf->protocols = p->protocols; 949 conf->protocols = p->protocols;
950 features = p->features & config_packet::get_features ();
942 951
943 send_auth_response (rsi, p->id, k); 952 send_auth_response (rsi, p->id, k);
944 953
945 connection_established (); 954 connection_established ();
946 955
… …
982 crypto_ctx *cctx = new crypto_ctx (chg, 0); 991 crypto_ctx *cctx = new crypto_ctx (chg, 0);
983 992
984 if (!p->hmac_chk (cctx)) 993 if (!p->hmac_chk (cctx))
985 { 994 {
986 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"
987 "could be an attack, or just corruption or an synchronization error"), 996 "could be an attack, or just corruption or a synchronization error"),
988 conf->nodename, (const char *)rsi); 997 conf->nodename, (const char *)rsi);
989 break; 998 break;
990 } 999 }
991 else 1000 else
992 { 1001 {
… …
1041 { 1050 {
1042 vpndata_packet *p = (vpndata_packet *)pkt; 1051 vpndata_packet *p = (vpndata_packet *)pkt;
1043 1052
1044 if (!p->hmac_chk (ictx)) 1053 if (!p->hmac_chk (ictx))
1045 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"
1046 "could be an attack, or just corruption or an synchronization error"), 1055 "could be an attack, or just corruption or a synchronization error"),
1047 conf->nodename, (const char *)rsi); 1056 conf->nodename, (const char *)rsi);
1048 else 1057 else
1049 { 1058 {
1050 u32 seqno; 1059 u32 seqno;
1051 tap_packet *d = p->unpack (this, seqno); 1060 tap_packet *d = p->unpack (this, seqno);
1052 1061
1053 if (iseqno.recv_ok (seqno)) 1062 if (iseqno.recv_ok (seqno))
1054 { 1063 {
1055 vpn->tap->send (d); 1064 vpn->tap->send (d);
1056 1065
1057 if (p->dst () == 0) // re-broadcast
1058 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1059 {
1060 connection *c = *i;
1061
1062 if (c->conf != THISNODE && c->conf != conf)
1063 c->inject_data_packet (d);
1064 }
1065
1066 if (si != rsi) 1066 if (si != rsi)
1067 { 1067 {
1068 // fast re-sync on connection changes, useful especially for tcp/ip 1068 // fast re-sync on connection changes, useful especially for tcp/ip
1069 si = rsi; 1069 si = rsi;
1070 1070
1071 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1071 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1072 conf->nodename, (const char *)si, (const char *)rsi); 1072 conf->nodename, (const char *)si, (const char *)rsi);
1073 } 1073 }
1074
1075 delete d;
1076
1077 break;
1078 } 1074 }
1075
1076 delete d;
1077 break;
1079 } 1078 }
1080 } 1079 }
1081 1080
1082 send_reset (rsi); 1081 send_reset (rsi);
1083 break; 1082 break;
… …
1108 break; 1107 break;
1109 1108
1110 case vpn_packet::PT_CONNECT_INFO: 1109 case vpn_packet::PT_CONNECT_INFO:
1111 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1110 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1112 { 1111 {
1113 connect_info_packet *p = (connect_info_packet *) pkt; 1112 connect_info_packet *p = (connect_info_packet *)pkt;
1114 1113
1115 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
1116 1115 {
1117 connection *c = vpn->conns[p->id - 1]; 1116 connection *c = vpn->conns[p->id - 1];
1118 1117
1119 c->conf->protocols = p->protocols; 1118 c->conf->protocols = p->protocols;
1120 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));
1121 p->si.upgrade_protocol (protocol, c->conf); 1120 p->si.upgrade_protocol (protocol, c->conf);
1122 1121
1123 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1122 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1124 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);
1125 1124
1126 const sockinfo &dsi = forward_si (p->si); 1125 const sockinfo &dsi = forward_si (p->si);
1127 1126
1128 if (dsi.valid ()) 1127 if (dsi.valid ())
1129 c->send_auth_request (dsi, true); 1128 c->send_auth_request (dsi, true);
1129 }
1130 } 1130 }
1131 1131
1132 break; 1132 break;
1133 1133
1134 default: 1134 default:
… …
1143 { 1143 {
1144 reset_connection (); 1144 reset_connection ();
1145 establish_connection (); 1145 establish_connection ();
1146 } 1146 }
1147 else if (NOW < last_activity + ::conf.keepalive) 1147 else if (NOW < last_activity + ::conf.keepalive)
1148 w.at = last_activity + ::conf.keepalive; 1148 w.start (last_activity + ::conf.keepalive);
1149 else if (conf->connectmode != conf_node::C_ONDEMAND 1149 else if (conf->connectmode != conf_node::C_ONDEMAND
1150 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1150 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1151 { 1151 {
1152 send_ping (si); 1152 send_ping (si);
1153 w.at = NOW + 5; 1153 w.start (NOW + 5);
1154 } 1154 }
1155 else if (NOW < last_activity + ::conf.keepalive + 10) 1155 else if (NOW < last_activity + ::conf.keepalive + 10)
1156 // hold ondemand connections implicitly a few seconds longer 1156 // hold ondemand connections implicitly a few seconds longer
1157 // should delete octx, though, or something like that ;) 1157 // should delete octx, though, or something like that ;)
1158 w.at = last_activity + ::conf.keepalive + 10; 1158 w.start (last_activity + ::conf.keepalive + 10);
1159 else 1159 else
1160 reset_connection (); 1160 reset_connection ();
1161} 1161}
1162 1162
1163void connection::send_connect_request (int id) 1163void connection::send_connect_request (int id)
… …
1198 putenv ("STATE=down"); 1198 putenv ("STATE=down");
1199 1199
1200 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1200 return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1201} 1201}
1202 1202
1203connection::connection(struct vpn *vpn_) 1203connection::connection (struct vpn *vpn, conf_node *conf)
1204: vpn(vpn_) 1204: vpn(vpn), conf(conf)
1205, rekey (this, &connection::rekey_cb) 1205, rekey (this, &connection::rekey_cb)
1206, keepalive (this, &connection::keepalive_cb) 1206, keepalive (this, &connection::keepalive_cb)
1207, establish_connection (this, &connection::establish_connection_cb) 1207, establish_connection (this, &connection::establish_connection_cb)
1208#if ENABLE_DNS
1209, dns (0)
1210#endif
1208{ 1211{
1209 octx = ictx = 0; 1212 octx = ictx = 0;
1210 retry_cnt = 0; 1213 retry_cnt = 0;
1211 1214
1215 if (!conf->protocols) // make sure some protocol is enabled
1216 conf->protocols = PROT_UDPv4;
1217
1212 connectmode = conf_node::C_ALWAYS; // initial setting 1218 connectmode = conf_node::C_ALWAYS; // initial setting
1213 reset_connection (); 1219 reset_connection ();
1214} 1220}
1215 1221
1216connection::~connection () 1222connection::~connection ()

Diff Legend

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