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.30 by pcg, Thu Jan 29 19:22:05 2004 UTC vs.
Revision 1.50 by pcg, Fri Mar 18 01:53:05 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"
… …
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 static const double ALPHA = 1. - 1. / 600.; // allow bursts 207# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
208 static const double CUTOFF = 10.; // one event every CUTOFF seconds 208# define NRL_CUTOFF 10. // one event every CUTOFF seconds
209 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 209# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
210 static const double MAXDIF = CUTOFF * (1. / (1. - 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
… …
220 iterator i; 220 iterator i;
221 221
222 for (i = begin (); i != end (); ) 222 for (i = begin (); i != end (); )
223 if (i->host == host) 223 if (i->host == host)
224 break; 224 break;
225 else if (i->last < NOW - EXPIRE) 225 else if (i->last < NOW - NRL_EXPIRE)
226 i = erase (i); 226 i = erase (i);
227 else 227 else
228 i++; 228 i++;
229 229
230 if (i == end ()) 230 if (i == end ())
231 { 231 {
232 net_rateinfo ri; 232 net_rateinfo ri;
233 233
234 ri.host = host; 234 ri.host = host;
235 ri.pcnt = 1.; 235 ri.pcnt = 1.;
236 ri.diff = MAXDIF; 236 ri.diff = NRL_MAXDIF;
237 ri.last = NOW; 237 ri.last = NOW;
238 238
239 push_front (ri); 239 push_front (ri);
240 240
241 return true; 241 return true;
… …
243 else 243 else
244 { 244 {
245 net_rateinfo ri (*i); 245 net_rateinfo ri (*i);
246 erase (i); 246 erase (i);
247 247
248 ri.pcnt = ri.pcnt * ALPHA; 248 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 249 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
250 250
251 ri.last = NOW; 251 ri.last = NOW;
252 252
253 double dif = ri.diff / ri.pcnt; 253 double dif = ri.diff / ri.pcnt;
254 254
255 bool send = dif > CUTOFF; 255 bool send = dif > NRL_CUTOFF;
256 256
257 if (dif > MAXDIF) 257 if (dif > NRL_MAXDIF)
258 { 258 {
259 ri.pcnt = 1.; 259 ri.pcnt = 1.;
260 ri.diff = MAXDIF; 260 ri.diff = NRL_MAXDIF;
261 } 261 }
262 else if (send) 262 else if (send)
263 ri.pcnt++; 263 ri.pcnt++;
264 264
265 push_front (ri); 265 push_front (ri);
… …
335 int outl = 0, outl2; 335 int outl = 0, outl2;
336 ptype type = PT_DATA_UNCOMPRESSED; 336 ptype type = PT_DATA_UNCOMPRESSED;
337 337
338#if ENABLE_COMPRESSION 338#if ENABLE_COMPRESSION
339 u8 cdata[MAX_MTU]; 339 u8 cdata[MAX_MTU];
340 u32 cl;
341 340
341 if (conn->features & ENABLE_COMPRESSION)
342 {
342 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344
343 if (cl) 345 if (cl)
344 { 346 {
345 type = PT_DATA_COMPRESSED; 347 type = PT_DATA_COMPRESSED;
346 d = cdata; 348 d = cdata;
347 l = cl + 2; 349 l = cl + 2;
348 350
349 d[0] = cl >> 8; 351 d[0] = cl >> 8;
350 d[1] = cl; 352 d[1] = cl;
353 }
351 } 354 }
352#endif 355#endif
353 356
354 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 357 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
355 358
… …
448{ 451{
449 // actually, hmaclen cannot be checked because the hmac 452 // actually, hmaclen cannot be checked because the hmac
450 // field comes before this data, so peers with other 453 // field comes before this data, so peers with other
451 // hmacs simply will not work. 454 // hmacs simply will not work.
452 u8 prot_major, prot_minor, randsize, hmaclen; 455 u8 prot_major, prot_minor, randsize, hmaclen;
453 u8 flags, challengelen, pad2, pad3; 456 u8 flags, challengelen, features, pad3;
454 u32 cipher_nid, digest_nid, hmac_nid; 457 u32 cipher_nid, digest_nid, hmac_nid;
455
456 const u8 curflags () const
457 {
458 return 0x80
459 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
460 }
461 458
462 void setup (ptype type, int dst); 459 void setup (ptype type, int dst);
463 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 }
464}; 473};
465 474
466void config_packet::setup (ptype type, int dst) 475void config_packet::setup (ptype type, int dst)
467{ 476{
468 prot_major = PROTOCOL_MAJOR; 477 prot_major = PROTOCOL_MAJOR;
469 prot_minor = PROTOCOL_MINOR; 478 prot_minor = PROTOCOL_MINOR;
470 randsize = RAND_SIZE; 479 randsize = RAND_SIZE;
471 hmaclen = HMACLENGTH; 480 hmaclen = HMACLENGTH;
472 flags = curflags (); 481 flags = 0;
473 challengelen = sizeof (rsachallenge); 482 challengelen = sizeof (rsachallenge);
483 features = get_features ();
474 484
475 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
476 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 486 digest_nid = htonl (EVP_MD_type (RSA_HASH));
477 hmac_nid = htonl (EVP_MD_type (DIGEST)); 487 hmac_nid = htonl (EVP_MD_type (DIGEST));
478 488
… …
486 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);
487 else if (randsize != RAND_SIZE) 497 else if (randsize != RAND_SIZE)
488 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);
489 else if (hmaclen != HMACLENGTH) 499 else if (hmaclen != HMACLENGTH)
490 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);
491 else if (flags != curflags ())
492 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
493 else if (challengelen != sizeof (rsachallenge)) 501 else if (challengelen != sizeof (rsachallenge))
494 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));
495 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 503 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
496 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));
497 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 505 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
577{ 585{
578 if (ictx && octx) 586 if (ictx && octx)
579 { 587 {
580 connectmode = conf->connectmode; 588 connectmode = conf->connectmode;
581 589
590 // make sure rekeying timeouts are slightly asymmetric
582 rekey.start (NOW + ::conf.rekey); 591 rekey.start (NOW + ::conf.rekey
592 + (conf->id > THISNODE->id ? 10 : 0));
583 keepalive.start (NOW + ::conf.keepalive); 593 keepalive.start (NOW + ::conf.keepalive);
584 594
585 // send queued packets 595 // send queued packets
586 if (ictx && octx) 596 if (ictx && octx)
587 { 597 {
… …
613 protocol = best_protocol (THISNODE->protocols & conf->protocols); 623 protocol = best_protocol (THISNODE->protocols & conf->protocols);
614 624
615 // mask out protocols we cannot establish 625 // mask out protocols we cannot establish
616 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 626 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
617 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 627 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
628 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
618 629
619 si.set (conf, protocol); 630 si.set (conf, protocol);
620} 631}
621 632
622// ensure sockinfo is valid, forward if necessary 633// ensure sockinfo is valid, forward if necessary
… …
627 { 638 {
628 connection *r = vpn->find_router (); 639 connection *r = vpn->find_router ();
629 640
630 if (r) 641 if (r)
631 { 642 {
632 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 643 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
633 conf->nodename, r->conf->nodename); 644 conf->nodename, r->conf->nodename, (const char *)r->si);
634 return r->si; 645 return r->si;
635 } 646 }
636 else 647 else
637 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 648 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
638 conf->nodename); 649 conf->nodename);
… …
728 && conf != THISNODE 739 && conf != THISNODE
729 && connectmode != conf_node::C_NEVER 740 && connectmode != conf_node::C_NEVER
730 && connectmode != conf_node::C_DISABLED 741 && connectmode != conf_node::C_DISABLED
731 && NOW > w.at) 742 && NOW > w.at)
732 { 743 {
733 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
734 745
735 if (retry_int < 3600 * 8) 746 double retry_int = double (retry_cnt & 3
736 retry_cnt++; 747 ? (retry_cnt & 3) + 1
737 748 : 1 << (retry_cnt >> 2));
738 w.start (NOW + retry_int);
739 749
740 reset_si (); 750 reset_si ();
751
752 bool slow = si.prot & PROT_SLOW;
741 753
742 if (si.prot && !si.host) 754 if (si.prot && !si.host)
743 vpn->send_connect_request (conf->id); 755 vpn->send_connect_request (conf->id);
744 else 756 else
745 { 757 {
746 const sockinfo &dsi = forward_si (si); 758 const sockinfo &dsi = forward_si (si);
759
760 slow = slow || (dsi.prot & PROT_SLOW);
747 761
748 if (dsi.valid () && auth_rate_limiter.can (dsi)) 762 if (dsi.valid () && auth_rate_limiter.can (dsi))
749 { 763 {
750 if (retry_cnt < 4) 764 if (retry_cnt < 4)
751 send_auth_request (dsi, true); 765 send_auth_request (dsi, true);
752 else 766 else
753 send_ping (dsi, 0); 767 send_ping (dsi, 0);
754 } 768 }
755 } 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);
756 } 779 }
757} 780}
758 781
759void 782void
760connection::reset_connection () 783connection::reset_connection ()
… …
768 run_script (run_script_cb (this, &connection::script_node_down), false); 791 run_script (run_script_cb (this, &connection::script_node_down), false);
769 } 792 }
770 793
771 delete ictx; ictx = 0; 794 delete ictx; ictx = 0;
772 delete octx; octx = 0; 795 delete octx; octx = 0;
796#if ENABLE_DNS
797 dnsv4_reset_connection ();
798#endif
773 799
774 si.host= 0; 800 si.host = 0;
775 801
776 last_activity = 0; 802 last_activity = 0;
777 retry_cnt = 0; 803 retry_cnt = 0;
778 804
779 rekey.stop (); 805 rekey.stop ();
… …
917 943
918 octx = new crypto_ctx (k, 1); 944 octx = new crypto_ctx (k, 1);
919 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 945 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
920 946
921 conf->protocols = p->protocols; 947 conf->protocols = p->protocols;
948 features = p->features & config_packet::get_features ();
922 949
923 send_auth_response (rsi, p->id, k); 950 send_auth_response (rsi, p->id, k);
924 951
925 connection_established (); 952 connection_established ();
926 953
… …
1040 si = rsi; 1067 si = rsi;
1041 1068
1042 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1069 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1043 conf->nodename, (const char *)si, (const char *)rsi); 1070 conf->nodename, (const char *)si, (const char *)rsi);
1044 } 1071 }
1045
1046 delete d;
1047
1048 break;
1049 } 1072 }
1073
1074 delete d;
1075 break;
1050 } 1076 }
1051 } 1077 }
1052 1078
1053 send_reset (rsi); 1079 send_reset (rsi);
1054 break; 1080 break;
… …
1079 break; 1105 break;
1080 1106
1081 case vpn_packet::PT_CONNECT_INFO: 1107 case vpn_packet::PT_CONNECT_INFO:
1082 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1108 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1083 { 1109 {
1084 connect_info_packet *p = (connect_info_packet *) pkt; 1110 connect_info_packet *p = (connect_info_packet *)pkt;
1085 1111
1086 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1112 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1087 1113 {
1088 connection *c = vpn->conns[p->id - 1]; 1114 connection *c = vpn->conns[p->id - 1];
1089 1115
1090 c->conf->protocols = p->protocols; 1116 c->conf->protocols = p->protocols;
1091 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1117 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1092 p->si.upgrade_protocol (protocol, c->conf); 1118 p->si.upgrade_protocol (protocol, c->conf);
1093 1119
1094 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1120 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1095 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1121 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1096 1122
1097 const sockinfo &dsi = forward_si (p->si); 1123 const sockinfo &dsi = forward_si (p->si);
1098 1124
1099 if (dsi.valid ()) 1125 if (dsi.valid ())
1100 c->send_auth_request (dsi, true); 1126 c->send_auth_request (dsi, true);
1127 }
1101 } 1128 }
1102 1129
1103 break; 1130 break;
1104 1131
1105 default: 1132 default:
… …
1169 putenv ("STATE=down"); 1196 putenv ("STATE=down");
1170 1197
1171 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1198 return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1172} 1199}
1173 1200
1174connection::connection(struct vpn *vpn_) 1201connection::connection (struct vpn *vpn, conf_node *conf)
1175: vpn(vpn_) 1202: vpn(vpn), conf(conf)
1176, rekey (this, &connection::rekey_cb) 1203, rekey (this, &connection::rekey_cb)
1177, keepalive (this, &connection::keepalive_cb) 1204, keepalive (this, &connection::keepalive_cb)
1178, establish_connection (this, &connection::establish_connection_cb) 1205, establish_connection (this, &connection::establish_connection_cb)
1206#if ENABLE_DNS
1207, dns (0)
1208#endif
1179{ 1209{
1180 octx = ictx = 0; 1210 octx = ictx = 0;
1181 retry_cnt = 0; 1211 retry_cnt = 0;
1182 1212
1213 if (!conf->protocols) // make sure some protocol is enabled
1214 conf->protocols = PROT_UDPv4;
1215
1183 connectmode = conf_node::C_ALWAYS; // initial setting 1216 connectmode = conf_node::C_ALWAYS; // initial setting
1184 reset_connection (); 1217 reset_connection ();
1185} 1218}
1186 1219
1187connection::~connection () 1220connection::~connection ()

Diff Legend

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