Commit b60ffc5c authored by David Goulet's avatar David Goulet 🐼
Browse files

Merge remote-tracking branch 'dgoulet/bug25223_029_01' into ticket24902_029_05

parents 305e39d0 4fe4f817

changes/bug25223

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (DoS mitigation):

    - Make sure we don't modify consensus parameters if we aren't a public

      relay when a new consensus arrives. Fixes bug 25223.

src/or/dos.c

+8 −0
Original line number Diff line number Diff line
@@ -748,6 +748,14 @@ dos_close_client_conn(const or_connection_t *or_conn) 
void

dos_consensus_has_changed(const networkstatus_t *ns)

{

  /* There are two ways to configure this subsystem, one at startup through

   * dos_init() which is called when the options are parsed. And this one

   * through the consensus. We don't want to enable any DoS mitigation if we

   * aren't a public relay. */

  if (!public_server_mode(get_options())) {

    return;

  }



  cc_consensus_has_changed(ns);

  conn_consensus_has_changed(ns);