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.46 by pcg, Sat Mar 5 19:13:15 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);
… …
335 int outl = 0, outl2; 337 int outl = 0, outl2;
336 ptype type = PT_DATA_UNCOMPRESSED; 338 ptype type = PT_DATA_UNCOMPRESSED;
337 339
338#if ENABLE_COMPRESSION 340#if ENABLE_COMPRESSION
339 u8 cdata[MAX_MTU]; 341 u8 cdata[MAX_MTU];
340 u32 cl;
341 342
343 if (conn->features & ENABLE_COMPRESSION)
344 {
342 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 345 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
346
343 if (cl) 347 if (cl)
344 { 348 {
345 type = PT_DATA_COMPRESSED; 349 type = PT_DATA_COMPRESSED;
346 d = cdata; 350 d = cdata;
347 l = cl + 2; 351 l = cl + 2;
348 352
349 d[0] = cl >> 8; 353 d[0] = cl >> 8;
350 d[1] = cl; 354 d[1] = cl;
355 }
351 } 356 }
352#endif 357#endif
353 358
354 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 359 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
355 360
… …
448{ 453{
449 // actually, hmaclen cannot be checked because the hmac 454 // actually, hmaclen cannot be checked because the hmac
450 // field comes before this data, so peers with other 455 // field comes before this data, so peers with other
451 // hmacs simply will not work. 456 // hmacs simply will not work.
452 u8 prot_major, prot_minor, randsize, hmaclen; 457 u8 prot_major, prot_minor, randsize, hmaclen;
453 u8 flags, challengelen, pad2, pad3; 458 u8 flags, challengelen, features, pad3;
454 u32 cipher_nid, digest_nid, hmac_nid; 459 u32 cipher_nid, digest_nid, hmac_nid;
455
456 const u8 curflags () const
457 {
458 return 0x80
459 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
460 }
461 460
462 void setup (ptype type, int dst); 461 void setup (ptype type, int dst);
463 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 }
464}; 475};
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 = curflags (); 483 flags = ENABLE_COMPRESSION ? 0x81 : 0x80;
473 challengelen = sizeof (rsachallenge); 484 challengelen = sizeof (rsachallenge);
485 features = get_features ();
474 486
475 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
476 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 488 digest_nid = htonl (EVP_MD_type (RSA_HASH));
477 hmac_nid = htonl (EVP_MD_type (DIGEST)); 489 hmac_nid = htonl (EVP_MD_type (DIGEST));
478 490
… …
486 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);
487 else if (randsize != RAND_SIZE) 499 else if (randsize != RAND_SIZE)
488 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);
489 else if (hmaclen != HMACLENGTH) 501 else if (hmaclen != HMACLENGTH)
490 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);
503#if 0 // this implementation should handle all flag settings
491 else if (flags != curflags ()) 504 else if (flags != curflags ())
492 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ()); 505 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
506#endif
493 else if (challengelen != sizeof (rsachallenge)) 507 else if (challengelen != sizeof (rsachallenge))
494 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 508 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
495 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 509 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)); 510 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))) 511 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
577{ 591{
578 if (ictx && octx) 592 if (ictx && octx)
579 { 593 {
580 connectmode = conf->connectmode; 594 connectmode = conf->connectmode;
581 595
596 // make sure rekeying timeouts are slightly asymmetric
582 rekey.start (NOW + ::conf.rekey); 597 rekey.start (NOW + ::conf.rekey
598 + (conf->id > THISNODE->id ? 10 : 0));
583 keepalive.start (NOW + ::conf.keepalive); 599 keepalive.start (NOW + ::conf.keepalive);
584 600
585 // send queued packets 601 // send queued packets
586 if (ictx && octx) 602 if (ictx && octx)
587 { 603 {
… …
613 protocol = best_protocol (THISNODE->protocols & conf->protocols); 629 protocol = best_protocol (THISNODE->protocols & conf->protocols);
614 630
615 // mask out protocols we cannot establish 631 // mask out protocols we cannot establish
616 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 632 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
617 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 633 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
634 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
618 635
619 si.set (conf, protocol); 636 si.set (conf, protocol);
620} 637}
621 638
622// ensure sockinfo is valid, forward if necessary 639// ensure sockinfo is valid, forward if necessary
… …
627 { 644 {
628 connection *r = vpn->find_router (); 645 connection *r = vpn->find_router ();
629 646
630 if (r) 647 if (r)
631 { 648 {
632 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 649 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
633 conf->nodename, r->conf->nodename); 650 conf->nodename, r->conf->nodename, (const char *)r->si);
634 return r->si; 651 return r->si;
635 } 652 }
636 else 653 else
637 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 654 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
638 conf->nodename); 655 conf->nodename);
… …
730 && connectmode != conf_node::C_DISABLED 747 && connectmode != conf_node::C_DISABLED
731 && NOW > w.at) 748 && NOW > w.at)
732 { 749 {
733 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 750 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
734 751
735 if (retry_int < 3600 * 8) 752 if (retry_int < conf->max_retry)
736 retry_cnt++; 753 retry_cnt++;
754 else
755 retry_int = conf->max_retry;
737 756
738 w.start (NOW + retry_int); 757 w.start (NOW + retry_int);
739 758
740 reset_si (); 759 reset_si ();
741 760
… …
768 run_script (run_script_cb (this, &connection::script_node_down), false); 787 run_script (run_script_cb (this, &connection::script_node_down), false);
769 } 788 }
770 789
771 delete ictx; ictx = 0; 790 delete ictx; ictx = 0;
772 delete octx; octx = 0; 791 delete octx; octx = 0;
792#if ENABLE_DNS
793 dnsv4_reset_connection ();
794#endif
773 795
774 si.host= 0; 796 si.host = 0;
775 797
776 last_activity = 0; 798 last_activity = 0;
777 retry_cnt = 0; 799 retry_cnt = 0;
778 800
779 rekey.stop (); 801 rekey.stop ();
… …
916 delete octx; 938 delete octx;
917 939
918 octx = new crypto_ctx (k, 1); 940 octx = new crypto_ctx (k, 1);
919 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 941 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
920 942
943 // compatibility code, remove when no longer required
944 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
945
921 conf->protocols = p->protocols; 946 conf->protocols = p->protocols;
947 features = p->features & config_packet::get_features ();
922 948
923 send_auth_response (rsi, p->id, k); 949 send_auth_response (rsi, p->id, k);
924 950
925 connection_established (); 951 connection_established ();
926 952
… …
1040 si = rsi; 1066 si = rsi;
1041 1067
1042 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1068 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1043 conf->nodename, (const char *)si, (const char *)rsi); 1069 conf->nodename, (const char *)si, (const char *)rsi);
1044 } 1070 }
1045
1046 delete d;
1047
1048 break;
1049 } 1071 }
1072
1073 delete d;
1074 break;
1050 } 1075 }
1051 } 1076 }
1052 1077
1053 send_reset (rsi); 1078 send_reset (rsi);
1054 break; 1079 break;
… …
1079 break; 1104 break;
1080 1105
1081 case vpn_packet::PT_CONNECT_INFO: 1106 case vpn_packet::PT_CONNECT_INFO:
1082 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1107 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1083 { 1108 {
1084 connect_info_packet *p = (connect_info_packet *) pkt; 1109 connect_info_packet *p = (connect_info_packet *)pkt;
1085 1110
1086 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1111 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1087 1112 {
1088 connection *c = vpn->conns[p->id - 1]; 1113 connection *c = vpn->conns[p->id - 1];
1089 1114
1090 c->conf->protocols = p->protocols; 1115 c->conf->protocols = p->protocols;
1091 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1116 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1092 p->si.upgrade_protocol (protocol, c->conf); 1117 p->si.upgrade_protocol (protocol, c->conf);
1093 1118
1094 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1119 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1095 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1120 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1096 1121
1097 const sockinfo &dsi = forward_si (p->si); 1122 const sockinfo &dsi = forward_si (p->si);
1098 1123
1099 if (dsi.valid ()) 1124 if (dsi.valid ())
1100 c->send_auth_request (dsi, true); 1125 c->send_auth_request (dsi, true);
1126 }
1101 } 1127 }
1102 1128
1103 break; 1129 break;
1104 1130
1105 default: 1131 default:
… …
1169 putenv ("STATE=down"); 1195 putenv ("STATE=down");
1170 1196
1171 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1197 return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1172} 1198}
1173 1199
1174connection::connection(struct vpn *vpn_) 1200connection::connection (struct vpn *vpn, conf_node *conf)
1175: vpn(vpn_) 1201: vpn(vpn), conf(conf)
1176, rekey (this, &connection::rekey_cb) 1202, rekey (this, &connection::rekey_cb)
1177, keepalive (this, &connection::keepalive_cb) 1203, keepalive (this, &connection::keepalive_cb)
1178, establish_connection (this, &connection::establish_connection_cb) 1204, establish_connection (this, &connection::establish_connection_cb)
1205#if ENABLE_DNS
1206, dns (0)
1207#endif
1179{ 1208{
1180 octx = ictx = 0; 1209 octx = ictx = 0;
1181 retry_cnt = 0; 1210 retry_cnt = 0;
1182 1211
1212 if (!conf->protocols) // make sure some protocol is enabled
1213 conf->protocols = PROT_UDPv4;
1214
1183 connectmode = conf_node::C_ALWAYS; // initial setting 1215 connectmode = conf_node::C_ALWAYS; // initial setting
1184 reset_connection (); 1216 reset_connection ();
1185} 1217}
1186 1218
1187connection::~connection () 1219connection::~connection ()

Diff Legend

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