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.23 by pcg, Wed Oct 22 00:42:53 2003 UTC vs.
Revision 1.28 by pcg, Tue Jan 27 05:56:35 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
… …
310} 310}
311 311
312#define MAXVPNDATA (MAX_MTU - 6 - 6) 312#define MAXVPNDATA (MAX_MTU - 6 - 6)
313#define DATAHDR (sizeof (u32) + RAND_SIZE) 313#define DATAHDR (sizeof (u32) + RAND_SIZE)
314 314
315struct vpndata_packet:vpn_packet 315struct vpndata_packet : vpn_packet
316 { 316 {
317 u8 data[MAXVPNDATA + DATAHDR]; // seqno 317 u8 data[MAXVPNDATA + DATAHDR]; // seqno
318 318
319 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno); 319 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
320 tap_packet *unpack (connection *conn, u32 &seqno); 320 tap_packet *unpack (connection *conn, u32 &seqno);
… …
504 504
505struct auth_req_packet : config_packet 505struct auth_req_packet : config_packet
506{ 506{
507 char magic[8]; 507 char magic[8];
508 u8 initiate; // false if this is just an automatic reply 508 u8 initiate; // false if this is just an automatic reply
509 u8 protocols; // supported protocols (will get patches on forward) 509 u8 protocols; // supported protocols (will be patched on forward)
510 u8 pad2, pad3; 510 u8 pad2, pad3;
511 rsaid id; 511 rsaid id;
512 rsaencrdata encr; 512 rsaencrdata encr;
513 513
514 auth_req_packet (int dst, bool initiate_, u8 protocols_) 514 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
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
… …
839{ 832{
840 if (ictx && octx) 833 if (ictx && octx)
841 send_vpn_packet (pkt, si, tos); 834 send_vpn_packet (pkt, si, tos);
842 else 835 else
843 { 836 {
844 vpn_queue.put (new vpn_packet (*pkt)); 837 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
845 838
846 establish_connection (); 839 establish_connection ();
847 } 840 }
848} 841}
849 842
… …
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,
915 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
916 { 907 {
917 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?"),
918 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));
919 break; 910 break;
920 } 911 }
… …
969 crypto_ctx *cctx = new crypto_ctx (chg, 0); 960 crypto_ctx *cctx = new crypto_ctx (chg, 0);
970 961
971 if (!p->hmac_chk (cctx)) 962 if (!p->hmac_chk (cctx))
972 { 963 {
973 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 964 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
974 "could be an attack, or just corruption or an synchronization error"), 965 "could be an attack, or just corruption or a synchronization error"),
975 conf->nodename, (const char *)rsi); 966 conf->nodename, (const char *)rsi);
976 break; 967 break;
977 } 968 }
978 else 969 else
979 { 970 {
… …
1028 { 1019 {
1029 vpndata_packet *p = (vpndata_packet *)pkt; 1020 vpndata_packet *p = (vpndata_packet *)pkt;
1030 1021
1031 if (!p->hmac_chk (ictx)) 1022 if (!p->hmac_chk (ictx))
1032 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1023 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1033 "could be an attack, or just corruption or an synchronization error"), 1024 "could be an attack, or just corruption or a synchronization error"),
1034 conf->nodename, (const char *)rsi); 1025 conf->nodename, (const char *)rsi);
1035 else 1026 else
1036 { 1027 {
1037 u32 seqno; 1028 u32 seqno;
1038 tap_packet *d = p->unpack (this, seqno); 1029 tap_packet *d = p->unpack (this, seqno);
… …
1121 { 1112 {
1122 reset_connection (); 1113 reset_connection ();
1123 establish_connection (); 1114 establish_connection ();
1124 } 1115 }
1125 else if (NOW < last_activity + ::conf.keepalive) 1116 else if (NOW < last_activity + ::conf.keepalive)
1126 w.at = last_activity + ::conf.keepalive; 1117 w.start (last_activity + ::conf.keepalive);
1127 else if (conf->connectmode != conf_node::C_ONDEMAND 1118 else if (conf->connectmode != conf_node::C_ONDEMAND
1128 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1119 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1129 { 1120 {
1130 send_ping (si); 1121 send_ping (si);
1131 w.at = NOW + 5; 1122 w.start (NOW + 5);
1132 } 1123 }
1133 else if (NOW < last_activity + ::conf.keepalive + 10) 1124 else if (NOW < last_activity + ::conf.keepalive + 10)
1134 // hold ondemand connections implicitly a few seconds longer 1125 // hold ondemand connections implicitly a few seconds longer
1135 // should delete octx, though, or something like that ;) 1126 // should delete octx, though, or something like that ;)
1136 w.at = last_activity + ::conf.keepalive + 10; 1127 w.start (last_activity + ::conf.keepalive + 10);
1137 else 1128 else
1138 reset_connection (); 1129 reset_connection ();
1139} 1130}
1140 1131
1141void connection::send_connect_request (int id) 1132void connection::send_connect_request (int id)

Diff Legend

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