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

Comparing gvpe/src/connection.C (file contents):
Revision 1.19 by pcg, Tue Oct 14 03:22:09 2003 UTC vs.
Revision 1.31 by pcg, Sun Feb 8 07:24:25 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
40#include <sys/socket.h> 39#include "netcompat.h"
41#ifdef HAVE_NETINET_IN_H
42# include <netinet/in.h>
43#endif
44#include <arpa/inet.h>
45#include <net/if.h>
46#ifdef HAVE_NETINET_IN_SYSTM_H
47# include <netinet/in_systm.h>
48#endif
49#ifdef HAVE_NETINET_IP_H
50# include <netinet/ip.h>
51#endif
52
53#ifndef IPTOS_TOS_MASK
54# define IPTOS_TOS_MASK (IPTOS_LOWDELAY | IPTOS_THROUGHPUT | IPTOS_RELIABILITY | IPTOS_MINCOST)
55#endif
56 40
57#if !HAVE_RAND_PSEUDO_BYTES 41#if !HAVE_RAND_PSEUDO_BYTES
58# define RAND_pseudo_bytes RAND_bytes 42# define RAND_pseudo_bytes RAND_bytes
59#endif 43#endif
60 44
61#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 45#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
62 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
63struct crypto_ctx 53struct crypto_ctx
64{ 54{
65 EVP_CIPHER_CTX cctx; 55 EVP_CIPHER_CTX cctx;
66 HMAC_CTX hctx; 56 HMAC_CTX hctx;
67 57
… …
70}; 60};
71 61
72crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 62crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
73{ 63{
74 EVP_CIPHER_CTX_init (&cctx); 64 EVP_CIPHER_CTX_init (&cctx);
75 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));
76 HMAC_CTX_init (&hctx); 66 HMAC_CTX_init (&hctx);
77 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);
78} 68}
79 69
80crypto_ctx::~crypto_ctx () 70crypto_ctx::~crypto_ctx ()
81{ 71{
82 EVP_CIPHER_CTX_cleanup (&cctx); 72 require (EVP_CIPHER_CTX_cleanup (&cctx));
83 HMAC_CTX_cleanup (&hctx); 73 HMAC_CTX_cleanup (&hctx);
84} 74}
85 75
86static void 76static void
87rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 77rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
88{ 78{
89 EVP_MD_CTX ctx; 79 EVP_MD_CTX ctx;
90 80
91 EVP_MD_CTX_init (&ctx); 81 EVP_MD_CTX_init (&ctx);
92 EVP_DigestInit (&ctx, RSA_HASH); 82 require (EVP_DigestInit (&ctx, RSA_HASH));
93 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 83 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
94 EVP_DigestUpdate(&ctx, &id, sizeof id); 84 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
95 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
96 EVP_MD_CTX_cleanup (&ctx); 86 EVP_MD_CTX_cleanup (&ctx);
97} 87}
98 88
99struct rsa_entry { 89struct rsa_entry {
100 tstamp expire; 90 tstamp expire;
… …
148 138
149} rsa_cache; 139} rsa_cache;
150 140
151void rsa_cache::cleaner_cb (time_watcher &w) 141void rsa_cache::cleaner_cb (time_watcher &w)
152{ 142{
153 if (empty ()) 143 if (!empty ())
154 w.at = TSTAMP_CANCEL;
155 else
156 { 144 {
157 w.at = NOW + RSA_TTL; 145 w.start (NOW + RSA_TTL);
158 146
159 for (iterator i = begin (); i != end (); ) 147 for (iterator i = begin (); i != end (); )
160 if (i->expire <= NOW) 148 if (i->expire <= NOW)
161 i = erase (i); 149 i = erase (i);
162 else 150 else
… …
324} 312}
325 313
326#define MAXVPNDATA (MAX_MTU - 6 - 6) 314#define MAXVPNDATA (MAX_MTU - 6 - 6)
327#define DATAHDR (sizeof (u32) + RAND_SIZE) 315#define DATAHDR (sizeof (u32) + RAND_SIZE)
328 316
329struct vpndata_packet:vpn_packet 317struct vpndata_packet : vpn_packet
330 { 318 {
331 u8 data[MAXVPNDATA + DATAHDR]; // seqno 319 u8 data[MAXVPNDATA + DATAHDR]; // seqno
332 320
333 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);
334 tap_packet *unpack (connection *conn, u32 &seqno); 322 tap_packet *unpack (connection *conn, u32 &seqno);
… …
347 int outl = 0, outl2; 335 int outl = 0, outl2;
348 ptype type = PT_DATA_UNCOMPRESSED; 336 ptype type = PT_DATA_UNCOMPRESSED;
349 337
350#if ENABLE_COMPRESSION 338#if ENABLE_COMPRESSION
351 u8 cdata[MAX_MTU]; 339 u8 cdata[MAX_MTU];
352 u32 cl;
353 340
341 if (conn->features & ENABLE_COMPRESSION)
342 {
354 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344
355 if (cl) 345 if (cl)
356 { 346 {
357 type = PT_DATA_COMPRESSED; 347 type = PT_DATA_COMPRESSED;
358 d = cdata; 348 d = cdata;
359 l = cl + 2; 349 l = cl + 2;
360 350
361 d[0] = cl >> 8; 351 d[0] = cl >> 8;
362 d[1] = cl; 352 d[1] = cl;
353 }
363 } 354 }
364#endif 355#endif
365 356
366 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 357 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
367 358
368 struct { 359 struct {
369#if RAND_SIZE 360#if RAND_SIZE
370 u8 rnd[RAND_SIZE]; 361 u8 rnd[RAND_SIZE];
371#endif 362#endif
… …
375 datahdr.seqno = ntohl (seqno); 366 datahdr.seqno = ntohl (seqno);
376#if RAND_SIZE 367#if RAND_SIZE
377 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 368 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
378#endif 369#endif
379 370
380 EVP_EncryptUpdate (cctx, 371 require (EVP_EncryptUpdate (cctx,
381 (unsigned char *) data + outl, &outl2, 372 (unsigned char *) data + outl, &outl2,
382 (unsigned char *) &datahdr, DATAHDR); 373 (unsigned char *) &datahdr, DATAHDR));
383 outl += outl2; 374 outl += outl2;
384 375
385 EVP_EncryptUpdate (cctx, 376 require (EVP_EncryptUpdate (cctx,
386 (unsigned char *) data + outl, &outl2, 377 (unsigned char *) data + outl, &outl2,
387 (unsigned char *) d, l); 378 (unsigned char *) d, l));
388 outl += outl2; 379 outl += outl2;
389 380
390 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 381 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
391 outl += outl2; 382 outl += outl2;
392 383
393 len = outl + data_hdr_size (); 384 len = outl + data_hdr_size ();
394 385
395 set_hdr (type, dst); 386 set_hdr (type, dst);
… …
404 int outl = 0, outl2; 395 int outl = 0, outl2;
405 tap_packet *p = new tap_packet; 396 tap_packet *p = new tap_packet;
406 u8 *d; 397 u8 *d;
407 u32 l = len - data_hdr_size (); 398 u32 l = len - data_hdr_size ();
408 399
409 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 400 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
410 401
411#if ENABLE_COMPRESSION 402#if ENABLE_COMPRESSION
412 u8 cdata[MAX_MTU]; 403 u8 cdata[MAX_MTU];
413 404
414 if (type == PT_DATA_COMPRESSED) 405 if (type == PT_DATA_COMPRESSED)
… …
416 else 407 else
417#endif 408#endif
418 d = &(*p)[6 + 6 - DATAHDR]; 409 d = &(*p)[6 + 6 - DATAHDR];
419 410
420 /* 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 */
421 EVP_DecryptUpdate (cctx, 412 require (EVP_DecryptUpdate (cctx,
422 d, &outl2, 413 d, &outl2,
423 (unsigned char *)&data, len - data_hdr_size ()); 414 (unsigned char *)&data, len - data_hdr_size ()));
424 outl += outl2; 415 outl += outl2;
425 416
426 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 417 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
427 outl += outl2; 418 outl += outl2;
428 419
429 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 420 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
430 421
431 id2mac (dst () ? dst() : THISNODE->id, p->dst); 422 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
460{ 451{
461 // actually, hmaclen cannot be checked because the hmac 452 // actually, hmaclen cannot be checked because the hmac
462 // field comes before this data, so peers with other 453 // field comes before this data, so peers with other
463 // hmacs simply will not work. 454 // hmacs simply will not work.
464 u8 prot_major, prot_minor, randsize, hmaclen; 455 u8 prot_major, prot_minor, randsize, hmaclen;
465 u8 flags, challengelen, pad2, pad3; 456 u8 flags, challengelen, features, pad3;
466 u32 cipher_nid, digest_nid, hmac_nid; 457 u32 cipher_nid, digest_nid, hmac_nid;
467
468 const u8 curflags () const
469 {
470 return 0x80
471 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
472 }
473 458
474 void setup (ptype type, int dst); 459 void setup (ptype type, int dst);
475 bool chk_config () const; 460 bool chk_config () const;
476}; 461};
462
463#define FEATURES ((ENABLE_COMPRESSION ? FEATURE_COMPRESSION : 0) \
464 | (ENABLE_ROHC ? FEATURE_ROHC : 0))
477 465
478void config_packet::setup (ptype type, int dst) 466void config_packet::setup (ptype type, int dst)
479{ 467{
480 prot_major = PROTOCOL_MAJOR; 468 prot_major = PROTOCOL_MAJOR;
481 prot_minor = PROTOCOL_MINOR; 469 prot_minor = PROTOCOL_MINOR;
482 randsize = RAND_SIZE; 470 randsize = RAND_SIZE;
483 hmaclen = HMACLENGTH; 471 hmaclen = HMACLENGTH;
484 flags = curflags (); 472 flags = ENABLE_COMPRESSION ? 0x81 : 0x80;
485 challengelen = sizeof (rsachallenge); 473 challengelen = sizeof (rsachallenge);
474 features = FEATURES;
486 475
487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 476 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
488 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 477 digest_nid = htonl (EVP_MD_type (RSA_HASH));
489 hmac_nid = htonl (EVP_MD_type (DIGEST)); 478 hmac_nid = htonl (EVP_MD_type (DIGEST));
490 479
… …
493} 482}
494 483
495bool config_packet::chk_config () const 484bool config_packet::chk_config () const
496{ 485{
497 if (prot_major != PROTOCOL_MAJOR) 486 if (prot_major != PROTOCOL_MAJOR)
498 slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR); 487 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
499 else if (randsize != RAND_SIZE) 488 else if (randsize != RAND_SIZE)
500 slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE); 489 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
501 else if (hmaclen != HMACLENGTH) 490 else if (hmaclen != HMACLENGTH)
502 slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH); 491 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
492#if 0 // this implementation should handle all flag settings
503 else if (flags != curflags ()) 493 else if (flags != curflags ())
504 slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ()); 494 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
495#endif
505 else if (challengelen != sizeof (rsachallenge)) 496 else if (challengelen != sizeof (rsachallenge))
506 slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge)); 497 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 498 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
508 slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 499 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 500 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
510 slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH)); 501 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
511 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 502 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
512 slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 503 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
513 else 504 else
514 return true; 505 return true;
515 506
516 return false; 507 return false;
517} 508}
518 509
519struct auth_req_packet : config_packet 510struct auth_req_packet : config_packet
520{ 511{
521 char magic[8]; 512 char magic[8];
522 u8 initiate; // false if this is just an automatic reply 513 u8 initiate; // false if this is just an automatic reply
523 u8 protocols; // supported protocols (will get patches on forward) 514 u8 protocols; // supported protocols (will be patched on forward)
524 u8 pad2, pad3; 515 u8 pad2, pad3;
525 rsaid id; 516 rsaid id;
526 rsaencrdata encr; 517 rsaencrdata encr;
527 518
528 auth_req_packet (int dst, bool initiate_, u8 protocols_) 519 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
612 } 603 }
613 else 604 else
614 { 605 {
615 retry_cnt = 0; 606 retry_cnt = 0;
616 establish_connection.start (NOW + 5); 607 establish_connection.start (NOW + 5);
617 keepalive.reset (); 608 keepalive.stop ();
618 rekey.reset (); 609 rekey.stop ();
619 } 610 }
620} 611}
621 612
622void 613void
623connection::reset_si () 614connection::reset_si ()
… …
689connection::send_auth_request (const sockinfo &si, bool initiate) 680connection::send_auth_request (const sockinfo &si, bool initiate)
690{ 681{
691 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 682 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
692 683
693 rsachallenge chg; 684 rsachallenge chg;
694
695 rsa_cache.gen (pkt->id, chg); 685 rsa_cache.gen (pkt->id, chg);
696 686 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
697 if (0 > RSA_public_encrypt (sizeof chg,
698 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
699 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
700 fatal ("RSA_public_encrypt error");
701 687
702 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 688 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
703 689
704 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 690 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
705 691
… …
739} 725}
740 726
741void 727void
742connection::establish_connection_cb (time_watcher &w) 728connection::establish_connection_cb (time_watcher &w)
743{ 729{
744 if (ictx || conf == THISNODE 730 if (!ictx
731 && conf != THISNODE
745 || connectmode == conf_node::C_NEVER 732 && connectmode != conf_node::C_NEVER
746 || connectmode == conf_node::C_DISABLED) 733 && connectmode != conf_node::C_DISABLED
747 w.at = TSTAMP_CANCEL; 734 && NOW > w.at)
748 else if (w.at <= NOW)
749 { 735 {
750 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 736 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
751 737
752 if (retry_int < 3600 * 8) 738 if (retry_int < 3600 * 8)
753 retry_cnt++; 739 retry_cnt++;
754 740
755 w.at = NOW + retry_int; 741 w.start (NOW + retry_int);
756 742
757 reset_si (); 743 reset_si ();
758 744
759 if (si.prot && !si.host) 745 if (si.prot && !si.host)
760 vpn->send_connect_request (conf->id); 746 vpn->send_connect_request (conf->id);
… …
791 si.host= 0; 777 si.host= 0;
792 778
793 last_activity = 0; 779 last_activity = 0;
794 retry_cnt = 0; 780 retry_cnt = 0;
795 781
796 rekey.reset (); 782 rekey.stop ();
797 keepalive.reset (); 783 keepalive.stop ();
798 establish_connection.reset (); 784 establish_connection.stop ();
799} 785}
800 786
801void 787void
802connection::shutdown () 788connection::shutdown ()
803{ 789{
… …
808} 794}
809 795
810void 796void
811connection::rekey_cb (time_watcher &w) 797connection::rekey_cb (time_watcher &w)
812{ 798{
813 w.at = TSTAMP_CANCEL;
814
815 reset_connection (); 799 reset_connection ();
816 establish_connection (); 800 establish_connection ();
817} 801}
818 802
819void 803void
820connection::send_data_packet (tap_packet *pkt, bool broadcast) 804connection::send_data_packet (tap_packet *pkt)
821{ 805{
822 vpndata_packet *p = new vpndata_packet; 806 vpndata_packet *p = new vpndata_packet;
823 int tos = 0; 807 int tos = 0;
824 808
825 // I am not hilarious about peeking into packets, but so be it. 809 // I am not hilarious about peeking into packets, but so be it.
826 if (conf->inherit_tos 810 if (conf->inherit_tos && pkt->is_ipv4 ())
827 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
828 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
829 tos = (*pkt)[15] & IPTOS_TOS_MASK; 811 tos = (*pkt)[15] & IPTOS_TOS_MASK;
830 812
831 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 813 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
832 send_vpn_packet (p, si, tos); 814 send_vpn_packet (p, si, tos);
833 815
834 delete p; 816 delete p;
835 817
836 if (oseqno > MAX_SEQNO) 818 if (oseqno > MAX_SEQNO)
837 rekey (); 819 rekey ();
838} 820}
839 821
840void 822void
841connection::inject_data_packet (tap_packet *pkt, bool broadcast) 823connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
842{ 824{
843 if (ictx && octx) 825 if (ictx && octx)
844 send_data_packet (pkt, broadcast); 826 send_data_packet (pkt);
845 else 827 else
846 { 828 {
847 if (!broadcast)//DDDD 829 if (!broadcast)//DDDD
848 data_queue.put (new tap_packet (*pkt)); 830 data_queue.put (new tap_packet (*pkt));
849 831
… …
855{ 837{
856 if (ictx && octx) 838 if (ictx && octx)
857 send_vpn_packet (pkt, si, tos); 839 send_vpn_packet (pkt, si, tos);
858 else 840 else
859 { 841 {
860 vpn_queue.put (new vpn_packet (*pkt)); 842 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
861 843
862 establish_connection (); 844 establish_connection ();
863 } 845 }
864} 846}
865 847
… …
924 if (p->initiate) 906 if (p->initiate)
925 send_auth_request (rsi, false); 907 send_auth_request (rsi, false);
926 908
927 rsachallenge k; 909 rsachallenge k;
928 910
929 if (0 > RSA_private_decrypt (sizeof (p->encr), 911 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
930 (unsigned char *)&p->encr, (unsigned char *)&k, 912 {
931 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
932 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 913 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
933 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 914 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
915 break;
916 }
934 else 917 else
935 { 918 {
936 delete octx; 919 delete octx;
937 920
938 octx = new crypto_ctx (k, 1); 921 octx = new crypto_ctx (k, 1);
939 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 922 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
940 923
924 // compatibility code, remove when no longer required
925 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
926
941 conf->protocols = p->protocols; 927 conf->protocols = p->protocols;
928 features = p->features & FEATURES;
942 929
943 send_auth_response (rsi, p->id, k); 930 send_auth_response (rsi, p->id, k);
944 931
945 connection_established (); 932 connection_established ();
946 933
… …
982 crypto_ctx *cctx = new crypto_ctx (chg, 0); 969 crypto_ctx *cctx = new crypto_ctx (chg, 0);
983 970
984 if (!p->hmac_chk (cctx)) 971 if (!p->hmac_chk (cctx))
985 { 972 {
986 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 973 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
987 "could be an attack, or just corruption or an synchronization error"), 974 "could be an attack, or just corruption or a synchronization error"),
988 conf->nodename, (const char *)rsi); 975 conf->nodename, (const char *)rsi);
989 break; 976 break;
990 } 977 }
991 else 978 else
992 { 979 {
… …
1041 { 1028 {
1042 vpndata_packet *p = (vpndata_packet *)pkt; 1029 vpndata_packet *p = (vpndata_packet *)pkt;
1043 1030
1044 if (!p->hmac_chk (ictx)) 1031 if (!p->hmac_chk (ictx))
1045 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1032 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1046 "could be an attack, or just corruption or an synchronization error"), 1033 "could be an attack, or just corruption or a synchronization error"),
1047 conf->nodename, (const char *)rsi); 1034 conf->nodename, (const char *)rsi);
1048 else 1035 else
1049 { 1036 {
1050 u32 seqno; 1037 u32 seqno;
1051 tap_packet *d = p->unpack (this, seqno); 1038 tap_packet *d = p->unpack (this, seqno);
1052 1039
1053 if (iseqno.recv_ok (seqno)) 1040 if (iseqno.recv_ok (seqno))
1054 { 1041 {
1055 vpn->tap->send (d); 1042 vpn->tap->send (d);
1056
1057 if (p->dst () == 0) // re-broadcast
1058 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1059 {
1060 connection *c = *i;
1061
1062 if (c->conf != THISNODE && c->conf != conf)
1063 c->inject_data_packet (d);
1064 }
1065 1043
1066 if (si != rsi) 1044 if (si != rsi)
1067 { 1045 {
1068 // fast re-sync on connection changes, useful especially for tcp/ip 1046 // fast re-sync on connection changes, useful especially for tcp/ip
1069 si = rsi; 1047 si = rsi;
… …
1143 { 1121 {
1144 reset_connection (); 1122 reset_connection ();
1145 establish_connection (); 1123 establish_connection ();
1146 } 1124 }
1147 else if (NOW < last_activity + ::conf.keepalive) 1125 else if (NOW < last_activity + ::conf.keepalive)
1148 w.at = last_activity + ::conf.keepalive; 1126 w.start (last_activity + ::conf.keepalive);
1149 else if (conf->connectmode != conf_node::C_ONDEMAND 1127 else if (conf->connectmode != conf_node::C_ONDEMAND
1150 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1128 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1151 { 1129 {
1152 send_ping (si); 1130 send_ping (si);
1153 w.at = NOW + 5; 1131 w.start (NOW + 5);
1154 } 1132 }
1155 else if (NOW < last_activity + ::conf.keepalive + 10) 1133 else if (NOW < last_activity + ::conf.keepalive + 10)
1156 // hold ondemand connections implicitly a few seconds longer 1134 // hold ondemand connections implicitly a few seconds longer
1157 // should delete octx, though, or something like that ;) 1135 // should delete octx, though, or something like that ;)
1158 w.at = last_activity + ::conf.keepalive + 10; 1136 w.start (last_activity + ::conf.keepalive + 10);
1159 else 1137 else
1160 reset_connection (); 1138 reset_connection ();
1161} 1139}
1162 1140
1163void connection::send_connect_request (int id) 1141void connection::send_connect_request (int id)

Diff Legend

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