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.31 by pcg, Sun Feb 8 07:24:25 2004 UTC vs.
Revision 1.49 by pcg, Sat Mar 12 18:10:40 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
… …
202// only do action once every x seconds per host whole allowing bursts. 204// only do action once every x seconds per host whole allowing bursts.
203// this implementation ("splay list" ;) is inefficient, 205// this implementation ("splay list" ;) is inefficient,
204// but low on resources. 206// but low on resources.
205struct net_rate_limiter : list<net_rateinfo> 207struct net_rate_limiter : list<net_rateinfo>
206{ 208{
207 static const double ALPHA = 1. - 1. / 600.; // allow bursts 209# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
208 static const double CUTOFF = 10.; // one event every CUTOFF seconds 210# define NRL_CUTOFF 10. // one event every CUTOFF seconds
209 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 211# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
210 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 212# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
211 213
212 bool can (const sockinfo &si) { return can((u32)si.host); } 214 bool can (const sockinfo &si) { return can((u32)si.host); }
213 bool can (u32 host); 215 bool can (u32 host);
214}; 216};
215 217
… …
220 iterator i; 222 iterator i;
221 223
222 for (i = begin (); i != end (); ) 224 for (i = begin (); i != end (); )
223 if (i->host == host) 225 if (i->host == host)
224 break; 226 break;
225 else if (i->last < NOW - EXPIRE) 227 else if (i->last < NOW - NRL_EXPIRE)
226 i = erase (i); 228 i = erase (i);
227 else 229 else
228 i++; 230 i++;
229 231
230 if (i == end ()) 232 if (i == end ())
231 { 233 {
232 net_rateinfo ri; 234 net_rateinfo ri;
233 235
234 ri.host = host; 236 ri.host = host;
235 ri.pcnt = 1.; 237 ri.pcnt = 1.;
236 ri.diff = MAXDIF; 238 ri.diff = NRL_MAXDIF;
237 ri.last = NOW; 239 ri.last = NOW;
238 240
239 push_front (ri); 241 push_front (ri);
240 242
241 return true; 243 return true;
… …
243 else 245 else
244 { 246 {
245 net_rateinfo ri (*i); 247 net_rateinfo ri (*i);
246 erase (i); 248 erase (i);
247 249
248 ri.pcnt = ri.pcnt * ALPHA; 250 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 251 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
250 252
251 ri.last = NOW; 253 ri.last = NOW;
252 254
253 double dif = ri.diff / ri.pcnt; 255 double dif = ri.diff / ri.pcnt;
254 256
255 bool send = dif > CUTOFF; 257 bool send = dif > NRL_CUTOFF;
256 258
257 if (dif > MAXDIF) 259 if (dif > NRL_MAXDIF)
258 { 260 {
259 ri.pcnt = 1.; 261 ri.pcnt = 1.;
260 ri.diff = MAXDIF; 262 ri.diff = NRL_MAXDIF;
261 } 263 }
262 else if (send) 264 else if (send)
263 ri.pcnt++; 265 ri.pcnt++;
264 266
265 push_front (ri); 267 push_front (ri);
… …
456 u8 flags, challengelen, features, pad3; 458 u8 flags, challengelen, features, pad3;
457 u32 cipher_nid, digest_nid, hmac_nid; 459 u32 cipher_nid, digest_nid, hmac_nid;
458 460
459 void setup (ptype type, int dst); 461 void setup (ptype type, int dst);
460 bool chk_config () const; 462 bool chk_config () const;
463
464 static u8 get_features ()
465 {
466 u8 f = 0;
467#if ENABLE_COMPRESSION
468 f |= FEATURE_COMPRESSION;
469#endif
470#if ENABLE_ROHC
471 f |= FEATURE_ROHC;
472#endif
473 return f;
474 }
461}; 475};
462
463#define FEATURES ((ENABLE_COMPRESSION ? FEATURE_COMPRESSION : 0) \
464 | (ENABLE_ROHC ? FEATURE_ROHC : 0))
465 476
466void config_packet::setup (ptype type, int dst) 477void config_packet::setup (ptype type, int dst)
467{ 478{
468 prot_major = PROTOCOL_MAJOR; 479 prot_major = PROTOCOL_MAJOR;
469 prot_minor = PROTOCOL_MINOR; 480 prot_minor = PROTOCOL_MINOR;
470 randsize = RAND_SIZE; 481 randsize = RAND_SIZE;
471 hmaclen = HMACLENGTH; 482 hmaclen = HMACLENGTH;
472 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 483 flags = 0;
473 challengelen = sizeof (rsachallenge); 484 challengelen = sizeof (rsachallenge);
474 features = FEATURES; 485 features = get_features ();
475 486
476 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
477 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 488 digest_nid = htonl (EVP_MD_type (RSA_HASH));
478 hmac_nid = htonl (EVP_MD_type (DIGEST)); 489 hmac_nid = htonl (EVP_MD_type (DIGEST));
479 490
… …
487 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 498 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
488 else if (randsize != RAND_SIZE) 499 else if (randsize != RAND_SIZE)
489 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 500 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
490 else if (hmaclen != HMACLENGTH) 501 else if (hmaclen != HMACLENGTH)
491 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 502 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
492#if 0 // this implementation should handle all flag settings
493 else if (flags != curflags ())
494 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
495#endif
496 else if (challengelen != sizeof (rsachallenge)) 503 else if (challengelen != sizeof (rsachallenge))
497 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 504 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
498 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 505 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
499 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 506 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
500 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 507 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
580{ 587{
581 if (ictx && octx) 588 if (ictx && octx)
582 { 589 {
583 connectmode = conf->connectmode; 590 connectmode = conf->connectmode;
584 591
592 // make sure rekeying timeouts are slightly asymmetric
585 rekey.start (NOW + ::conf.rekey); 593 rekey.start (NOW + ::conf.rekey
594 + (conf->id > THISNODE->id ? 10 : 0));
586 keepalive.start (NOW + ::conf.keepalive); 595 keepalive.start (NOW + ::conf.keepalive);
587 596
588 // send queued packets 597 // send queued packets
589 if (ictx && octx) 598 if (ictx && octx)
590 { 599 {
… …
616 protocol = best_protocol (THISNODE->protocols & conf->protocols); 625 protocol = best_protocol (THISNODE->protocols & conf->protocols);
617 626
618 // mask out protocols we cannot establish 627 // mask out protocols we cannot establish
619 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 628 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
620 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 629 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
630 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
621 631
622 si.set (conf, protocol); 632 si.set (conf, protocol);
623} 633}
624 634
625// ensure sockinfo is valid, forward if necessary 635// ensure sockinfo is valid, forward if necessary
… …
630 { 640 {
631 connection *r = vpn->find_router (); 641 connection *r = vpn->find_router ();
632 642
633 if (r) 643 if (r)
634 { 644 {
635 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 645 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
636 conf->nodename, r->conf->nodename); 646 conf->nodename, r->conf->nodename, (const char *)r->si);
637 return r->si; 647 return r->si;
638 } 648 }
639 else 649 else
640 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 650 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
641 conf->nodename); 651 conf->nodename);
… …
731 && conf != THISNODE 741 && conf != THISNODE
732 && connectmode != conf_node::C_NEVER 742 && connectmode != conf_node::C_NEVER
733 && connectmode != conf_node::C_DISABLED 743 && connectmode != conf_node::C_DISABLED
734 && NOW > w.at) 744 && NOW > w.at)
735 { 745 {
736 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 746 w.at = TSTAMP_MAX; // first disable this watcher in case of recursion
737 747
738 if (retry_int < 3600 * 8) 748 double retry_int = double (retry_cnt & 3
739 retry_cnt++; 749 ? (retry_cnt & 3) + 1
740 750 : 1 << (retry_cnt >> 2));
741 w.start (NOW + retry_int);
742 751
743 reset_si (); 752 reset_si ();
753
754 bool slow = si.prot & PROT_SLOW;
744 755
745 if (si.prot && !si.host) 756 if (si.prot && !si.host)
746 vpn->send_connect_request (conf->id); 757 vpn->send_connect_request (conf->id);
747 else 758 else
748 { 759 {
749 const sockinfo &dsi = forward_si (si); 760 const sockinfo &dsi = forward_si (si);
761
762 slow = slow || (dsi.prot & PROT_SLOW);
750 763
751 if (dsi.valid () && auth_rate_limiter.can (dsi)) 764 if (dsi.valid () && auth_rate_limiter.can (dsi))
752 { 765 {
753 if (retry_cnt < 4) 766 if (retry_cnt < 4)
754 send_auth_request (dsi, true); 767 send_auth_request (dsi, true);
755 else 768 else
756 send_ping (dsi, 0); 769 send_ping (dsi, 0);
757 } 770 }
758 } 771 }
772
773 retry_int *= slow ? 8. : 0.7;
774
775 if (retry_int < conf->max_retry)
776 retry_cnt++;
777 else
778 retry_int = conf->max_retry;
779
780 w.start (NOW + retry_int);
759 } 781 }
760} 782}
761 783
762void 784void
763connection::reset_connection () 785connection::reset_connection ()
… …
771 run_script (run_script_cb (this, &connection::script_node_down), false); 793 run_script (run_script_cb (this, &connection::script_node_down), false);
772 } 794 }
773 795
774 delete ictx; ictx = 0; 796 delete ictx; ictx = 0;
775 delete octx; octx = 0; 797 delete octx; octx = 0;
798#if ENABLE_DNS
799 dnsv4_reset_connection ();
800#endif
776 801
777 si.host= 0; 802 si.host = 0;
778 803
779 last_activity = 0; 804 last_activity = 0;
780 retry_cnt = 0; 805 retry_cnt = 0;
781 806
782 rekey.stop (); 807 rekey.stop ();
… …
919 delete octx; 944 delete octx;
920 945
921 octx = new crypto_ctx (k, 1); 946 octx = new crypto_ctx (k, 1);
922 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 947 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
923 948
924 // compatibility code, remove when no longer required
925 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
926
927 conf->protocols = p->protocols; 949 conf->protocols = p->protocols;
928 features = p->features & FEATURES; 950 features = p->features & config_packet::get_features ();
929 951
930 send_auth_response (rsi, p->id, k); 952 send_auth_response (rsi, p->id, k);
931 953
932 connection_established (); 954 connection_established ();
933 955
… …
1047 si = rsi; 1069 si = rsi;
1048 1070
1049 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1071 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1050 conf->nodename, (const char *)si, (const char *)rsi); 1072 conf->nodename, (const char *)si, (const char *)rsi);
1051 } 1073 }
1052
1053 delete d;
1054
1055 break;
1056 } 1074 }
1075
1076 delete d;
1077 break;
1057 } 1078 }
1058 } 1079 }
1059 1080
1060 send_reset (rsi); 1081 send_reset (rsi);
1061 break; 1082 break;
… …
1086 break; 1107 break;
1087 1108
1088 case vpn_packet::PT_CONNECT_INFO: 1109 case vpn_packet::PT_CONNECT_INFO:
1089 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1110 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1090 { 1111 {
1091 connect_info_packet *p = (connect_info_packet *) pkt; 1112 connect_info_packet *p = (connect_info_packet *)pkt;
1092 1113
1093 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
1094 1115 {
1095 connection *c = vpn->conns[p->id - 1]; 1116 connection *c = vpn->conns[p->id - 1];
1096 1117
1097 c->conf->protocols = p->protocols; 1118 c->conf->protocols = p->protocols;
1098 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));
1099 p->si.upgrade_protocol (protocol, c->conf); 1120 p->si.upgrade_protocol (protocol, c->conf);
1100 1121
1101 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1122 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1102 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);
1103 1124
1104 const sockinfo &dsi = forward_si (p->si); 1125 const sockinfo &dsi = forward_si (p->si);
1105 1126
1106 if (dsi.valid ()) 1127 if (dsi.valid ())
1107 c->send_auth_request (dsi, true); 1128 c->send_auth_request (dsi, true);
1129 }
1108 } 1130 }
1109 1131
1110 break; 1132 break;
1111 1133
1112 default: 1134 default:
… …
1176 putenv ("STATE=down"); 1198 putenv ("STATE=down");
1177 1199
1178 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1200 return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1179} 1201}
1180 1202
1181connection::connection(struct vpn *vpn_) 1203connection::connection (struct vpn *vpn, conf_node *conf)
1182: vpn(vpn_) 1204: vpn(vpn), conf(conf)
1183, rekey (this, &connection::rekey_cb) 1205, rekey (this, &connection::rekey_cb)
1184, keepalive (this, &connection::keepalive_cb) 1206, keepalive (this, &connection::keepalive_cb)
1185, establish_connection (this, &connection::establish_connection_cb) 1207, establish_connection (this, &connection::establish_connection_cb)
1208#if ENABLE_DNS
1209, dns (0)
1210#endif
1186{ 1211{
1187 octx = ictx = 0; 1212 octx = ictx = 0;
1188 retry_cnt = 0; 1213 retry_cnt = 0;
1189 1214
1215 if (!conf->protocols) // make sure some protocol is enabled
1216 conf->protocols = PROT_UDPv4;
1217
1190 connectmode = conf_node::C_ALWAYS; // initial setting 1218 connectmode = conf_node::C_ALWAYS; // initial setting
1191 reset_connection (); 1219 reset_connection ();
1192} 1220}
1193 1221
1194connection::~connection () 1222connection::~connection ()

Diff Legend

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