[ViewVC] Diff of: cvs/gvpe/src/connection.C

Comparing gvpe/src/connection.C (file contents):
Revision 1.34 by pcg, Mon May 10 18:57:07 2004 UTC vs.
Revision 1.36 by pcg, Sun May 30 17:36:00 2004 UTC

 // only do action once every x seconds per host whole allowing bursts.
 // this implementation ("splay list" ;) is inefficient,
 // but low on resources.
 struct net_rate_limiter : list<net_rateinfo>
 {
-# define NRL_ALPHA  1. - 1. / 600.     // allow bursts
+# define NRL_ALPHA  (1. - 1. / 600.)     // allow bursts
-# define NRL_CUTOFF 10.                // one event every CUTOFF seconds
+# define NRL_CUTOFF 10.                  // one event every CUTOFF seconds
-# define NRL_EXPIRE NRL_CUTOFF * 30.   // expire entries after this time
+# define NRL_EXPIRE (NRL_CUTOFF * 30.)   // expire entries after this time
-# define NRL_MAXDIF NRL_CUTOFF * (1. / (1. - NRL_ALPHA)) // maximum diff /count value
+# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
   bool can (const sockinfo &si) { return can((u32)si.host); }
   bool can (u32 host);
 };
 {
   if (ictx && octx)
     {
       connectmode = conf->connectmode;
+      // make sure rekeying timeouts are slightly asymmetric
-      rekey.start (NOW + ::conf.rekey);
+      rekey.start (NOW + ::conf.rekey
+                   + (conf->id > THISNODE->id ? 10 : 0));
       keepalive.start (NOW + ::conf.keepalive);
       // send queued packets
       if (ictx && octx)
         {

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