chiark / gitweb /
Merge branch 'mdw/backoff'
authorMark Wooding <mdw@distorted.org.uk>
Tue, 18 Sep 2012 02:30:28 +0000 (03:30 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 18 Sep 2012 02:30:28 +0000 (03:30 +0100)
commit9cda68ab3974b1f2c08a5896929890bf4a973e9a
tree5135c37a39f2ae59987d02127e019e16dc94c927
parentd245350adb5c3c687159409dcecc24fd1e7098d0
parentf884ef9d0e31b0394b000b834d135f9c68cb0720
Merge branch 'mdw/backoff'

* mdw/backoff:
  server/tests.at: Test key exchange and retransmit with a flaky network.
  server/tests.at: Add a retry loop in `COMMS_EPING'.
  proxy: Add a `drop' filter to randomly discard packets.
  server/keyexch.c: Randomized exponential retransmit backoff.
  server/keyexch.c: Use high-resolution `struct timeval' timers.
  server/{keyexch.c,keyset.c}: Eliminate `ks_tregen'.
  server/{keyexch.c,keyset.c}: Move timing parameters to tripe.h.

Conflicts:
server/tests.at
server/tests.at