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.41 by pcg, Wed Mar 2 05:49:31 2005 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
3 4
4 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 6 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 7 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 8 (at your option) any later version.
… …
16 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17*/ 18*/
18 19
19#include "config.h" 20#include "config.h"
20 21
21extern "C" { 22#include <cassert>
22# include "lzf/lzf.h"
23}
24 23
25#include <list> 24#include <list>
26 25
27#include <openssl/rand.h> 26#include <openssl/rand.h>
28#include <openssl/evp.h> 27#include <openssl/evp.h>
… …
35#include "slog.h" 34#include "slog.h"
36#include "device.h" 35#include "device.h"
37#include "vpn.h" 36#include "vpn.h"
38#include "connection.h" 37#include "connection.h"
39 38
39#include "netcompat.h"
40
40#if !HAVE_RAND_PSEUDO_BYTES 41#if !HAVE_RAND_PSEUDO_BYTES
41# define RAND_pseudo_bytes RAND_bytes 42# define RAND_pseudo_bytes RAND_bytes
42#endif 43#endif
43 44
44#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 45#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
46
47#define ULTRA_FAST 1
48#define HLOG 15
49#include "lzf/lzf.h"
50#include "lzf/lzf_c.c"
51#include "lzf/lzf_d.c"
45 52
46struct crypto_ctx 53struct crypto_ctx
47{ 54{
48 EVP_CIPHER_CTX cctx; 55 EVP_CIPHER_CTX cctx;
49 HMAC_CTX hctx; 56 HMAC_CTX hctx;
… …
53}; 60};
54 61
55crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 62crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
56{ 63{
57 EVP_CIPHER_CTX_init (&cctx); 64 EVP_CIPHER_CTX_init (&cctx);
58 EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc); 65 require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));
59 HMAC_CTX_init (&hctx); 66 HMAC_CTX_init (&hctx);
60 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0); 67 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
61} 68}
62 69
63crypto_ctx::~crypto_ctx () 70crypto_ctx::~crypto_ctx ()
64{ 71{
65 EVP_CIPHER_CTX_cleanup (&cctx); 72 require (EVP_CIPHER_CTX_cleanup (&cctx));
66 HMAC_CTX_cleanup (&hctx); 73 HMAC_CTX_cleanup (&hctx);
67} 74}
68 75
69static void 76static void
70rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 77rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
71{ 78{
72 EVP_MD_CTX ctx; 79 EVP_MD_CTX ctx;
73 80
74 EVP_MD_CTX_init (&ctx); 81 EVP_MD_CTX_init (&ctx);
75 EVP_DigestInit (&ctx, RSA_HASH); 82 require (EVP_DigestInit (&ctx, RSA_HASH));
76 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 83 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
77 EVP_DigestUpdate(&ctx, &id, sizeof id); 84 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
78 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
79 EVP_MD_CTX_cleanup (&ctx); 86 EVP_MD_CTX_cleanup (&ctx);
80} 87}
81 88
82struct rsa_entry { 89struct rsa_entry {
83 tstamp expire; 90 tstamp expire;
… …
131 138
132} rsa_cache; 139} rsa_cache;
133 140
134void rsa_cache::cleaner_cb (time_watcher &w) 141void rsa_cache::cleaner_cb (time_watcher &w)
135{ 142{
136 if (empty ()) 143 if (!empty ())
137 w.at = TSTAMP_CANCEL;
138 else
139 { 144 {
140 w.at = NOW + RSA_TTL; 145 w.start (NOW + RSA_TTL);
141 146
142 for (iterator i = begin (); i != end (); ) 147 for (iterator i = begin (); i != end (); )
143 if (i->expire <= NOW) 148 if (i->expire <= NOW)
144 i = erase (i); 149 i = erase (i);
145 else 150 else
… …
197// only do action once every x seconds per host whole allowing bursts. 202// only do action once every x seconds per host whole allowing bursts.
198// this implementation ("splay list" ;) is inefficient, 203// this implementation ("splay list" ;) is inefficient,
199// but low on resources. 204// but low on resources.
200struct net_rate_limiter : list<net_rateinfo> 205struct net_rate_limiter : list<net_rateinfo>
201{ 206{
202 static const double ALPHA = 1. - 1. / 180.; // allow bursts 207# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
203 static const double CUTOFF = 10.; // one event every CUTOFF seconds 208# define NRL_CUTOFF 10. // one event every CUTOFF seconds
204 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 209# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
205 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 210# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
206 211
207 bool can (const sockinfo &si) { return can((u32)si.host); } 212 bool can (const sockinfo &si) { return can((u32)si.host); }
208 bool can (u32 host); 213 bool can (u32 host);
209}; 214};
210 215
211net_rate_limiter auth_rate_limiter, reset_rate_limiter; 216net_rate_limiter auth_rate_limiter, reset_rate_limiter;
212 217
… …
215 iterator i; 220 iterator i;
216 221
217 for (i = begin (); i != end (); ) 222 for (i = begin (); i != end (); )
218 if (i->host == host) 223 if (i->host == host)
219 break; 224 break;
220 else if (i->last < NOW - EXPIRE) 225 else if (i->last < NOW - NRL_EXPIRE)
221 i = erase (i); 226 i = erase (i);
222 else 227 else
223 i++; 228 i++;
224 229
225 if (i == end ()) 230 if (i == end ())
226 { 231 {
227 net_rateinfo ri; 232 net_rateinfo ri;
228 233
229 ri.host = host; 234 ri.host = host;
230 ri.pcnt = 1.; 235 ri.pcnt = 1.;
231 ri.diff = MAXDIF; 236 ri.diff = NRL_MAXDIF;
232 ri.last = NOW; 237 ri.last = NOW;
233 238
234 push_front (ri); 239 push_front (ri);
235 240
236 return true; 241 return true;
… …
238 else 243 else
239 { 244 {
240 net_rateinfo ri (*i); 245 net_rateinfo ri (*i);
241 erase (i); 246 erase (i);
242 247
243 ri.pcnt = ri.pcnt * ALPHA; 248 ri.pcnt = ri.pcnt * NRL_ALPHA;
244 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 249 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
245 250
246 ri.last = NOW; 251 ri.last = NOW;
247 252
248 double dif = ri.diff / ri.pcnt; 253 double dif = ri.diff / ri.pcnt;
249 254
250 bool send = dif > CUTOFF; 255 bool send = dif > NRL_CUTOFF;
251 256
252 if (dif > MAXDIF) 257 if (dif > NRL_MAXDIF)
253 { 258 {
254 ri.pcnt = 1.; 259 ri.pcnt = 1.;
255 ri.diff = MAXDIF; 260 ri.diff = NRL_MAXDIF;
256 } 261 }
257 else if (send) 262 else if (send)
258 ri.pcnt++; 263 ri.pcnt++;
259 264
260 push_front (ri); 265 push_front (ri);
… …
307} 312}
308 313
309#define MAXVPNDATA (MAX_MTU - 6 - 6) 314#define MAXVPNDATA (MAX_MTU - 6 - 6)
310#define DATAHDR (sizeof (u32) + RAND_SIZE) 315#define DATAHDR (sizeof (u32) + RAND_SIZE)
311 316
312struct vpndata_packet:vpn_packet 317struct vpndata_packet : vpn_packet
313 { 318 {
314 u8 data[MAXVPNDATA + DATAHDR]; // seqno 319 u8 data[MAXVPNDATA + DATAHDR]; // seqno
315 320
316 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno); 321 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
317 tap_packet *unpack (connection *conn, u32 &seqno); 322 tap_packet *unpack (connection *conn, u32 &seqno);
… …
330 int outl = 0, outl2; 335 int outl = 0, outl2;
331 ptype type = PT_DATA_UNCOMPRESSED; 336 ptype type = PT_DATA_UNCOMPRESSED;
332 337
333#if ENABLE_COMPRESSION 338#if ENABLE_COMPRESSION
334 u8 cdata[MAX_MTU]; 339 u8 cdata[MAX_MTU];
335 u32 cl;
336 340
341 if (conn->features & ENABLE_COMPRESSION)
342 {
337 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344
338 if (cl) 345 if (cl)
339 { 346 {
340 type = PT_DATA_COMPRESSED; 347 type = PT_DATA_COMPRESSED;
341 d = cdata; 348 d = cdata;
342 l = cl + 2; 349 l = cl + 2;
343 350
344 d[0] = cl >> 8; 351 d[0] = cl >> 8;
345 d[1] = cl; 352 d[1] = cl;
353 }
346 } 354 }
347#endif 355#endif
348 356
349 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 357 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
350 358
351 struct { 359 struct {
352#if RAND_SIZE 360#if RAND_SIZE
353 u8 rnd[RAND_SIZE]; 361 u8 rnd[RAND_SIZE];
354#endif 362#endif
… …
358 datahdr.seqno = ntohl (seqno); 366 datahdr.seqno = ntohl (seqno);
359#if RAND_SIZE 367#if RAND_SIZE
360 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 368 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
361#endif 369#endif
362 370
363 EVP_EncryptUpdate (cctx, 371 require (EVP_EncryptUpdate (cctx,
364 (unsigned char *) data + outl, &outl2, 372 (unsigned char *) data + outl, &outl2,
365 (unsigned char *) &datahdr, DATAHDR); 373 (unsigned char *) &datahdr, DATAHDR));
366 outl += outl2; 374 outl += outl2;
367 375
368 EVP_EncryptUpdate (cctx, 376 require (EVP_EncryptUpdate (cctx,
369 (unsigned char *) data + outl, &outl2, 377 (unsigned char *) data + outl, &outl2,
370 (unsigned char *) d, l); 378 (unsigned char *) d, l));
371 outl += outl2; 379 outl += outl2;
372 380
373 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 381 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
374 outl += outl2; 382 outl += outl2;
375 383
376 len = outl + data_hdr_size (); 384 len = outl + data_hdr_size ();
377 385
378 set_hdr (type, dst); 386 set_hdr (type, dst);
… …
387 int outl = 0, outl2; 395 int outl = 0, outl2;
388 tap_packet *p = new tap_packet; 396 tap_packet *p = new tap_packet;
389 u8 *d; 397 u8 *d;
390 u32 l = len - data_hdr_size (); 398 u32 l = len - data_hdr_size ();
391 399
392 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 400 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
393 401
394#if ENABLE_COMPRESSION 402#if ENABLE_COMPRESSION
395 u8 cdata[MAX_MTU]; 403 u8 cdata[MAX_MTU];
396 404
397 if (type == PT_DATA_COMPRESSED) 405 if (type == PT_DATA_COMPRESSED)
… …
399 else 407 else
400#endif 408#endif
401 d = &(*p)[6 + 6 - DATAHDR]; 409 d = &(*p)[6 + 6 - DATAHDR];
402 410
403 /* this overwrites part of the src mac, but we fix that later */ 411 /* this overwrites part of the src mac, but we fix that later */
404 EVP_DecryptUpdate (cctx, 412 require (EVP_DecryptUpdate (cctx,
405 d, &outl2, 413 d, &outl2,
406 (unsigned char *)&data, len - data_hdr_size ()); 414 (unsigned char *)&data, len - data_hdr_size ()));
407 outl += outl2; 415 outl += outl2;
408 416
409 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 417 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
410 outl += outl2; 418 outl += outl2;
411 419
412 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 420 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
413 421
414 id2mac (dst () ? dst() : THISNODE->id, p->dst); 422 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
443{ 451{
444 // actually, hmaclen cannot be checked because the hmac 452 // actually, hmaclen cannot be checked because the hmac
445 // field comes before this data, so peers with other 453 // field comes before this data, so peers with other
446 // hmacs simply will not work. 454 // hmacs simply will not work.
447 u8 prot_major, prot_minor, randsize, hmaclen; 455 u8 prot_major, prot_minor, randsize, hmaclen;
448 u8 flags, challengelen, pad2, pad3; 456 u8 flags, challengelen, features, pad3;
449 u32 cipher_nid, digest_nid, hmac_nid; 457 u32 cipher_nid, digest_nid, hmac_nid;
450
451 const u8 curflags () const
452 {
453 return 0x80
454 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
455 }
456 458
457 void setup (ptype type, int dst); 459 void setup (ptype type, int dst);
458 bool chk_config () const; 460 bool chk_config () const;
461
462 static u8 get_features ()
463 {
464 u8 f = 0;
465#if ENABLE_COMPRESSION
466 f |= FEATURE_COMPRESSION;
467#endif
468#if ENABLE_ROHC
469 f |= FEATURE_ROHC;
470#endif
471 return f;
472 }
459}; 473};
460 474
461void config_packet::setup (ptype type, int dst) 475void config_packet::setup (ptype type, int dst)
462{ 476{
463 prot_major = PROTOCOL_MAJOR; 477 prot_major = PROTOCOL_MAJOR;
464 prot_minor = PROTOCOL_MINOR; 478 prot_minor = PROTOCOL_MINOR;
465 randsize = RAND_SIZE; 479 randsize = RAND_SIZE;
466 hmaclen = HMACLENGTH; 480 hmaclen = HMACLENGTH;
467 flags = curflags (); 481 flags = ENABLE_COMPRESSION ? 0x81 : 0x80;
468 challengelen = sizeof (rsachallenge); 482 challengelen = sizeof (rsachallenge);
483 features = get_features ();
469 484
470 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
471 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 486 digest_nid = htonl (EVP_MD_type (RSA_HASH));
472 hmac_nid = htonl (EVP_MD_type (DIGEST)); 487 hmac_nid = htonl (EVP_MD_type (DIGEST));
473 488
… …
476} 491}
477 492
478bool config_packet::chk_config () const 493bool config_packet::chk_config () const
479{ 494{
480 if (prot_major != PROTOCOL_MAJOR) 495 if (prot_major != PROTOCOL_MAJOR)
481 slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR); 496 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
482 else if (randsize != RAND_SIZE) 497 else if (randsize != RAND_SIZE)
483 slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE); 498 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
484 else if (hmaclen != HMACLENGTH) 499 else if (hmaclen != HMACLENGTH)
485 slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH); 500 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
501#if 0 // this implementation should handle all flag settings
486 else if (flags != curflags ()) 502 else if (flags != curflags ())
487 slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ()); 503 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
504#endif
488 else if (challengelen != sizeof (rsachallenge)) 505 else if (challengelen != sizeof (rsachallenge))
489 slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge)); 506 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
490 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
491 slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 508 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))) 509 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)); 510 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))) 511 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
495 slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 512 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
496 else 513 else
497 return true; 514 return true;
498 515
499 return false; 516 return false;
500} 517}
501 518
502struct auth_req_packet : config_packet 519struct auth_req_packet : config_packet
503{ 520{
504 char magic[8]; 521 char magic[8];
505 u8 initiate; // false if this is just an automatic reply 522 u8 initiate; // false if this is just an automatic reply
506 u8 protocols; // supported protocols (will get patches on forward) 523 u8 protocols; // supported protocols (will be patched on forward)
507 u8 pad2, pad3; 524 u8 pad2, pad3;
508 rsaid id; 525 rsaid id;
509 rsaencrdata encr; 526 rsaencrdata encr;
510 527
511 auth_req_packet (int dst, bool initiate_, u8 protocols_) 528 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
572{ 589{
573 if (ictx && octx) 590 if (ictx && octx)
574 { 591 {
575 connectmode = conf->connectmode; 592 connectmode = conf->connectmode;
576 593
594 // make sure rekeying timeouts are slightly asymmetric
577 rekey.start (NOW + ::conf.rekey); 595 rekey.start (NOW + ::conf.rekey
596 + (conf->id > THISNODE->id ? 10 : 0));
578 keepalive.start (NOW + ::conf.keepalive); 597 keepalive.start (NOW + ::conf.keepalive);
579 598
580 // send queued packets 599 // send queued packets
581 if (ictx && octx) 600 if (ictx && octx)
582 { 601 {
… …
595 } 614 }
596 else 615 else
597 { 616 {
598 retry_cnt = 0; 617 retry_cnt = 0;
599 establish_connection.start (NOW + 5); 618 establish_connection.start (NOW + 5);
600 keepalive.reset (); 619 keepalive.stop ();
601 rekey.reset (); 620 rekey.stop ();
602 } 621 }
603} 622}
604 623
605void 624void
606connection::reset_si () 625connection::reset_si ()
… …
608 protocol = best_protocol (THISNODE->protocols & conf->protocols); 627 protocol = best_protocol (THISNODE->protocols & conf->protocols);
609 628
610 // mask out protocols we cannot establish 629 // mask out protocols we cannot establish
611 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 630 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
612 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 631 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
632 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
613 633
614 si.set (conf, protocol); 634 si.set (conf, protocol);
615} 635}
616 636
617// ensure sockinfo is valid, forward if necessary 637// ensure sockinfo is valid, forward if necessary
… …
637} 657}
638 658
639void 659void
640connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 660connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
641{ 661{
642 if (!vpn->send_vpn_packet (pkt, si, tos)) 662 bool ok;
663
664 switch (si.prot)
665 {
666 case PROT_IPv4:
667 ok = vpn->send_ipv4_packet (pkt, si, tos); break;
668 case PROT_UDPv4:
669 ok = vpn->send_udpv4_packet (pkt, si, tos); break;
670#if ENABLE_TCP
671 case PROT_TCPv4:
672 ok = vpn->send_tcpv4_packet (pkt, si, tos); break;
673#endif
674#if ENABLE_ICMP
675 case PROT_ICMPv4:
676 ok = vpn->send_icmpv4_packet (pkt, si, tos); break;
677#endif
678#if ENABLE_DNS
679 case PROT_DNSv4:
680 ok = send_dnsv4_packet (pkt, si, tos); break;
681#endif
682
683 default:
684 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
685 ok = false;
686 }
687
688 if (!ok)
643 reset_connection (); 689 reset_connection ();
644} 690}
645 691
646void 692void
647connection::send_ping (const sockinfo &si, u8 pong) 693connection::send_ping (const sockinfo &si, u8 pong)
… …
672connection::send_auth_request (const sockinfo &si, bool initiate) 718connection::send_auth_request (const sockinfo &si, bool initiate)
673{ 719{
674 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 720 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
675 721
676 rsachallenge chg; 722 rsachallenge chg;
677
678 rsa_cache.gen (pkt->id, chg); 723 rsa_cache.gen (pkt->id, chg);
679 724 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 725
685 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 726 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
686 727
687 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 728 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
688 729
… …
722} 763}
723 764
724void 765void
725connection::establish_connection_cb (time_watcher &w) 766connection::establish_connection_cb (time_watcher &w)
726{ 767{
727 if (ictx || conf == THISNODE 768 if (!ictx
769 && conf != THISNODE
728 || connectmode == conf_node::C_NEVER 770 && connectmode != conf_node::C_NEVER
729 || connectmode == conf_node::C_DISABLED) 771 && connectmode != conf_node::C_DISABLED
730 w.at = TSTAMP_CANCEL; 772 && NOW > w.at)
731 else if (w.at <= NOW)
732 { 773 {
733 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 774 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
734 775
735 if (retry_int < 3600 * 8) 776 if (retry_int < conf->max_retry)
736 retry_cnt++; 777 retry_cnt++;
778 else
779 retry_int = conf->max_retry;
737 780
738 w.at = NOW + retry_int; 781 w.start (NOW + retry_int);
739 782
740 reset_si (); 783 reset_si ();
741 784
742 if (si.prot && !si.host) 785 if (si.prot && !si.host)
743 vpn->send_connect_request (conf->id); 786 vpn->send_connect_request (conf->id);
… …
769 } 812 }
770 813
771 delete ictx; ictx = 0; 814 delete ictx; ictx = 0;
772 delete octx; octx = 0; 815 delete octx; octx = 0;
773 816
774 si.host= 0; 817 si.host = 0;
775 818
776 last_activity = 0; 819 last_activity = 0;
777 retry_cnt = 0; 820 retry_cnt = 0;
778 821
779 rekey.reset (); 822 rekey.stop ();
780 keepalive.reset (); 823 keepalive.stop ();
781 establish_connection.reset (); 824 establish_connection.stop ();
782} 825}
783 826
784void 827void
785connection::shutdown () 828connection::shutdown ()
786{ 829{
… …
791} 834}
792 835
793void 836void
794connection::rekey_cb (time_watcher &w) 837connection::rekey_cb (time_watcher &w)
795{ 838{
796 w.at = TSTAMP_CANCEL;
797
798 reset_connection (); 839 reset_connection ();
799 establish_connection (); 840 establish_connection ();
800} 841}
801 842
802void 843void
803connection::send_data_packet (tap_packet *pkt, bool broadcast) 844connection::send_data_packet (tap_packet *pkt)
804{ 845{
805 vpndata_packet *p = new vpndata_packet; 846 vpndata_packet *p = new vpndata_packet;
806 int tos = 0; 847 int tos = 0;
807 848
808 // I am not hilarious about peeking into packets, but so be it. 849 // I am not hilarious about peeking into packets, but so be it.
809 if (conf->inherit_tos 850 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; 851 tos = (*pkt)[15] & IPTOS_TOS_MASK;
813 852
814 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 853 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
815 send_vpn_packet (p, si, tos); 854 send_vpn_packet (p, si, tos);
816 855
817 delete p; 856 delete p;
818 857
819 if (oseqno > MAX_SEQNO) 858 if (oseqno > MAX_SEQNO)
820 rekey (); 859 rekey ();
821} 860}
822 861
823void 862void
824connection::inject_data_packet (tap_packet *pkt, bool broadcast) 863connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
825{ 864{
826 if (ictx && octx) 865 if (ictx && octx)
827 send_data_packet (pkt, broadcast); 866 send_data_packet (pkt);
828 else 867 else
829 { 868 {
830 if (!broadcast)//DDDD 869 if (!broadcast)//DDDD
831 data_queue.put (new tap_packet (*pkt)); 870 data_queue.put (new tap_packet (*pkt));
832 871
… …
838{ 877{
839 if (ictx && octx) 878 if (ictx && octx)
840 send_vpn_packet (pkt, si, tos); 879 send_vpn_packet (pkt, si, tos);
841 else 880 else
842 { 881 {
843 vpn_queue.put (new vpn_packet (*pkt)); 882 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
844 883
845 establish_connection (); 884 establish_connection ();
846 } 885 }
847} 886}
848 887
… …
907 if (p->initiate) 946 if (p->initiate)
908 send_auth_request (rsi, false); 947 send_auth_request (rsi, false);
909 948
910 rsachallenge k; 949 rsachallenge k;
911 950
912 if (0 > RSA_private_decrypt (sizeof (p->encr), 951 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
913 (unsigned char *)&p->encr, (unsigned char *)&k, 952 {
914 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
915 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), 953 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
916 conf->nodename, (const char *)rsi); 954 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
955 break;
956 }
917 else 957 else
918 { 958 {
919 delete octx; 959 delete octx;
920 960
921 octx = new crypto_ctx (k, 1); 961 octx = new crypto_ctx (k, 1);
922 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 962 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
923 963
964 // compatibility code, remove when no longer required
965 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
966
924 conf->protocols = p->protocols; 967 conf->protocols = p->protocols;
968 features = p->features & config_packet::get_features ();
925 969
926 send_auth_response (rsi, p->id, k); 970 send_auth_response (rsi, p->id, k);
927 971
928 connection_established (); 972 connection_established ();
929 973
… …
954 998
955 rsachallenge chg; 999 rsachallenge chg;
956 1000
957 if (!rsa_cache.find (p->id, chg)) 1001 if (!rsa_cache.find (p->id, chg))
958 { 1002 {
959 slog (L_ERR, _("%s(%s): unrequested auth response"), 1003 slog (L_ERR, _("%s(%s): unrequested auth response ignored"),
960 conf->nodename, (const char *)rsi); 1004 conf->nodename, (const char *)rsi);
961 break; 1005 break;
962 } 1006 }
963 else 1007 else
964 { 1008 {
965 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1009 crypto_ctx *cctx = new crypto_ctx (chg, 0);
966 1010
967 if (!p->hmac_chk (cctx)) 1011 if (!p->hmac_chk (cctx))
1012 {
968 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1013 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"), 1014 "could be an attack, or just corruption or a synchronization error"),
970 conf->nodename, (const char *)rsi); 1015 conf->nodename, (const char *)rsi);
1016 break;
1017 }
971 else 1018 else
972 { 1019 {
973 rsaresponse h; 1020 rsaresponse h;
974 1021
975 rsa_hash (p->id, chg, h); 1022 rsa_hash (p->id, chg, h);
… …
1021 { 1068 {
1022 vpndata_packet *p = (vpndata_packet *)pkt; 1069 vpndata_packet *p = (vpndata_packet *)pkt;
1023 1070
1024 if (!p->hmac_chk (ictx)) 1071 if (!p->hmac_chk (ictx))
1025 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1072 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1026 "could be an attack, or just corruption or an synchronization error"), 1073 "could be an attack, or just corruption or a synchronization error"),
1027 conf->nodename, (const char *)rsi); 1074 conf->nodename, (const char *)rsi);
1028 else 1075 else
1029 { 1076 {
1030 u32 seqno; 1077 u32 seqno;
1031 tap_packet *d = p->unpack (this, seqno); 1078 tap_packet *d = p->unpack (this, seqno);
1032 1079
1033 if (iseqno.recv_ok (seqno)) 1080 if (iseqno.recv_ok (seqno))
1034 { 1081 {
1035 vpn->tap->send (d); 1082 vpn->tap->send (d);
1036 1083
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) 1084 if (si != rsi)
1047 { 1085 {
1048 // fast re-sync on connection changes, useful especially for tcp/ip 1086 // fast re-sync on connection changes, useful especially for tcp/ip
1049 si = rsi; 1087 si = rsi;
1050 1088
1051 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1089 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1052 conf->nodename, (const char *)si, (const char *)rsi); 1090 conf->nodename, (const char *)si, (const char *)rsi);
1053 } 1091 }
1054
1055 delete d;
1056
1057 break;
1058 } 1092 }
1093
1094 delete d;
1095 break;
1059 } 1096 }
1060 } 1097 }
1061 1098
1062 send_reset (rsi); 1099 send_reset (rsi);
1063 break; 1100 break;
… …
1088 break; 1125 break;
1089 1126
1090 case vpn_packet::PT_CONNECT_INFO: 1127 case vpn_packet::PT_CONNECT_INFO:
1091 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1128 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1092 { 1129 {
1093 connect_info_packet *p = (connect_info_packet *) pkt; 1130 connect_info_packet *p = (connect_info_packet *)pkt;
1094 1131
1095 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1132 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1096 1133 {
1097 connection *c = vpn->conns[p->id - 1]; 1134 connection *c = vpn->conns[p->id - 1];
1098 1135
1099 c->conf->protocols = p->protocols; 1136 c->conf->protocols = p->protocols;
1100 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1137 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1101 p->si.upgrade_protocol (protocol, c->conf); 1138 p->si.upgrade_protocol (protocol, c->conf);
1102 1139
1103 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1140 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1104 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1141 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1105 1142
1106 const sockinfo &dsi = forward_si (p->si); 1143 const sockinfo &dsi = forward_si (p->si);
1107 1144
1108 if (dsi.valid ()) 1145 if (dsi.valid ())
1109 c->send_auth_request (dsi, true); 1146 c->send_auth_request (dsi, true);
1147 }
1110 } 1148 }
1111 1149
1112 break; 1150 break;
1113 1151
1114 default: 1152 default:
… …
1123 { 1161 {
1124 reset_connection (); 1162 reset_connection ();
1125 establish_connection (); 1163 establish_connection ();
1126 } 1164 }
1127 else if (NOW < last_activity + ::conf.keepalive) 1165 else if (NOW < last_activity + ::conf.keepalive)
1128 w.at = last_activity + ::conf.keepalive; 1166 w.start (last_activity + ::conf.keepalive);
1129 else if (conf->connectmode != conf_node::C_ONDEMAND 1167 else if (conf->connectmode != conf_node::C_ONDEMAND
1130 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1168 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1131 { 1169 {
1132 send_ping (si); 1170 send_ping (si);
1133 w.at = NOW + 5; 1171 w.start (NOW + 5);
1134 } 1172 }
1135 else if (NOW < last_activity + ::conf.keepalive + 10) 1173 else if (NOW < last_activity + ::conf.keepalive + 10)
1136 // hold ondemand connections implicitly a few seconds longer 1174 // hold ondemand connections implicitly a few seconds longer
1137 // should delete octx, though, or something like that ;) 1175 // should delete octx, though, or something like that ;)
1138 w.at = last_activity + ::conf.keepalive + 10; 1176 w.start (last_activity + ::conf.keepalive + 10);
1139 else 1177 else
1140 reset_connection (); 1178 reset_connection ();
1141} 1179}
1142 1180
1143void connection::send_connect_request (int id) 1181void connection::send_connect_request (int id)
… …
1178 putenv ("STATE=down"); 1216 putenv ("STATE=down");
1179 1217
1180 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1218 return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1181} 1219}
1182 1220
1183connection::connection(struct vpn *vpn_) 1221connection::connection (struct vpn *vpn, conf_node *conf)
1184: vpn(vpn_) 1222: vpn(vpn), conf(conf)
1185, rekey (this, &connection::rekey_cb) 1223, rekey (this, &connection::rekey_cb)
1186, keepalive (this, &connection::keepalive_cb) 1224, keepalive (this, &connection::keepalive_cb)
1187, establish_connection (this, &connection::establish_connection_cb) 1225, establish_connection (this, &connection::establish_connection_cb)
1226#if ENABLE_DNS
1227, dnsv4_tw (this, &connection::dnsv4_cb)
1228, dns_rcvdq (0), dns_snddq (0)
1229, dns_rcvseq (0), dns_sndseq (0)
1230#endif
1188{ 1231{
1189 octx = ictx = 0; 1232 octx = ictx = 0;
1190 retry_cnt = 0; 1233 retry_cnt = 0;
1191 1234
1235 if (!conf->protocols) // make sure some protocol is enabled
1236 conf->protocols = PROT_UDPv4;
1237
1192 connectmode = conf_node::C_ALWAYS; // initial setting 1238 connectmode = conf_node::C_ALWAYS; // initial setting
1193 reset_connection (); 1239 reset_connection ();
1194} 1240}
1195 1241
1196connection::~connection () 1242connection::~connection ()

Diff Legend

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