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.39 by pcg, Tue Oct 12 12:06:06 2004 UTC

… …
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 = ENABLE_COMPRESSION ? 0x81 : 0x80;
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);
501#if 0 // this implementation should handle all flag settings
491 else if (flags != curflags ()) 502 else if (flags != curflags ())
492 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ()); 503 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
504#endif
493 else if (challengelen != sizeof (rsachallenge)) 505 else if (challengelen != sizeof (rsachallenge))
494 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 506 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
495 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 507 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)); 508 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))) 509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
577{ 589{
578 if (ictx && octx) 590 if (ictx && octx)
579 { 591 {
580 connectmode = conf->connectmode; 592 connectmode = conf->connectmode;
581 593
594 // make sure rekeying timeouts are slightly asymmetric
582 rekey.start (NOW + ::conf.rekey); 595 rekey.start (NOW + ::conf.rekey
596 + (conf->id > THISNODE->id ? 10 : 0));
583 keepalive.start (NOW + ::conf.keepalive); 597 keepalive.start (NOW + ::conf.keepalive);
584 598
585 // send queued packets 599 // send queued packets
586 if (ictx && octx) 600 if (ictx && octx)
587 { 601 {
… …
730 && connectmode != conf_node::C_DISABLED 744 && connectmode != conf_node::C_DISABLED
731 && NOW > w.at) 745 && NOW > w.at)
732 { 746 {
733 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 747 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
734 748
735 if (retry_int < 3600 * 8) 749 if (retry_int < conf->max_retry)
736 retry_cnt++; 750 retry_cnt++;
751 else
752 retry_int = conf->max_retry;
737 753
738 w.start (NOW + retry_int); 754 w.start (NOW + retry_int);
739 755
740 reset_si (); 756 reset_si ();
741 757
… …
769 } 785 }
770 786
771 delete ictx; ictx = 0; 787 delete ictx; ictx = 0;
772 delete octx; octx = 0; 788 delete octx; octx = 0;
773 789
774 si.host= 0; 790 si.host = 0;
775 791
776 last_activity = 0; 792 last_activity = 0;
777 retry_cnt = 0; 793 retry_cnt = 0;
778 794
779 rekey.stop (); 795 rekey.stop ();
… …
916 delete octx; 932 delete octx;
917 933
918 octx = new crypto_ctx (k, 1); 934 octx = new crypto_ctx (k, 1);
919 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 935 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
920 936
937 // compatibility code, remove when no longer required
938 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
939
921 conf->protocols = p->protocols; 940 conf->protocols = p->protocols;
941 features = p->features & config_packet::get_features ();
922 942
923 send_auth_response (rsi, p->id, k); 943 send_auth_response (rsi, p->id, k);
924 944
925 connection_established (); 945 connection_established ();
926 946
… …
1040 si = rsi; 1060 si = rsi;
1041 1061
1042 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1062 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1043 conf->nodename, (const char *)si, (const char *)rsi); 1063 conf->nodename, (const char *)si, (const char *)rsi);
1044 } 1064 }
1045
1046 delete d;
1047
1048 break;
1049 } 1065 }
1066
1067 delete d;
1068 break;
1050 } 1069 }
1051 } 1070 }
1052 1071
1053 send_reset (rsi); 1072 send_reset (rsi);
1054 break; 1073 break;
… …
1079 break; 1098 break;
1080 1099
1081 case vpn_packet::PT_CONNECT_INFO: 1100 case vpn_packet::PT_CONNECT_INFO:
1082 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1101 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1083 { 1102 {
1084 connect_info_packet *p = (connect_info_packet *) pkt; 1103 connect_info_packet *p = (connect_info_packet *)pkt;
1085 1104
1086 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1105 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1087 1106 {
1088 connection *c = vpn->conns[p->id - 1]; 1107 connection *c = vpn->conns[p->id - 1];
1089 1108
1090 c->conf->protocols = p->protocols; 1109 c->conf->protocols = p->protocols;
1091 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1110 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1092 p->si.upgrade_protocol (protocol, c->conf); 1111 p->si.upgrade_protocol (protocol, c->conf);
1093 1112
1094 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1113 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1095 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1114 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1096 1115
1097 const sockinfo &dsi = forward_si (p->si); 1116 const sockinfo &dsi = forward_si (p->si);
1098 1117
1099 if (dsi.valid ()) 1118 if (dsi.valid ())
1100 c->send_auth_request (dsi, true); 1119 c->send_auth_request (dsi, true);
1120 }
1101 } 1121 }
1102 1122
1103 break; 1123 break;
1104 1124
1105 default: 1125 default:

Diff Legend

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