ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/connection.C
(Generate patch)

Comparing gvpe/src/connection.C (file contents):
Revision 1.24 by pcg, Wed Oct 22 01:05:23 2003 UTC vs.
Revision 1.58 by pcg, Sat Jul 9 02:35:42 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines