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.29 by pcg, Thu Jan 29 18:55:10 2004 UTC vs.
Revision 1.37 by pcg, Fri Jun 11 15:56:34 2004 UTC

… …
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18*/ 18*/
19 19
20#include "config.h" 20#include "config.h"
21 21
22extern "C" {
23# include "lzf/lzf.h"
24}
25
26#include <cassert> 22#include <cassert>
27 23
28#include <list> 24#include <list>
29 25
30#include <openssl/rand.h> 26#include <openssl/rand.h>
… …
45#if !HAVE_RAND_PSEUDO_BYTES 41#if !HAVE_RAND_PSEUDO_BYTES
46# define RAND_pseudo_bytes RAND_bytes 42# define RAND_pseudo_bytes RAND_bytes
47#endif 43#endif
48 44
49#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 45#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
46
47#define ULTRA_FAST 1
48#define HLOG 15
49#include "lzf/lzf.h"
50#include "lzf/lzf_c.c"
51#include "lzf/lzf_d.c"
50 52
51struct crypto_ctx 53struct crypto_ctx
52{ 54{
53 EVP_CIPHER_CTX cctx; 55 EVP_CIPHER_CTX cctx;
54 HMAC_CTX hctx; 56 HMAC_CTX hctx;
… …
200// 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.
201// this implementation ("splay list" ;) is inefficient, 203// this implementation ("splay list" ;) is inefficient,
202// but low on resources. 204// but low on resources.
203struct net_rate_limiter : list<net_rateinfo> 205struct net_rate_limiter : list<net_rateinfo>
204{ 206{
205 static const double ALPHA = 1. - 1. / 600.; // allow bursts 207# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
206 static const double CUTOFF = 10.; // one event every CUTOFF seconds 208# define NRL_CUTOFF 10. // one event every CUTOFF seconds
207 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 209# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
208 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
209 211
210 bool can (const sockinfo &si) { return can((u32)si.host); } 212 bool can (const sockinfo &si) { return can((u32)si.host); }
211 bool can (u32 host); 213 bool can (u32 host);
212}; 214};
213 215
… …
218 iterator i; 220 iterator i;
219 221
220 for (i = begin (); i != end (); ) 222 for (i = begin (); i != end (); )
221 if (i->host == host) 223 if (i->host == host)
222 break; 224 break;
223 else if (i->last < NOW - EXPIRE) 225 else if (i->last < NOW - NRL_EXPIRE)
224 i = erase (i); 226 i = erase (i);
225 else 227 else
226 i++; 228 i++;
227 229
228 if (i == end ()) 230 if (i == end ())
229 { 231 {
230 net_rateinfo ri; 232 net_rateinfo ri;
231 233
232 ri.host = host; 234 ri.host = host;
233 ri.pcnt = 1.; 235 ri.pcnt = 1.;
234 ri.diff = MAXDIF; 236 ri.diff = NRL_MAXDIF;
235 ri.last = NOW; 237 ri.last = NOW;
236 238
237 push_front (ri); 239 push_front (ri);
238 240
239 return true; 241 return true;
… …
241 else 243 else
242 { 244 {
243 net_rateinfo ri (*i); 245 net_rateinfo ri (*i);
244 erase (i); 246 erase (i);
245 247
246 ri.pcnt = ri.pcnt * ALPHA; 248 ri.pcnt = ri.pcnt * NRL_ALPHA;
247 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 249 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
248 250
249 ri.last = NOW; 251 ri.last = NOW;
250 252
251 double dif = ri.diff / ri.pcnt; 253 double dif = ri.diff / ri.pcnt;
252 254
253 bool send = dif > CUTOFF; 255 bool send = dif > NRL_CUTOFF;
254 256
255 if (dif > MAXDIF) 257 if (dif > NRL_MAXDIF)
256 { 258 {
257 ri.pcnt = 1.; 259 ri.pcnt = 1.;
258 ri.diff = MAXDIF; 260 ri.diff = NRL_MAXDIF;
259 } 261 }
260 else if (send) 262 else if (send)
261 ri.pcnt++; 263 ri.pcnt++;
262 264
263 push_front (ri); 265 push_front (ri);
… …
333 int outl = 0, outl2; 335 int outl = 0, outl2;
334 ptype type = PT_DATA_UNCOMPRESSED; 336 ptype type = PT_DATA_UNCOMPRESSED;
335 337
336#if ENABLE_COMPRESSION 338#if ENABLE_COMPRESSION
337 u8 cdata[MAX_MTU]; 339 u8 cdata[MAX_MTU];
338 u32 cl;
339 340
341 if (conn->features & ENABLE_COMPRESSION)
342 {
340 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344
341 if (cl) 345 if (cl)
342 { 346 {
343 type = PT_DATA_COMPRESSED; 347 type = PT_DATA_COMPRESSED;
344 d = cdata; 348 d = cdata;
345 l = cl + 2; 349 l = cl + 2;
346 350
347 d[0] = cl >> 8; 351 d[0] = cl >> 8;
348 d[1] = cl; 352 d[1] = cl;
353 }
349 } 354 }
350#endif 355#endif
351 356
352 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 357 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
353 358
… …
446{ 451{
447 // actually, hmaclen cannot be checked because the hmac 452 // actually, hmaclen cannot be checked because the hmac
448 // field comes before this data, so peers with other 453 // field comes before this data, so peers with other
449 // hmacs simply will not work. 454 // hmacs simply will not work.
450 u8 prot_major, prot_minor, randsize, hmaclen; 455 u8 prot_major, prot_minor, randsize, hmaclen;
451 u8 flags, challengelen, pad2, pad3; 456 u8 flags, challengelen, features, pad3;
452 u32 cipher_nid, digest_nid, hmac_nid; 457 u32 cipher_nid, digest_nid, hmac_nid;
453
454 const u8 curflags () const
455 {
456 return 0x80
457 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
458 }
459 458
460 void setup (ptype type, int dst); 459 void setup (ptype type, int dst);
461 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 }
462}; 473};
463 474
464void config_packet::setup (ptype type, int dst) 475void config_packet::setup (ptype type, int dst)
465{ 476{
466 prot_major = PROTOCOL_MAJOR; 477 prot_major = PROTOCOL_MAJOR;
467 prot_minor = PROTOCOL_MINOR; 478 prot_minor = PROTOCOL_MINOR;
468 randsize = RAND_SIZE; 479 randsize = RAND_SIZE;
469 hmaclen = HMACLENGTH; 480 hmaclen = HMACLENGTH;
470 flags = curflags (); 481 flags = ENABLE_COMPRESSION ? 0x81 : 0x80;
471 challengelen = sizeof (rsachallenge); 482 challengelen = sizeof (rsachallenge);
483 features = get_features ();
472 484
473 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
474 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 486 digest_nid = htonl (EVP_MD_type (RSA_HASH));
475 hmac_nid = htonl (EVP_MD_type (DIGEST)); 487 hmac_nid = htonl (EVP_MD_type (DIGEST));
476 488
… …
484 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);
485 else if (randsize != RAND_SIZE) 497 else if (randsize != RAND_SIZE)
486 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);
487 else if (hmaclen != HMACLENGTH) 499 else if (hmaclen != HMACLENGTH)
488 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
489 else if (flags != curflags ()) 502 else if (flags != curflags ())
490 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
491 else if (challengelen != sizeof (rsachallenge)) 505 else if (challengelen != sizeof (rsachallenge))
492 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));
493 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
494 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));
495 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
575{ 589{
576 if (ictx && octx) 590 if (ictx && octx)
577 { 591 {
578 connectmode = conf->connectmode; 592 connectmode = conf->connectmode;
579 593
594 // make sure rekeying timeouts are slightly asymmetric
580 rekey.start (NOW + ::conf.rekey); 595 rekey.start (NOW + ::conf.rekey
596 + (conf->id > THISNODE->id ? 10 : 0));
581 keepalive.start (NOW + ::conf.keepalive); 597 keepalive.start (NOW + ::conf.keepalive);
582 598
583 // send queued packets 599 // send queued packets
584 if (ictx && octx) 600 if (ictx && octx)
585 { 601 {
… …
728 && connectmode != conf_node::C_DISABLED 744 && connectmode != conf_node::C_DISABLED
729 && NOW > w.at) 745 && NOW > w.at)
730 { 746 {
731 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;
732 748
733 if (retry_int < 3600 * 8) 749 if (retry_int < conf->max_retry)
734 retry_cnt++; 750 retry_cnt++;
751 else
752 retry_int = conf->max_retry;
735 753
736 w.start (NOW + retry_int); 754 w.start (NOW + retry_int);
737 755
738 reset_si (); 756 reset_si ();
739 757
… …
914 delete octx; 932 delete octx;
915 933
916 octx = new crypto_ctx (k, 1); 934 octx = new crypto_ctx (k, 1);
917 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 935 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
918 936
937 // compatibility code, remove when no longer required
938 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
939
919 conf->protocols = p->protocols; 940 conf->protocols = p->protocols;
941 features = p->features & config_packet::get_features ();
920 942
921 send_auth_response (rsi, p->id, k); 943 send_auth_response (rsi, p->id, k);
922 944
923 connection_established (); 945 connection_established ();
924 946
… …
1038 si = rsi; 1060 si = rsi;
1039 1061
1040 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1062 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1041 conf->nodename, (const char *)si, (const char *)rsi); 1063 conf->nodename, (const char *)si, (const char *)rsi);
1042 } 1064 }
1043
1044 delete d;
1045
1046 break;
1047 } 1065 }
1066
1067 delete d;
1068 break;
1048 } 1069 }
1049 } 1070 }
1050 1071
1051 send_reset (rsi); 1072 send_reset (rsi);
1052 break; 1073 break;

Diff Legend

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