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.35 by pcg, Mon May 10 21:24:48 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);
… …
456 u8 flags, challengelen, features, pad3; 456 u8 flags, challengelen, features, pad3;
457 u32 cipher_nid, digest_nid, hmac_nid; 457 u32 cipher_nid, digest_nid, hmac_nid;
458 458
459 void setup (ptype type, int dst); 459 void setup (ptype type, int dst);
460 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 }
461}; 473};
462
463#define FEATURES ((ENABLE_COMPRESSION ? FEATURE_COMPRESSION : 0) \
464 | (ENABLE_ROHC ? FEATURE_ROHC : 0))
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 = ENABLE_COMPRESSION ? 0x81 : 0x80; 481 flags = ENABLE_COMPRESSION ? 0x81 : 0x80;
473 challengelen = sizeof (rsachallenge); 482 challengelen = sizeof (rsachallenge);
474 features = FEATURES; 483 features = get_features ();
475 484
476 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
477 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 486 digest_nid = htonl (EVP_MD_type (RSA_HASH));
478 hmac_nid = htonl (EVP_MD_type (DIGEST)); 487 hmac_nid = htonl (EVP_MD_type (DIGEST));
479 488
… …
923 932
924 // compatibility code, remove when no longer required 933 // compatibility code, remove when no longer required
925 if (p->flags & 1) p->features |= FEATURE_COMPRESSION; 934 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
926 935
927 conf->protocols = p->protocols; 936 conf->protocols = p->protocols;
928 features = p->features & FEATURES; 937 features = p->features & config_packet::get_features ();
929 938
930 send_auth_response (rsi, p->id, k); 939 send_auth_response (rsi, p->id, k);
931 940
932 connection_established (); 941 connection_established ();
933 942
… …
1047 si = rsi; 1056 si = rsi;
1048 1057
1049 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1058 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1050 conf->nodename, (const char *)si, (const char *)rsi); 1059 conf->nodename, (const char *)si, (const char *)rsi);
1051 } 1060 }
1052
1053 delete d;
1054
1055 break;
1056 } 1061 }
1062
1063 delete d;
1064 break;
1057 } 1065 }
1058 } 1066 }
1059 1067
1060 send_reset (rsi); 1068 send_reset (rsi);
1061 break; 1069 break;

Diff Legend

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