| … | |
… | |
| 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. |
| 205 | struct net_rate_limiter : list<net_rateinfo> |
205 | struct 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); |
| … | |
… | |
| 589 | { |
589 | { |
| 590 | if (ictx && octx) |
590 | if (ictx && octx) |
| 591 | { |
591 | { |
| 592 | connectmode = conf->connectmode; |
592 | connectmode = conf->connectmode; |
| 593 | |
593 | |
|
|
594 | // make sure rekeying timeouts are slightly asymmetric |
| 594 | rekey.start (NOW + ::conf.rekey); |
595 | rekey.start (NOW + ::conf.rekey |
|
|
596 | + (conf->id > THISNODE->id ? 10 : 0)); |
| 595 | keepalive.start (NOW + ::conf.keepalive); |
597 | keepalive.start (NOW + ::conf.keepalive); |
| 596 | |
598 | |
| 597 | // send queued packets |
599 | // send queued packets |
| 598 | if (ictx && octx) |
600 | if (ictx && octx) |
| 599 | { |
601 | { |
| … | |
… | |
| 742 | && connectmode != conf_node::C_DISABLED |
744 | && connectmode != conf_node::C_DISABLED |
| 743 | && NOW > w.at) |
745 | && NOW > w.at) |
| 744 | { |
746 | { |
| 745 | 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; |
| 746 | |
748 | |
| 747 | if (retry_int < 3600 * 8) |
749 | if (retry_int < conf->max_retry) |
| 748 | retry_cnt++; |
750 | retry_cnt++; |
|
|
751 | else |
|
|
752 | retry_int = conf->max_retry; |
| 749 | |
753 | |
| 750 | w.start (NOW + retry_int); |
754 | w.start (NOW + retry_int); |
| 751 | |
755 | |
| 752 | reset_si (); |
756 | reset_si (); |
| 753 | |
757 | |
| … | |
… | |
| 781 | } |
785 | } |
| 782 | |
786 | |
| 783 | delete ictx; ictx = 0; |
787 | delete ictx; ictx = 0; |
| 784 | delete octx; octx = 0; |
788 | delete octx; octx = 0; |
| 785 | |
789 | |
| 786 | si.host= 0; |
790 | si.host = 0; |
| 787 | |
791 | |
| 788 | last_activity = 0; |
792 | last_activity = 0; |
| 789 | retry_cnt = 0; |
793 | retry_cnt = 0; |
| 790 | |
794 | |
| 791 | rekey.stop (); |
795 | rekey.stop (); |
