]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug24104_029_squashed'
authorNick Mathewson <nickm@torproject.org>
Tue, 4 Sep 2018 14:44:36 +0000 (10:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 4 Sep 2018 14:44:36 +0000 (10:44 -0400)
1  2 
src/feature/relay/router.c
src/feature/stats/rephist.c
src/feature/stats/rephist.h
src/test/log_test_helpers.c
src/test/log_test_helpers.h
src/test/test_router.c

index ad97d534c22c20b358524e4a8ad5807cb5f21acd,f1a99364e6ec96a3331412bc34c79613cee7cb10..b9a930dbe907ba04e75fe10fb208f0255d5c31a8
@@@ -2651,18 -2440,21 +2659,27 @@@ check_descriptor_bandwidth_changed(time
  {
    static time_t last_changed = 0;
    uint64_t prev, cur;
 -  int hibernating = we_are_hibernating();
++  const int hibernating = we_are_hibernating();
+   /* If the relay uptime is bigger than MAX_UPTIME_BANDWIDTH_CHANGE,
+    * the next regularly scheduled descriptor update (18h) will be enough */
+   if (get_uptime() > MAX_UPTIME_BANDWIDTH_CHANGE && !hibernating)
+     return;
 -  if (!router_get_my_routerinfo())
 +  const routerinfo_t *my_ri = router_get_my_routerinfo();
-   if (!my_ri) /* make sure routerinfo exists */
++
++  if (!my_ri)
      return;
  
 -  prev = router_get_my_routerinfo()->bandwidthcapacity;
 +  prev = my_ri->bandwidthcapacity;
 +
 +  /* Consider ourselves to have zero bandwidth if we're hibernating or
 +   * shutting down. */
-   cur = we_are_hibernating() ? 0 : rep_hist_bandwidth_assess();
+   cur = hibernating ? 0 : rep_hist_bandwidth_assess();
++
    if ((prev != cur && (!prev || !cur)) ||
-       cur > prev*2 ||
-       cur < prev/2) {
+       cur > (prev * BANDWIDTH_CHANGE_FACTOR) ||
+       cur < (prev / BANDWIDTH_CHANGE_FACTOR) ) {
      if (last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now || !prev) {
        log_info(LD_GENERAL,
                 "Measured bandwidth has changed; rebuilding descriptor.");
Simple merge
Simple merge
Simple merge
Simple merge
index 613ec04021393716a12fda5ae0f5a6fcbe3843cd,51055a336753ed22d90fc8b2c35e760e2d131823..6e64131fc8ca9417f2c749cfc20e88d6b0182eb8
  
  /**
   * \file test_router.c
 - * \brief Unittests for code in src/or/router.c
 + * \brief Unittests for code in router.c
   **/
  
 -#include "or.h"
 -#include "hibernate.h"
 -#include "log_test_helpers.h"
 -#include "main.h"
 -#include "rephist.h"
 -#include "router.h"
 -#include "test.h"
 +#include "core/or/or.h"
 +#include "app/config/config.h"
++#include "core/mainloop/main.h"
++#include "feature/hibernate/hibernate.h"
++#include "feature/nodelist/routerinfo_st.h"
++#include "feature/nodelist/routerlist.h"
++#include "feature/relay/router.h"
++#include "feature/stats/rephist.h"
 +#include "lib/crypt_ops/crypto_curve25519.h"
 +#include "lib/crypt_ops/crypto_ed25519.h"
- #include "feature/relay/router.h"
- #include "feature/nodelist/routerlist.h"
- #include "feature/nodelist/routerinfo_st.h"
 +
 +/* Test suite stuff */
 +#include "test/test.h"
++#include "test/log_test_helpers.h"
 +
 +NS_DECL(const routerinfo_t *, router_get_my_routerinfo, (void));
 +
 +static routerinfo_t* mock_routerinfo;
 +
 +static const routerinfo_t*
 +NS(router_get_my_routerinfo)(void)
 +{
 +  crypto_pk_t* ident_key;
 +  crypto_pk_t* tap_key;
 +  time_t now;
 +
 +  if (!mock_routerinfo) {
 +    /* Mock the published timestamp, otherwise router_dump_router_to_string()
 +     * will poop its pants. */
 +    time(&now);
 +
 +    /* We'll need keys, or router_dump_router_to_string() would return NULL. */
 +    ident_key = pk_generate(0);
 +    tap_key = pk_generate(0);
 +
 +    tor_assert(ident_key != NULL);
 +    tor_assert(tap_key != NULL);
 +
 +    mock_routerinfo = tor_malloc_zero(sizeof(routerinfo_t));
 +    mock_routerinfo->nickname = tor_strdup("ConlonNancarrow");
 +    mock_routerinfo->addr = 123456789;
 +    mock_routerinfo->or_port = 443;
 +    mock_routerinfo->platform = tor_strdup("unittest");
 +    mock_routerinfo->cache_info.published_on = now;
 +    mock_routerinfo->identity_pkey = crypto_pk_dup_key(ident_key);
 +    router_set_rsa_onion_pkey(tap_key, &mock_routerinfo->onion_pkey,
 +                              &mock_routerinfo->onion_pkey_len);
 +    mock_routerinfo->bandwidthrate = 9001;
 +    mock_routerinfo->bandwidthburst = 9002;
 +  }
 +
 +  return mock_routerinfo;
 +}
 +
 +/* If no distribution option was set, then check_bridge_distribution_setting()
 + * should have set it to "any". */
 +static void
 +test_router_dump_router_to_string_no_bridge_distribution_method(void *arg)
 +{
 +  const char* needle = "bridge-distribution-request any";
 +  or_options_t* options = get_options_mutable();
 +  routerinfo_t* router = NULL;
 +  curve25519_keypair_t ntor_keypair;
 +  ed25519_keypair_t signing_keypair;
 +  char* desc = NULL;
 +  char* found = NULL;
 +  (void)arg;
 +
 +  NS_MOCK(router_get_my_routerinfo);
 +
 +  options->ORPort_set = 1;
 +  options->BridgeRelay = 1;
 +
 +  /* Generate keys which router_dump_router_to_string() expects to exist. */
 +  tt_int_op(0, ==, curve25519_keypair_generate(&ntor_keypair, 0));
 +  tt_int_op(0, ==, ed25519_keypair_generate(&signing_keypair, 0));
 +
 +  /* Set up part of our routerinfo_t so that we don't trigger any other
 +   * assertions in router_dump_router_to_string(). */
 +  router = (routerinfo_t*)router_get_my_routerinfo();
 +  tt_ptr_op(router, !=, NULL);
 +
 +  router->onion_curve25519_pkey = &ntor_keypair.pubkey;
 +
 +  /* Generate our server descriptor and ensure that the substring
 +   * "bridge-distribution-request any" occurs somewhere within it. */
 +  crypto_pk_t *onion_pkey = router_get_rsa_onion_pkey(router->onion_pkey,
 +                                                      router->onion_pkey_len);
 +  desc = router_dump_router_to_string(router,
 +                                      router->identity_pkey,
 +                                      onion_pkey,
 +                                      &ntor_keypair,
 +                                      &signing_keypair);
 +  crypto_pk_free(onion_pkey);
 +  tt_ptr_op(desc, !=, NULL);
 +  found = strstr(desc, needle);
 +  tt_ptr_op(found, !=, NULL);
 +
 + done:
 +  NS_UNMOCK(router_get_my_routerinfo);
 +
 +  tor_free(desc);
 +}
  
+ static routerinfo_t *mock_router_get_my_routerinfo_result = NULL;
+ static const routerinfo_t *
+ mock_router_get_my_routerinfo(void)
+ {
+   return mock_router_get_my_routerinfo_result;
+ }
+ static long
+ mock_get_uptime_3h(void)
+ {
+   return 3*60*60;
+ }
+ static long
+ mock_get_uptime_1d(void)
+ {
+   return 24*60*60;
+ }
+ static int
+ mock_rep_hist_bandwidth_assess(void)
+ {
+   return 20001;
+ }
+ static int
+ mock_we_are_not_hibernating(void)
+ {
+   return 0;
+ }
+ static int
+ mock_we_are_hibernating(void)
+ {
+   return 0;
+ }
+ static void
+ test_router_check_descriptor_bandwidth_changed(void *arg)
+ {
+   (void)arg;
+   routerinfo_t routerinfo;
+   memset(&routerinfo, 0, sizeof(routerinfo));
+   mock_router_get_my_routerinfo_result = NULL;
+   MOCK(we_are_hibernating, mock_we_are_not_hibernating);
+   MOCK(router_get_my_routerinfo, mock_router_get_my_routerinfo);
+   mock_router_get_my_routerinfo_result = &routerinfo;
+   /* When uptime is less than 24h, no previous bandwidth, no last_changed
+    * Uptime: 10800, last_changed: 0, Previous bw: 0, Current bw: 0 */
+   routerinfo.bandwidthcapacity = 0;
+   MOCK(get_uptime, mock_get_uptime_3h);
+   setup_full_capture_of_logs(LOG_INFO);
+   check_descriptor_bandwidth_changed(time(NULL));
+   expect_log_msg_not_containing(
+      "Measured bandwidth has changed; rebuilding descriptor.");
+   teardown_capture_of_logs();
+   /* When uptime is less than 24h, previous bandwidth,
+    * last_changed more than 3h ago
+    * Uptime: 10800, last_changed: 0, Previous bw: 10000, Current bw: 0 */
+   routerinfo.bandwidthcapacity = 10000;
+   setup_full_capture_of_logs(LOG_INFO);
+   check_descriptor_bandwidth_changed(time(NULL));
+   expect_log_msg_containing(
+      "Measured bandwidth has changed; rebuilding descriptor.");
+   teardown_capture_of_logs();
+   /* When uptime is less than 24h, previous bandwidth,
+    * last_changed more than 3h ago, and hibernating
+    * Uptime: 10800, last_changed: 0, Previous bw: 10000, Current bw: 0 */
+   UNMOCK(we_are_hibernating);
+   MOCK(we_are_hibernating, mock_we_are_hibernating);
+   routerinfo.bandwidthcapacity = 10000;
+   setup_full_capture_of_logs(LOG_INFO);
+   check_descriptor_bandwidth_changed(time(NULL));
+   expect_log_msg_not_containing(
+      "Measured bandwidth has changed; rebuilding descriptor.");
+   teardown_capture_of_logs();
+   UNMOCK(we_are_hibernating);
+   MOCK(we_are_hibernating, mock_we_are_not_hibernating);
+   /* When uptime is less than 24h, last_changed is not more than 3h ago
+    * Uptime: 10800, last_changed: x, Previous bw: 10000, Current bw: 0 */
+   setup_full_capture_of_logs(LOG_INFO);
+   check_descriptor_bandwidth_changed(time(NULL));
+   expect_log_msg_not_containing(
+      "Measured bandwidth has changed; rebuilding descriptor.");
+   teardown_capture_of_logs();
+   /* When uptime is less than 24h and bandwidthcapacity does not change
+    * Uptime: 10800, last_changed: x, Previous bw: 10000, Current bw: 20001 */
+   MOCK(rep_hist_bandwidth_assess, mock_rep_hist_bandwidth_assess);
+   setup_full_capture_of_logs(LOG_INFO);
+   check_descriptor_bandwidth_changed(time(NULL) + 6*60*60 + 1);
+   expect_log_msg_containing(
+      "Measured bandwidth has changed; rebuilding descriptor.");
+   UNMOCK(get_uptime);
+   UNMOCK(rep_hist_bandwidth_assess);
+   teardown_capture_of_logs();
+   /* When uptime is more than 24h */
+   MOCK(get_uptime, mock_get_uptime_1d);
+   setup_full_capture_of_logs(LOG_INFO);
+   check_descriptor_bandwidth_changed(time(NULL));
+   expect_log_msg_not_containing(
+      "Measured bandwidth has changed; rebuilding descriptor.");
+   teardown_capture_of_logs();
+  done:
+   UNMOCK(get_uptime);
+   UNMOCK(router_get_my_routerinfo);
+   UNMOCK(we_are_hibernating);
+ }
  #define ROUTER_TEST(name, flags)                          \
    { #name, test_router_ ## name, flags, NULL, NULL }
  
  struct testcase_t router_tests[] = {
+   ROUTER_TEST(check_descriptor_bandwidth_changed, TT_FORK),
 +  ROUTER_TEST(dump_router_to_string_no_bridge_distribution_method, TT_FORK),
    END_OF_TESTCASES
  };
 -