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.22 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.26 by pcg, Sat Jan 17 14:08:57 2004 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
4 4
5 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
6 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
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
21 21
22extern "C" { 22extern "C" {
23# include "lzf/lzf.h" 23# include "lzf/lzf.h"
24} 24}
25 25
26#include <cassert>
27
26#include <list> 28#include <list>
27 29
28#include <openssl/rand.h> 30#include <openssl/rand.h>
29#include <openssl/evp.h> 31#include <openssl/evp.h>
30#include <openssl/rsa.h> 32#include <openssl/rsa.h>
… …
134 136
135} rsa_cache; 137} rsa_cache;
136 138
137void rsa_cache::cleaner_cb (time_watcher &w) 139void rsa_cache::cleaner_cb (time_watcher &w)
138{ 140{
139 if (empty ()) 141 if (!empty ())
140 w.at = TSTAMP_CANCEL;
141 else
142 { 142 {
143 w.at = NOW + RSA_TTL; 143 w.start (NOW + RSA_TTL);
144 144
145 for (iterator i = begin (); i != end (); ) 145 for (iterator i = begin (); i != end (); )
146 if (i->expire <= NOW) 146 if (i->expire <= NOW)
147 i = erase (i); 147 i = erase (i);
148 else 148 else
… …
479} 479}
480 480
481bool config_packet::chk_config () const 481bool config_packet::chk_config () const
482{ 482{
483 if (prot_major != PROTOCOL_MAJOR) 483 if (prot_major != PROTOCOL_MAJOR)
484 slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR); 484 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
485 else if (randsize != RAND_SIZE) 485 else if (randsize != RAND_SIZE)
486 slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE); 486 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
487 else if (hmaclen != HMACLENGTH) 487 else if (hmaclen != HMACLENGTH)
488 slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH); 488 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
489 else if (flags != curflags ()) 489 else if (flags != curflags ())
490 slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ()); 490 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
491 else if (challengelen != sizeof (rsachallenge)) 491 else if (challengelen != sizeof (rsachallenge))
492 slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge)); 492 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
493 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 493 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
494 slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 494 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
495 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 495 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
496 slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH)); 496 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
497 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 497 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
498 slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 498 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
499 else 499 else
500 return true; 500 return true;
501 501
502 return false; 502 return false;
503} 503}
… …
598 } 598 }
599 else 599 else
600 { 600 {
601 retry_cnt = 0; 601 retry_cnt = 0;
602 establish_connection.start (NOW + 5); 602 establish_connection.start (NOW + 5);
603 keepalive.reset (); 603 keepalive.stop ();
604 rekey.reset (); 604 rekey.stop ();
605 } 605 }
606} 606}
607 607
608void 608void
609connection::reset_si () 609connection::reset_si ()
… …
675connection::send_auth_request (const sockinfo &si, bool initiate) 675connection::send_auth_request (const sockinfo &si, bool initiate)
676{ 676{
677 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 677 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
678 678
679 rsachallenge chg; 679 rsachallenge chg;
680
681 rsa_cache.gen (pkt->id, chg); 680 rsa_cache.gen (pkt->id, chg);
682 681 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
683 if (0 > RSA_public_encrypt (sizeof chg,
684 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
685 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
686 fatal ("RSA_public_encrypt error");
687 682
688 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 683 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
689 684
690 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 685 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
691 686
… …
725} 720}
726 721
727void 722void
728connection::establish_connection_cb (time_watcher &w) 723connection::establish_connection_cb (time_watcher &w)
729{ 724{
730 if (ictx || conf == THISNODE 725 if (!ictx
726 && conf != THISNODE
731 || connectmode == conf_node::C_NEVER 727 && connectmode != conf_node::C_NEVER
732 || connectmode == conf_node::C_DISABLED) 728 && connectmode != conf_node::C_DISABLED
733 w.at = TSTAMP_CANCEL; 729 && NOW > w.at)
734 else if (w.at <= NOW)
735 { 730 {
736 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 731 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
737 732
738 if (retry_int < 3600 * 8) 733 if (retry_int < 3600 * 8)
739 retry_cnt++; 734 retry_cnt++;
740 735
741 w.at = NOW + retry_int; 736 w.start (NOW + retry_int);
742 737
743 reset_si (); 738 reset_si ();
744 739
745 if (si.prot && !si.host) 740 if (si.prot && !si.host)
746 vpn->send_connect_request (conf->id); 741 vpn->send_connect_request (conf->id);
… …
777 si.host= 0; 772 si.host= 0;
778 773
779 last_activity = 0; 774 last_activity = 0;
780 retry_cnt = 0; 775 retry_cnt = 0;
781 776
782 rekey.reset (); 777 rekey.stop ();
783 keepalive.reset (); 778 keepalive.stop ();
784 establish_connection.reset (); 779 establish_connection.stop ();
785} 780}
786 781
787void 782void
788connection::shutdown () 783connection::shutdown ()
789{ 784{
… …
794} 789}
795 790
796void 791void
797connection::rekey_cb (time_watcher &w) 792connection::rekey_cb (time_watcher &w)
798{ 793{
799 w.at = TSTAMP_CANCEL;
800
801 reset_connection (); 794 reset_connection ();
802 establish_connection (); 795 establish_connection ();
803} 796}
804 797
805void 798void
… …
908 if (p->initiate) 901 if (p->initiate)
909 send_auth_request (rsi, false); 902 send_auth_request (rsi, false);
910 903
911 rsachallenge k; 904 rsachallenge k;
912 905
913 if (0 > RSA_private_decrypt (sizeof (p->encr), 906 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
914 (unsigned char *)&p->encr, (unsigned char *)&k, 907 {
915 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
916 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 908 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
917 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 909 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
910 break;
911 }
918 else 912 else
919 { 913 {
920 delete octx; 914 delete octx;
921 915
922 octx = new crypto_ctx (k, 1); 916 octx = new crypto_ctx (k, 1);
… …
1118 { 1112 {
1119 reset_connection (); 1113 reset_connection ();
1120 establish_connection (); 1114 establish_connection ();
1121 } 1115 }
1122 else if (NOW < last_activity + ::conf.keepalive) 1116 else if (NOW < last_activity + ::conf.keepalive)
1123 w.at = last_activity + ::conf.keepalive; 1117 w.start (last_activity + ::conf.keepalive);
1124 else if (conf->connectmode != conf_node::C_ONDEMAND 1118 else if (conf->connectmode != conf_node::C_ONDEMAND
1125 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1119 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1126 { 1120 {
1127 send_ping (si); 1121 send_ping (si);
1128 w.at = NOW + 5; 1122 w.start (NOW + 5);
1129 } 1123 }
1130 else if (NOW < last_activity + ::conf.keepalive + 10) 1124 else if (NOW < last_activity + ::conf.keepalive + 10)
1131 // hold ondemand connections implicitly a few seconds longer 1125 // hold ondemand connections implicitly a few seconds longer
1132 // should delete octx, though, or something like that ;) 1126 // should delete octx, though, or something like that ;)
1133 w.at = last_activity + ::conf.keepalive + 10; 1127 w.start (last_activity + ::conf.keepalive + 10);
1134 else 1128 else
1135 reset_connection (); 1129 reset_connection ();
1136} 1130}
1137 1131
1138void connection::send_connect_request (int id) 1132void connection::send_connect_request (int id)

Diff Legend

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