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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines