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.10 by pcg, Sun Apr 6 18:12:18 2003 UTC vs.
Revision 1.33 by pcg, Sun Mar 21 13:16:36 2004 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
45 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"
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;
50 57
… …
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
… …
147 } 152 }
148} 153}
149 154
150////////////////////////////////////////////////////////////////////////////// 155//////////////////////////////////////////////////////////////////////////////
151 156
152void pkt_queue::put (tap_packet *p) 157void pkt_queue::put (net_packet *p)
153{ 158{
154 if (queue[i]) 159 if (queue[i])
155 { 160 {
156 delete queue[i]; 161 delete queue[i];
157 j = (j + 1) % QUEUEDEPTH; 162 j = (j + 1) % QUEUEDEPTH;
… …
160 queue[i] = p; 165 queue[i] = p;
161 166
162 i = (i + 1) % QUEUEDEPTH; 167 i = (i + 1) % QUEUEDEPTH;
163} 168}
164 169
165tap_packet *pkt_queue::get () 170net_packet *pkt_queue::get ()
166{ 171{
167 tap_packet *p = queue[j]; 172 net_packet *p = queue[j];
168 173
169 if (p) 174 if (p)
170 { 175 {
171 queue[j] = 0; 176 queue[j] = 0;
172 j = (j + 1) % QUEUEDEPTH; 177 j = (j + 1) % QUEUEDEPTH;
… …
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 static const double ALPHA = 1. - 1. / 600.; // allow bursts
203 static const double CUTOFF = 10.; // one event every CUTOFF seconds 208 static const double CUTOFF = 10.; // one event every CUTOFF seconds
204 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 209 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time
205 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 210 static const double MAXDIF = CUTOFF * (1. / (1. - 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
… …
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
… …
475 set_hdr (type, dst); 490 set_hdr (type, dst);
476} 491}
477 492
478bool config_packet::chk_config () const 493bool config_packet::chk_config () const
479{ 494{
480 return prot_major == PROTOCOL_MAJOR 495 if (prot_major != PROTOCOL_MAJOR)
481 && randsize == RAND_SIZE 496 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
482 && hmaclen == HMACLENGTH 497 else if (randsize != RAND_SIZE)
483 && flags == curflags () 498 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
499 else if (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
502 else if (flags != curflags ())
503 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
504#endif
484 && challengelen == sizeof (rsachallenge) 505 else if (challengelen != sizeof (rsachallenge))
506 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
485 && cipher_nid == htonl (EVP_CIPHER_nid (CIPHER)) 507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
508 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
486 && digest_nid == htonl (EVP_MD_type (RSA_HASH)) 509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
510 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
487 && hmac_nid == htonl (EVP_MD_type (DIGEST)); 511 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
512 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
513 else
514 return true;
515
516 return false;
488} 517}
489 518
490struct auth_req_packet : config_packet 519struct auth_req_packet : config_packet
491{ 520{
492 char magic[8]; 521 char magic[8];
493 u8 initiate; // false if this is just an automatic reply 522 u8 initiate; // false if this is just an automatic reply
494 u8 protocols; // supported protocols (will get patches on forward) 523 u8 protocols; // supported protocols (will be patched on forward)
495 u8 pad2, pad3; 524 u8 pad2, pad3;
496 rsaid id; 525 rsaid id;
497 rsaencrdata encr; 526 rsaencrdata encr;
498 527
499 auth_req_packet (int dst, bool initiate_, u8 protocols_) 528 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
565 rekey.start (NOW + ::conf.rekey); 594 rekey.start (NOW + ::conf.rekey);
566 keepalive.start (NOW + ::conf.keepalive); 595 keepalive.start (NOW + ::conf.keepalive);
567 596
568 // send queued packets 597 // send queued packets
569 if (ictx && octx) 598 if (ictx && octx)
599 {
570 while (tap_packet *p = queue.get ()) 600 while (tap_packet *p = (tap_packet *)data_queue.get ())
571 { 601 {
572 send_data_packet (p); 602 send_data_packet (p);
573 delete p; 603 delete p;
574 } 604 }
605
606 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
607 {
608 send_vpn_packet (p, si, IPTOS_RELIABILITY);
609 delete p;
610 }
611 }
575 } 612 }
576 else 613 else
577 { 614 {
578 retry_cnt = 0; 615 retry_cnt = 0;
579 establish_connection.start (NOW + 5); 616 establish_connection.start (NOW + 5);
580 keepalive.reset (); 617 keepalive.stop ();
581 rekey.reset (); 618 rekey.stop ();
582 } 619 }
583} 620}
584 621
585void 622void
586connection::reset_si () 623connection::reset_si ()
… …
652connection::send_auth_request (const sockinfo &si, bool initiate) 689connection::send_auth_request (const sockinfo &si, bool initiate)
653{ 690{
654 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 691 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
655 692
656 rsachallenge chg; 693 rsachallenge chg;
657
658 rsa_cache.gen (pkt->id, chg); 694 rsa_cache.gen (pkt->id, chg);
659 695 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
660 if (0 > RSA_public_encrypt (sizeof chg,
661 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
662 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
663 fatal ("RSA_public_encrypt error");
664 696
665 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 697 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
666 698
667 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 699 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
668 700
… …
702} 734}
703 735
704void 736void
705connection::establish_connection_cb (time_watcher &w) 737connection::establish_connection_cb (time_watcher &w)
706{ 738{
707 if (ictx || conf == THISNODE 739 if (!ictx
740 && conf != THISNODE
708 || connectmode == conf_node::C_NEVER 741 && connectmode != conf_node::C_NEVER
709 || connectmode == conf_node::C_DISABLED) 742 && connectmode != conf_node::C_DISABLED
710 w.at = TSTAMP_CANCEL; 743 && NOW > w.at)
711 else if (w.at <= NOW)
712 { 744 {
713 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 745 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
714 746
715 if (retry_int < 3600 * 8) 747 if (retry_int < 3600 * 8)
716 retry_cnt++; 748 retry_cnt++;
717 749
718 w.at = NOW + retry_int; 750 w.start (NOW + retry_int);
719 751
720 reset_si (); 752 reset_si ();
721 753
722 if (si.prot && !si.host) 754 if (si.prot && !si.host)
723 vpn->send_connect_request (conf->id); 755 vpn->send_connect_request (conf->id);
… …
754 si.host= 0; 786 si.host= 0;
755 787
756 last_activity = 0; 788 last_activity = 0;
757 retry_cnt = 0; 789 retry_cnt = 0;
758 790
759 rekey.reset (); 791 rekey.stop ();
760 keepalive.reset (); 792 keepalive.stop ();
761 establish_connection.reset (); 793 establish_connection.stop ();
762} 794}
763 795
764void 796void
765connection::shutdown () 797connection::shutdown ()
766{ 798{
… …
771} 803}
772 804
773void 805void
774connection::rekey_cb (time_watcher &w) 806connection::rekey_cb (time_watcher &w)
775{ 807{
776 w.at = TSTAMP_CANCEL;
777
778 reset_connection (); 808 reset_connection ();
779 establish_connection (); 809 establish_connection ();
780} 810}
781 811
782void 812void
783connection::send_data_packet (tap_packet *pkt, bool broadcast) 813connection::send_data_packet (tap_packet *pkt)
784{ 814{
785 vpndata_packet *p = new vpndata_packet; 815 vpndata_packet *p = new vpndata_packet;
786 int tos = 0; 816 int tos = 0;
787 817
788 if (conf->inherit_tos 818 // I am not hilarious about peeking into packets, but so be it.
789 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP 819 if (conf->inherit_tos && pkt->is_ipv4 ())
790 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
791 tos = (*pkt)[15] & IPTOS_TOS_MASK; 820 tos = (*pkt)[15] & IPTOS_TOS_MASK;
792 821
793 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 822 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
794 send_vpn_packet (p, si, tos); 823 send_vpn_packet (p, si, tos);
795 824
796 delete p; 825 delete p;
797 826
798 if (oseqno > MAX_SEQNO) 827 if (oseqno > MAX_SEQNO)
799 rekey (); 828 rekey ();
800} 829}
801 830
802void 831void
803connection::inject_data_packet (tap_packet *pkt, bool broadcast) 832connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
804{ 833{
805 if (ictx && octx) 834 if (ictx && octx)
806 send_data_packet (pkt, broadcast); 835 send_data_packet (pkt);
807 else 836 else
808 { 837 {
809 if (!broadcast)//DDDD 838 if (!broadcast)//DDDD
810 queue.put (new tap_packet (*pkt)); 839 data_queue.put (new tap_packet (*pkt));
811 840
812 establish_connection (); 841 establish_connection ();
813 } 842 }
814} 843}
815 844
816void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 845void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
817{ 846{
818 if (ictx && octx) 847 if (ictx && octx)
819 send_vpn_packet (pkt, si, tos); 848 send_vpn_packet (pkt, si, tos);
820 else 849 else
850 {
851 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
852
821 establish_connection (); 853 establish_connection ();
854 }
822} 855}
823 856
824void 857void
825connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 858connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
826{ 859{
… …
882 if (p->initiate) 915 if (p->initiate)
883 send_auth_request (rsi, false); 916 send_auth_request (rsi, false);
884 917
885 rsachallenge k; 918 rsachallenge k;
886 919
887 if (0 > RSA_private_decrypt (sizeof (p->encr), 920 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
888 (unsigned char *)&p->encr, (unsigned char *)&k, 921 {
889 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
890 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), 922 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
891 conf->nodename, (const char *)rsi); 923 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
924 break;
925 }
892 else 926 else
893 { 927 {
894 delete octx; 928 delete octx;
895 929
896 octx = new crypto_ctx (k, 1); 930 octx = new crypto_ctx (k, 1);
897 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 931 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
898 932
933 // compatibility code, remove when no longer required
934 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
935
899 conf->protocols = p->protocols; 936 conf->protocols = p->protocols;
937 features = p->features & config_packet::get_features ();
900 938
901 send_auth_response (rsi, p->id, k); 939 send_auth_response (rsi, p->id, k);
902 940
903 connection_established (); 941 connection_established ();
904 942
905 break; 943 break;
906 } 944 }
907 } 945 }
946 else
947 slog (L_WARN, _("%s(%s): protocol mismatch"),
948 conf->nodename, (const char *)rsi);
908 949
909 send_reset (rsi); 950 send_reset (rsi);
910 } 951 }
911 952
912 break; 953 break;
… …
925 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 966 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
926 967
927 rsachallenge chg; 968 rsachallenge chg;
928 969
929 if (!rsa_cache.find (p->id, chg)) 970 if (!rsa_cache.find (p->id, chg))
971 {
930 slog (L_ERR, _("%s(%s): unrequested auth response"), 972 slog (L_ERR, _("%s(%s): unrequested auth response ignored"),
931 conf->nodename, (const char *)rsi); 973 conf->nodename, (const char *)rsi);
974 break;
975 }
932 else 976 else
933 { 977 {
934 crypto_ctx *cctx = new crypto_ctx (chg, 0); 978 crypto_ctx *cctx = new crypto_ctx (chg, 0);
935 979
936 if (!p->hmac_chk (cctx)) 980 if (!p->hmac_chk (cctx))
981 {
937 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 982 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
938 "could be an attack, or just corruption or an synchronization error"), 983 "could be an attack, or just corruption or a synchronization error"),
939 conf->nodename, (const char *)rsi); 984 conf->nodename, (const char *)rsi);
985 break;
986 }
940 else 987 else
941 { 988 {
942 rsaresponse h; 989 rsaresponse h;
943 990
944 rsa_hash (p->id, chg, h); 991 rsa_hash (p->id, chg, h);
… …
990 { 1037 {
991 vpndata_packet *p = (vpndata_packet *)pkt; 1038 vpndata_packet *p = (vpndata_packet *)pkt;
992 1039
993 if (!p->hmac_chk (ictx)) 1040 if (!p->hmac_chk (ictx))
994 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1041 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
995 "could be an attack, or just corruption or an synchronization error"), 1042 "could be an attack, or just corruption or a synchronization error"),
996 conf->nodename, (const char *)rsi); 1043 conf->nodename, (const char *)rsi);
997 else 1044 else
998 { 1045 {
999 u32 seqno; 1046 u32 seqno;
1000 tap_packet *d = p->unpack (this, seqno); 1047 tap_packet *d = p->unpack (this, seqno);
1001 1048
1002 if (iseqno.recv_ok (seqno)) 1049 if (iseqno.recv_ok (seqno))
1003 { 1050 {
1004 vpn->tap->send (d); 1051 vpn->tap->send (d);
1005 1052
1006 if (p->dst () == 0) // re-broadcast
1007 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1008 {
1009 connection *c = *i;
1010
1011 if (c->conf != THISNODE && c->conf != conf)
1012 c->inject_data_packet (d);
1013 }
1014
1015 if (si != rsi) 1053 if (si != rsi)
1016 { 1054 {
1017 // fast re-sync on conneciton changes, useful especially for tcp/ip 1055 // fast re-sync on connection changes, useful especially for tcp/ip
1018 si = rsi; 1056 si = rsi;
1019 1057
1020 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1058 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1021 conf->nodename, (const char *)si, (const char *)rsi); 1059 conf->nodename, (const char *)si, (const char *)rsi);
1022 } 1060 }
1023
1024 delete d;
1025
1026 break;
1027 } 1061 }
1062
1063 delete d;
1064 break;
1028 } 1065 }
1029 } 1066 }
1030 1067
1031 send_reset (rsi); 1068 send_reset (rsi);
1032 break; 1069 break;
… …
1048 // send connect_info packets to both sides, in case one is 1085 // send connect_info packets to both sides, in case one is
1049 // behind a nat firewall (or both ;) 1086 // behind a nat firewall (or both ;)
1050 c->send_connect_info (conf->id, si, conf->protocols); 1087 c->send_connect_info (conf->id, si, conf->protocols);
1051 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1088 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1052 } 1089 }
1090 else
1091 c->establish_connection ();
1053 } 1092 }
1054 1093
1055 break; 1094 break;
1056 1095
1057 case vpn_packet::PT_CONNECT_INFO: 1096 case vpn_packet::PT_CONNECT_INFO:
… …
1090 { 1129 {
1091 reset_connection (); 1130 reset_connection ();
1092 establish_connection (); 1131 establish_connection ();
1093 } 1132 }
1094 else if (NOW < last_activity + ::conf.keepalive) 1133 else if (NOW < last_activity + ::conf.keepalive)
1095 w.at = last_activity + ::conf.keepalive; 1134 w.start (last_activity + ::conf.keepalive);
1096 else if (conf->connectmode != conf_node::C_ONDEMAND 1135 else if (conf->connectmode != conf_node::C_ONDEMAND
1097 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1136 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1098 { 1137 {
1099 send_ping (si); 1138 send_ping (si);
1100 w.at = NOW + 5; 1139 w.start (NOW + 5);
1101 } 1140 }
1141 else if (NOW < last_activity + ::conf.keepalive + 10)
1142 // hold ondemand connections implicitly a few seconds longer
1143 // should delete octx, though, or something like that ;)
1144 w.start (last_activity + ::conf.keepalive + 10);
1102 else 1145 else
1103 reset_connection (); 1146 reset_connection ();
1104} 1147}
1105 1148
1106void connection::send_connect_request (int id) 1149void connection::send_connect_request (int id)

Diff Legend

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