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.34 by pcg, Mon May 10 18:57:07 2004 UTC vs.
Revision 1.52 by pcg, Wed Mar 23 21:55:39 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 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 8 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 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your option) any later version.
9 11
10 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 15 GNU General Public License for more details.
14 16
15 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21 23
… …
25 27
26#include <openssl/rand.h> 28#include <openssl/rand.h>
27#include <openssl/evp.h> 29#include <openssl/evp.h>
28#include <openssl/rsa.h> 30#include <openssl/rsa.h>
29#include <openssl/err.h> 31#include <openssl/err.h>
30
31#include "gettext.h"
32 32
33#include "conf.h" 33#include "conf.h"
34#include "slog.h" 34#include "slog.h"
35#include "device.h" 35#include "device.h"
36#include "vpn.h" 36#include "vpn.h"
… …
95struct rsa_cache : list<rsa_entry> 95struct rsa_cache : list<rsa_entry>
96{ 96{
97 void cleaner_cb (time_watcher &w); time_watcher cleaner; 97 void cleaner_cb (time_watcher &w); time_watcher cleaner;
98 98
99 bool find (const rsaid &id, rsachallenge &chg) 99 bool find (const rsaid &id, rsachallenge &chg)
100 { 100 {
101 for (iterator i = begin (); i != end (); ++i) 101 for (iterator i = begin (); i != end (); ++i)
102 { 102 {
103 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 103 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)
104 { 104 {
105 memcpy (&chg, &i->chg, sizeof chg); 105 memcpy (&chg, &i->chg, sizeof chg);
106 106
107 erase (i); 107 erase (i);
108 return true; 108 return true;
109 } 109 }
110 } 110 }
111 111
112 if (cleaner.at < NOW) 112 if (cleaner.at < NOW)
113 cleaner.start (NOW + RSA_TTL); 113 cleaner.start (NOW + RSA_TTL);
114 114
115 return false; 115 return false;
116 } 116 }
117 117
118 void gen (rsaid &id, rsachallenge &chg) 118 void gen (rsaid &id, rsachallenge &chg)
119 { 119 {
120 rsa_entry e; 120 rsa_entry e;
121 121
122 RAND_bytes ((unsigned char *)&id, sizeof id); 122 RAND_bytes ((unsigned char *)&id, sizeof id);
123 RAND_bytes ((unsigned char *)&chg, sizeof chg); 123 RAND_bytes ((unsigned char *)&chg, sizeof chg);
124 124
125 e.expire = NOW + RSA_TTL; 125 e.expire = NOW + RSA_TTL;
126 e.id = id; 126 e.id = id;
127 memcpy (&e.chg, &chg, sizeof chg); 127 memcpy (&e.chg, &chg, sizeof chg);
128 128
129 push_back (e); 129 push_back (e);
130 130
131 if (cleaner.at < NOW) 131 if (cleaner.at < NOW)
132 cleaner.start (NOW + RSA_TTL); 132 cleaner.start (NOW + RSA_TTL);
133 } 133 }
134 134
135 rsa_cache () 135 rsa_cache ()
136 : cleaner (this, &rsa_cache::cleaner_cb) 136 : cleaner (this, &rsa_cache::cleaner_cb)
137 { } 137 { }
138 138
139} rsa_cache; 139} rsa_cache;
140 140
141void rsa_cache::cleaner_cb (time_watcher &w) 141void rsa_cache::cleaner_cb (time_watcher &w)
142{ 142{
… …
202// 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.
203// this implementation ("splay list" ;) is inefficient, 203// this implementation ("splay list" ;) is inefficient,
204// but low on resources. 204// but low on resources.
205struct net_rate_limiter : list<net_rateinfo> 205struct net_rate_limiter : list<net_rateinfo>
206{ 206{
207# define NRL_ALPHA 1. - 1. / 600. // allow bursts 207# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
208# define NRL_CUTOFF 10. // one event every CUTOFF seconds 208# define NRL_CUTOFF 10. // one event every CUTOFF seconds
209# define NRL_EXPIRE NRL_CUTOFF * 30. // expire entries after this time 209# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
210# define NRL_MAXDIF NRL_CUTOFF * (1. / (1. - NRL_ALPHA)) // maximum diff /count value 210# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
211 211
212 bool can (const sockinfo &si) { return can((u32)si.host); } 212 bool can (const sockinfo &si) { return can((u32)si.host); }
213 bool can (u32 host); 213 bool can (u32 host);
214}; 214};
215 215
… …
476{ 476{
477 prot_major = PROTOCOL_MAJOR; 477 prot_major = PROTOCOL_MAJOR;
478 prot_minor = PROTOCOL_MINOR; 478 prot_minor = PROTOCOL_MINOR;
479 randsize = RAND_SIZE; 479 randsize = RAND_SIZE;
480 hmaclen = HMACLENGTH; 480 hmaclen = HMACLENGTH;
481 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 481 flags = 0;
482 challengelen = sizeof (rsachallenge); 482 challengelen = sizeof (rsachallenge);
483 features = get_features (); 483 features = get_features ();
484 484
485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
486 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 486 digest_nid = htonl (EVP_MD_type (RSA_HASH));
… …
496 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 496 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
497 else if (randsize != RAND_SIZE) 497 else if (randsize != RAND_SIZE)
498 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 498 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
499 else if (hmaclen != HMACLENGTH) 499 else if (hmaclen != HMACLENGTH)
500 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %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
502 else if (flags != curflags ())
503 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
504#endif
505 else if (challengelen != sizeof (rsachallenge)) 501 else if (challengelen != sizeof (rsachallenge))
506 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 502 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 503 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)); 504 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))) 505 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
589{ 585{
590 if (ictx && octx) 586 if (ictx && octx)
591 { 587 {
592 connectmode = conf->connectmode; 588 connectmode = conf->connectmode;
593 589
590 // make sure rekeying timeouts are slightly asymmetric
594 rekey.start (NOW + ::conf.rekey); 591 rekey.start (NOW + ::conf.rekey
592 + (conf->id > THISNODE->id ? 10 : 0));
595 keepalive.start (NOW + ::conf.keepalive); 593 keepalive.start (NOW + ::conf.keepalive);
596 594
597 // send queued packets 595 // send queued packets
598 if (ictx && octx) 596 if (ictx && octx)
599 { 597 {
… …
625 protocol = best_protocol (THISNODE->protocols & conf->protocols); 623 protocol = best_protocol (THISNODE->protocols & conf->protocols);
626 624
627 // mask out protocols we cannot establish 625 // mask out protocols we cannot establish
628 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 626 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
629 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 627 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
628 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
630 629
631 si.set (conf, protocol); 630 si.set (conf, protocol);
632} 631}
633 632
634// ensure sockinfo is valid, forward if necessary 633// ensure sockinfo is valid, forward if necessary
… …
639 { 638 {
640 connection *r = vpn->find_router (); 639 connection *r = vpn->find_router ();
641 640
642 if (r) 641 if (r)
643 { 642 {
644 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 643 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
645 conf->nodename, r->conf->nodename); 644 conf->nodename, r->conf->nodename, (const char *)r->si);
646 return r->si; 645 return r->si;
647 } 646 }
648 else 647 else
649 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 648 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
650 conf->nodename); 649 conf->nodename);
… …
740 && conf != THISNODE 739 && conf != THISNODE
741 && connectmode != conf_node::C_NEVER 740 && connectmode != conf_node::C_NEVER
742 && connectmode != conf_node::C_DISABLED 741 && connectmode != conf_node::C_DISABLED
743 && NOW > w.at) 742 && NOW > w.at)
744 { 743 {
745 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 744 w.at = TSTAMP_MAX; // first disable this watcher in case of recursion
746 745
747 if (retry_int < 3600 * 8) 746 double retry_int = double (retry_cnt & 3
748 retry_cnt++; 747 ? (retry_cnt & 3) + 1
749 748 : 1 << (retry_cnt >> 2));
750 w.start (NOW + retry_int);
751 749
752 reset_si (); 750 reset_si ();
751
752 bool slow = si.prot & PROT_SLOW;
753 753
754 if (si.prot && !si.host) 754 if (si.prot && !si.host)
755 vpn->send_connect_request (conf->id); 755 vpn->send_connect_request (conf->id);
756 else 756 else
757 { 757 {
758 const sockinfo &dsi = forward_si (si); 758 const sockinfo &dsi = forward_si (si);
759
760 slow = slow || (dsi.prot & PROT_SLOW);
759 761
760 if (dsi.valid () && auth_rate_limiter.can (dsi)) 762 if (dsi.valid () && auth_rate_limiter.can (dsi))
761 { 763 {
762 if (retry_cnt < 4) 764 if (retry_cnt < 4)
763 send_auth_request (dsi, true); 765 send_auth_request (dsi, true);
764 else 766 else
765 send_ping (dsi, 0); 767 send_ping (dsi, 0);
766 } 768 }
767 } 769 }
770
771 retry_int *= slow ? 8. : 0.7;
772
773 if (retry_int < conf->max_retry)
774 retry_cnt++;
775 else
776 retry_int = conf->max_retry;
777
778 w.start (NOW + retry_int);
768 } 779 }
769} 780}
770 781
771void 782void
772connection::reset_connection () 783connection::reset_connection ()
… …
775 { 786 {
776 slog (L_INFO, _("%s(%s): connection lost"), 787 slog (L_INFO, _("%s(%s): connection lost"),
777 conf->nodename, (const char *)si); 788 conf->nodename, (const char *)si);
778 789
779 if (::conf.script_node_down) 790 if (::conf.script_node_down)
780 run_script (run_script_cb (this, &connection::script_node_down), false); 791 if (!run_script (run_script_cb (this, &connection::script_node_down), false))
792 slog (L_WARN, _("node-down command execution failed, continuing."));
781 } 793 }
782 794
783 delete ictx; ictx = 0; 795 delete ictx; ictx = 0;
784 delete octx; octx = 0; 796 delete octx; octx = 0;
797#if ENABLE_DNS
798 dnsv4_reset_connection ();
799#endif
785 800
786 si.host= 0; 801 si.host = 0;
787 802
788 last_activity = 0; 803 last_activity = 0;
789 retry_cnt = 0; 804 retry_cnt = 0;
790 805
791 rekey.stop (); 806 rekey.stop ();
… …
928 delete octx; 943 delete octx;
929 944
930 octx = new crypto_ctx (k, 1); 945 octx = new crypto_ctx (k, 1);
931 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 946 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
932 947
933 // compatibility code, remove when no longer required
934 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
935
936 conf->protocols = p->protocols; 948 conf->protocols = p->protocols;
937 features = p->features & config_packet::get_features (); 949 features = p->features & config_packet::get_features ();
938 950
939 send_auth_response (rsi, p->id, k); 951 send_auth_response (rsi, p->id, k);
940 952
… …
1006 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1018 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1007 conf->nodename, (const char *)rsi, 1019 conf->nodename, (const char *)rsi,
1008 p->prot_major, p->prot_minor); 1020 p->prot_major, p->prot_minor);
1009 1021
1010 if (::conf.script_node_up) 1022 if (::conf.script_node_up)
1011 run_script (run_script_cb (this, &connection::script_node_up), false); 1023 if (!run_script (run_script_cb (this, &connection::script_node_up), false))
1024 slog (L_WARN, _("node-up command execution failed, continuing."));
1012 1025
1013 break; 1026 break;
1014 } 1027 }
1015 else 1028 else
1016 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1029 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1094 break; 1107 break;
1095 1108
1096 case vpn_packet::PT_CONNECT_INFO: 1109 case vpn_packet::PT_CONNECT_INFO:
1097 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1110 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1098 { 1111 {
1099 connect_info_packet *p = (connect_info_packet *) pkt; 1112 connect_info_packet *p = (connect_info_packet *)pkt;
1100 1113
1101 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1114 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1102 1115 {
1103 connection *c = vpn->conns[p->id - 1]; 1116 connection *c = vpn->conns[p->id - 1];
1104 1117
1105 c->conf->protocols = p->protocols; 1118 c->conf->protocols = p->protocols;
1106 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1119 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1107 p->si.upgrade_protocol (protocol, c->conf); 1120 p->si.upgrade_protocol (protocol, c->conf);
1108 1121
1109 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1122 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1110 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1123 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1111 1124
1112 const sockinfo &dsi = forward_si (p->si); 1125 const sockinfo &dsi = forward_si (p->si);
1113 1126
1114 if (dsi.valid ()) 1127 if (dsi.valid ())
1115 c->send_auth_request (dsi, true); 1128 c->send_auth_request (dsi, true);
1129 }
1116 } 1130 }
1117 1131
1118 break; 1132 break;
1119 1133
1120 default: 1134 default:
… …
1155 send_vpn_packet (p, si); 1169 send_vpn_packet (p, si);
1156 1170
1157 delete p; 1171 delete p;
1158} 1172}
1159 1173
1160void connection::script_node () 1174void connection::script_init_env ()
1161{ 1175{
1162 vpn->script_if_up (); 1176 vpn->script_init_env ();
1163 1177
1164 char *env; 1178 char *env;
1165 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1179 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1166 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1180 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1167 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1181 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1168 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1182 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1169} 1183}
1170 1184
1171const char *connection::script_node_up () 1185const char *connection::script_node_up ()
1172{ 1186{
1173 script_node (); 1187 script_init_env ();
1174 1188
1175 putenv ("STATE=up"); 1189 putenv ("STATE=up");
1176 1190
1191 char *filename;
1192 asprintf (&filename,
1193 "%s/%s",
1194 confbase,
1177 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1195 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1178} 1196}
1179 1197
1180const char *connection::script_node_down () 1198const char *connection::script_node_down ()
1181{ 1199{
1182 script_node (); 1200 script_init_env ();
1183 1201
1184 putenv ("STATE=down"); 1202 putenv ("STATE=down");
1185 1203
1186 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1204 char *filename;
1205 asprintf (&filename,
1206 "%s/%s",
1207 confbase,
1208 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1187} 1209}
1188 1210
1189connection::connection(struct vpn *vpn_) 1211connection::connection (struct vpn *vpn, conf_node *conf)
1190: vpn(vpn_) 1212: vpn(vpn), conf(conf)
1191, rekey (this, &connection::rekey_cb) 1213, rekey (this, &connection::rekey_cb)
1192, keepalive (this, &connection::keepalive_cb) 1214, keepalive (this, &connection::keepalive_cb)
1193, establish_connection (this, &connection::establish_connection_cb) 1215, establish_connection (this, &connection::establish_connection_cb)
1216#if ENABLE_DNS
1217, dns (0)
1218#endif
1194{ 1219{
1195 octx = ictx = 0; 1220 octx = ictx = 0;
1196 retry_cnt = 0; 1221 retry_cnt = 0;
1197 1222
1223 if (!conf->protocols) // make sure some protocol is enabled
1224 conf->protocols = PROT_UDPv4;
1225
1198 connectmode = conf_node::C_ALWAYS; // initial setting 1226 connectmode = conf_node::C_ALWAYS; // initial setting
1199 reset_connection (); 1227 reset_connection ();
1200} 1228}
1201 1229
1202connection::~connection () 1230connection::~connection ()

Diff Legend

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