- tor-commits - lists.torproject.org

[tor/master] Avoid freeing an uninitialised pointer in get_interface_addresses_ioctl
by nickm＠torproject.org 12 Mar '16

12 Mar '16

commit 2627299ef053ed40a73cb40e954e6b611d7e450b Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Mar 4 18:41:49 2016 +0100 Avoid freeing an uninitialised pointer in get_interface_addresses_ioctl --- changes/bug18454 | 8 ++++++++ src/common/address.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug18454 b/changes/bug18454 new file mode 100644 index 0000000..c573dae --- /dev/null +++ b/changes/bug18454 @@ -0,0 +1,8 @@ + o Minor bugfixes (memory safety): + - Avoid freeing an uninitialised pointer when opening a socket fails + in get_interface_addresses_ioctl. + Fixes bug 18454; bugfix on 9f06ec0c in tor-0.2.3.11-alpha. + Reported by "toralf" and "cypherpunks", patch by "teor". + - Correctly duplicate addresses in get_interface_address6_list. + Fixes bug 18454; bugfix on 110765f5 in tor-0.2.8.1-alpha. + Reported by "toralf", patch by "cypherpunks". diff --git a/src/common/address.c b/src/common/address.c index 8f1ce9d..c77b0f3 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1525,6 +1525,7 @@ get_interface_addresses_ioctl(int severity, sa_family_t family) { /* Some older unixy systems make us use ioctl(SIOCGIFCONF) */ struct ifconf ifc; + ifc.ifc_buf = NULL; int fd; smartlist_t *result = NULL; @@ -1547,7 +1548,6 @@ get_interface_addresses_ioctl(int severity, sa_family_t family) } int mult = 1; - ifc.ifc_buf = NULL; do { mult *= 2; ifc.ifc_len = mult * IFREQ_SIZE;

1 0

[tor/master] Correctly duplicate addresses in get_interface_address6_list
by nickm＠torproject.org 12 Mar '16

12 Mar '16

commit 9f98e6535ac58afa0cc56a4a5d9164fedead4b3c Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Mar 4 18:42:27 2016 +0100 Correctly duplicate addresses in get_interface_address6_list --- src/common/address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index c77b0f3..793a40e 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1790,7 +1790,7 @@ MOCK_IMPL(smartlist_t *,get_interface_address6_list,(int severity, if (get_interface_address6_via_udp_socket_hack(severity,AF_INET, &addr) == 0) { if (include_internal || !tor_addr_is_internal(&addr, 0)) { - smartlist_add(addrs, tor_dup_addr(&addr)); + smartlist_add(addrs, tor_memdup(&addr, sizeof(addr))); } } } @@ -1799,7 +1799,7 @@ MOCK_IMPL(smartlist_t *,get_interface_address6_list,(int severity, if (get_interface_address6_via_udp_socket_hack(severity,AF_INET6, &addr) == 0) { if (include_internal || !tor_addr_is_internal(&addr, 0)) { - smartlist_add(addrs, tor_dup_addr(&addr)); + smartlist_add(addrs, tor_memdup(&addr, sizeof(addr))); } } }

1 0

[tor/master] Merge remote-tracking branch 'teor/bug18454'
by nickm＠torproject.org 12 Mar '16

12 Mar '16

commit 656e23171d64885c1bea95403768386ee369e949 Merge: 36ac47b 9f98e65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 10:22:41 2016 -0500 Merge remote-tracking branch 'teor/bug18454' changes/bug18454 | 8 ++++++++ src/common/address.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/master] Treat bt_test.py failures as "SKIP" on freebsd.
by nickm＠torproject.org 12 Mar '16

12 Mar '16

commit b860f82d565191a6d21bde0b6940fc1871e4d935 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 1 14:11:45 2016 -0500 Treat bt_test.py failures as "SKIP" on freebsd. Closes #18204. --- changes/bug18204_028 | 3 +++ src/test/bt_test.py | 8 ++++++++ src/test/test_bt.sh | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/changes/bug18204_028 b/changes/bug18204_028 new file mode 100644 index 0000000..3a1a116 --- /dev/null +++ b/changes/bug18204_028 @@ -0,0 +1,3 @@ + o Testing: + - Treat backtrace test failures as expected on FreeBSD until we + solve bug 17808. Closes ticket 18204. diff --git a/src/test/bt_test.py b/src/test/bt_test.py index dab02d7..3059145 100755 --- a/src/test/bt_test.py +++ b/src/test/bt_test.py @@ -39,7 +39,15 @@ for I in range(len(LINES)): print("OK") sys.exit(0) +print("BAD") + for l in LINES: print("{}".format(l), end="") +if sys.platform.startswith('freebsd'): + # See bug #17808 if you know how to fix this. + print("Test failed; but FreeBSD is known to have backtrace problems.\n" + "Treating as 'SKIP'.") + sys.exit(77) + sys.exit(1) diff --git a/src/test/test_bt.sh b/src/test/test_bt.sh index f55f451..033acac 100755 --- a/src/test/test_bt.sh +++ b/src/test/test_bt.sh @@ -3,8 +3,8 @@ exitcode=0 -"${builddir:-.}/src/test/test-bt-cl" backtraces || exit 77 -"${builddir:-.}/src/test/test-bt-cl" assert | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode=1 -"${builddir:-.}/src/test/test-bt-cl" crash | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode=1 +"${builddir:-.}/src/test/test-bt-cl" backtraces || exit $? +"${builddir:-.}/src/test/test-bt-cl" assert | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode="$?" +"${builddir:-.}/src/test/test-bt-cl" crash | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode="$?" exit ${exitcode}

1 0

[tor/master] Merge remote-tracking branch 'public/bug18204_028'
by nickm＠torproject.org 12 Mar '16

12 Mar '16

commit 36ac47bd85b1c2c7077b7b008362f6b8da42e237 Merge: 25fa218 b860f82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 10:10:15 2016 -0500 Merge remote-tracking branch 'public/bug18204_028' changes/bug18204_028 | 3 +++ src/test/bt_test.py | 8 ++++++++ src/test/test_bt.sh | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-)

1 0

[tor/master] Move Automake options to configure.ac
by nickm＠torproject.org 12 Mar '16

12 Mar '16

commit 25fa21802f578db0e2852084a95a23b60ef1d1e9 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Feb 26 12:53:28 2016 +0000 Move Automake options to configure.ac This will centralize the version configuration in one file to simplify future changes. Also fixes some typos in the Automake options comments. --- Makefile.am | 5 ----- configure.ac | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index bae506a..92ba2b8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,11 +3,6 @@ # Copyright (c) 2007-2015, The Tor Project, Inc. # See LICENSE for licensing information -# "foreign" means we don't follow GNU package layout standards -# 1.11 means we require automake vesion 1.11 -# "subdir-objects" means put .o files in the same directory as the .c files -AUTOMAKE_OPTIONS = foreign 1.11 subdir-objects - ACLOCAL_AMFLAGS = -I m4 noinst_LIBRARIES= diff --git a/configure.ac b/configure.ac index a4581e5..df4b9cd 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,12 @@ AC_PREREQ([2.63]) AC_INIT([tor],[0.2.8.1-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE + +# "foreign" means we don't follow GNU package layout standards +# "1.11" means we require automake version 1.11 or newer +# "subdir-objects" means put .o files in the same directory as the .c files +AM_INIT_AUTOMAKE([foreign 1.11 subdir-objects]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS([orconfig.h])

1 0

[tor/master] enable and test transproxy on FreeBSD derivatives #18448
by nickm＠torproject.org 12 Mar '16

12 Mar '16

commit db263442af565fde0d54398da7cc80a66469d273 Author: Steven Chamberlain <steven(a)pyro.eu.org> Date: Mon Feb 29 14:15:20 2016 +0000 enable and test transproxy on FreeBSD derivatives #18448 The transproxy feature is only enabled when __FreeBSD__ is defined, and only regular FreeBSD does that. Change this to __FreeBSD_kernel__ which is defined on derivatives as well. This enables the relevant options/validate__transproxy test on FreeBSD derivatives. --- src/or/config.c | 2 +- src/test/test_options.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 544b032..ad4138a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2861,7 +2861,7 @@ options_validate(or_options_t *old_options, or_options_t *options, options->TransProxyType_parsed = TPT_TPROXY; #endif } else if (!strcasecmp(options->TransProxyType, "ipfw")) { -#if !defined(__FreeBSD__) && !defined( DARWIN ) +#if !defined(__FreeBSD_kernel__) && !defined( DARWIN ) /* Earlier versions of OS X have ipfw */ REJECT("ipfw is a FreeBSD-specific" "and OS X/Darwin-specific feature."); diff --git a/src/test/test_options.c b/src/test/test_options.c index ff1eb18..9458ade 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1058,7 +1058,7 @@ test_options_validate__transproxy(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); -#if !defined(__FreeBSD__) && !defined( DARWIN ) +#if !defined(__FreeBSD_kernel__) && !defined( DARWIN ) tt_str_op(msg, OP_EQ, "ipfw is a FreeBSD-specificand OS X/Darwin-specific " "feature."); #else @@ -1086,7 +1086,7 @@ test_options_validate__transproxy(void *ignored) tt_int_op(ret, OP_EQ, -1); tt_assert(!msg); #endif -#if defined(__FreeBSD__) || defined( DARWIN ) +#if defined(__FreeBSD_kernel__) || defined( DARWIN ) tdata = get_options_test_data("TransProxyType ipfw\n" "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);

1 0

[tor/master] Add changes file for 18448; refactor
by nickm＠torproject.org 12 Mar '16

12 Mar '16

commit ef31c8862f4ed86cfa4987b2ec58468269457f87 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 10:05:28 2016 -0500 Add changes file for 18448; refactor (I've made it so FreeBSD || FreeBSD_kernel is enough to ensure that we think you might have ipfw, and so that the logic is all in one place.) --- changes/bug18448 | 6 ++++++ src/or/config.c | 2 +- src/or/config.h | 4 ++++ src/test/test_options.c | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/changes/bug18448 b/changes/bug18448 new file mode 100644 index 0000000..e328ce3 --- /dev/null +++ b/changes/bug18448 @@ -0,0 +1,6 @@ + o Minor features (build): + - Detect systems with FreeBSD-derived kernels (such as GNU/kFreeBSD) as + having possible IPfW support. Closes ticket 18448. Patch from + Steven Chamberlain. + + diff --git a/src/or/config.c b/src/or/config.c index ad4138a..4f4b9df 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2861,7 +2861,7 @@ options_validate(or_options_t *old_options, or_options_t *options, options->TransProxyType_parsed = TPT_TPROXY; #endif } else if (!strcasecmp(options->TransProxyType, "ipfw")) { -#if !defined(__FreeBSD_kernel__) && !defined( DARWIN ) +#ifndef KERNEL_MAY_SUPPORT_IPFW /* Earlier versions of OS X have ipfw */ REJECT("ipfw is a FreeBSD-specific" "and OS X/Darwin-specific feature."); diff --git a/src/or/config.h b/src/or/config.h index c301645..02121cf 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -14,6 +14,10 @@ #include "testsupport.h" +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(DARWIN) +#define KERNEL_MAY_SUPPORT_IPFW +#endif + MOCK_DECL(const char*, get_dirportfrontpage, (void)); MOCK_DECL(const or_options_t *, get_options, (void)); MOCK_DECL(or_options_t *, get_options_mutable, (void)); diff --git a/src/test/test_options.c b/src/test/test_options.c index 9458ade..d294e60 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1058,7 +1058,7 @@ test_options_validate__transproxy(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); -#if !defined(__FreeBSD_kernel__) && !defined( DARWIN ) +#ifndef KERNEL_MAY_SUPPORT_IPFW tt_str_op(msg, OP_EQ, "ipfw is a FreeBSD-specificand OS X/Darwin-specific " "feature."); #else

1 0

[tor/master] Do not link tests against both libor.a and libor-testing.a
by nickm＠torproject.org 12 Mar '16

12 Mar '16

commit 82df3e70ac191a2a3cabf3574839e7561e00e370 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 09:53:25 2016 -0500 Do not link tests against both libor.a and libor-testing.a Also, put libor-testing.a at a better position in the list of libraries, to avoid linker errors. This is a fix, or part of a fix, for 18490. --- changes/build18490 | 4 ++++ src/test/include.am | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/changes/build18490 b/changes/build18490 new file mode 100644 index 0000000..466a133 --- /dev/null +++ b/changes/build18490 @@ -0,0 +1,4 @@ + o Minor bugfixes (build): + - Do not link the unit tests against both the testing and non-testing + versions of the static libraries. Fixes bug 18490; bugfix on + 0.2.7.1-alpha. diff --git a/src/test/include.am b/src/test/include.am index 786fb77..7d80fdf 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -151,9 +151,12 @@ src_test_test_switch_id_LDADD = \ src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ -src_test_test_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ - src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \ - src/common/libor.a src/common/libor-event-testing.a \ +src_test_test_LDADD = src/or/libtor-testing.a \ + src/common/libor-crypto-testing.a \ + $(LIBKECCAK_TINY) \ + $(LIBDONNA) \ + src/common/libor-testing.a \ + src/common/libor-event-testing.a \ src/trunnel/libor-trunnel-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \

1 0

[tor/master] moving hid_serv_get_responsible_directories and hid_serv_acting_as_directory from routerlist.c to rendcommon.c
by nickm＠torproject.org 12 Mar '16

12 Mar '16

commit b1917a061427dab68e9246463cc40c0cbd5dc00a Author: Hassan Alsibyani <sibyani(a)mit.edu> Date: Mon Feb 29 01:47:51 2016 -0500 moving hid_serv_get_responsible_directories and hid_serv_acting_as_directory from routerlist.c to rendcommon.c --- src/or/rendcache.c | 1 + src/or/rendcommon.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/rendcommon.h | 4 +++ src/or/routerlist.c | 74 ----------------------------------------------------- src/or/routerlist.h | 5 ---- 5 files changed, 79 insertions(+), 79 deletions(-) diff --git a/src/or/rendcache.c b/src/or/rendcache.c index 880c8d8..cb8c14b 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -13,6 +13,7 @@ #include "rephist.h" #include "routerlist.h" #include "routerparse.h" +#include "rendcommon.h" /** Map from service id (as generated by rend_get_service_id) to * rend_cache_entry_t. */ diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 7f7d04b..79509cb 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -17,8 +17,10 @@ #include "rendmid.h" #include "rendservice.h" #include "rephist.h" +#include "router.h" #include "routerlist.h" #include "routerparse.h" +#include "networkstatus.h" /** Return 0 if one and two are the same service ids, else -1 or 1 */ int @@ -935,3 +937,75 @@ rend_data_client_create(const char *onion_address, const char *desc_id, return NULL; } +/** Determine the routers that are responsible for id (binary) and + * add pointers to those routers' routerstatus_t to responsible_dirs. + * Return -1 if we're returning an empty smartlist, else return 0. + */ +int +hid_serv_get_responsible_directories(smartlist_t *responsible_dirs, + const char *id) +{ + int start, found, n_added = 0, i; + networkstatus_t *c = networkstatus_get_latest_consensus(); + if (!c || !smartlist_len(c->routerstatus_list)) { + log_warn(LD_REND, "We don't have a consensus, so we can't perform v2 " + "rendezvous operations."); + return -1; + } + tor_assert(id); + start = networkstatus_vote_find_entry_idx(c, id, &found); + if (start == smartlist_len(c->routerstatus_list)) start = 0; + i = start; + do { + routerstatus_t *r = smartlist_get(c->routerstatus_list, i); + if (r->is_hs_dir) { + smartlist_add(responsible_dirs, r); + if (++n_added == REND_NUMBER_OF_CONSECUTIVE_REPLICAS) + return 0; + } + if (++i == smartlist_len(c->routerstatus_list)) + i = 0; + } while (i != start); + + /* Even though we don't have the desired number of hidden service + * directories, be happy if we got any. */ + return smartlist_len(responsible_dirs) ? 0 : -1; +} + +/** Return true if this node is currently acting as hidden service + * directory, false otherwise. */ +int +hid_serv_acting_as_directory(void) +{ + const routerinfo_t *me = router_get_my_routerinfo(); + if (!me) + return 0; + return 1; +} + +/** Return true if this node is responsible for storing the descriptor ID + * in query and false otherwise. */ +MOCK_IMPL(int, hid_serv_responsible_for_desc_id, + (const char *query)) +{ + const routerinfo_t *me; + routerstatus_t *last_rs; + const char *my_id, *last_id; + int result; + smartlist_t *responsible; + if (!hid_serv_acting_as_directory()) + return 0; + if (!(me = router_get_my_routerinfo())) + return 0; /* This is redundant, but let's be paranoid. */ + my_id = me->cache_info.identity_digest; + responsible = smartlist_new(); + if (hid_serv_get_responsible_directories(responsible, query) < 0) { + smartlist_free(responsible); + return 0; + } + last_rs = smartlist_get(responsible, smartlist_len(responsible)-1); + last_id = last_rs->identity_digest; + result = rend_id_is_in_interval(my_id, query, last_id); + smartlist_free(responsible); + return result; +} diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h index 3166673..fe45299 100644 --- a/src/or/rendcommon.h +++ b/src/or/rendcommon.h @@ -57,6 +57,10 @@ int rend_id_is_in_interval(const char *a, const char *b, const char *c); void rend_get_descriptor_id_bytes(char *descriptor_id_out, const char *service_id, const char *secret_id_part); +int hid_serv_get_responsible_directories(smartlist_t *responsible_dirs, + const char *id); +int hid_serv_acting_as_directory(void); +MOCK_DECL(int, hid_serv_responsible_for_desc_id, (const char *id)); rend_data_t *rend_data_dup(const rend_data_t *data); rend_data_t *rend_data_client_create(const char *onion_address, diff --git a/src/or/routerlist.c b/src/or/routerlist.c index de42286..7f20aa9 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5395,77 +5395,3 @@ refresh_all_country_info(void) nodelist_refresh_countries(); } - -/** Determine the routers that are responsible for id (binary) and - * add pointers to those routers' routerstatus_t to responsible_dirs. - * Return -1 if we're returning an empty smartlist, else return 0. - */ -int -hid_serv_get_responsible_directories(smartlist_t *responsible_dirs, - const char *id) -{ - int start, found, n_added = 0, i; - networkstatus_t *c = networkstatus_get_latest_consensus(); - if (!c || !smartlist_len(c->routerstatus_list)) { - log_warn(LD_REND, "We don't have a consensus, so we can't perform v2 " - "rendezvous operations."); - return -1; - } - tor_assert(id); - start = networkstatus_vote_find_entry_idx(c, id, &found); - if (start == smartlist_len(c->routerstatus_list)) start = 0; - i = start; - do { - routerstatus_t *r = smartlist_get(c->routerstatus_list, i); - if (r->is_hs_dir) { - smartlist_add(responsible_dirs, r); - if (++n_added == REND_NUMBER_OF_CONSECUTIVE_REPLICAS) - return 0; - } - if (++i == smartlist_len(c->routerstatus_list)) - i = 0; - } while (i != start); - - /* Even though we don't have the desired number of hidden service - * directories, be happy if we got any. */ - return smartlist_len(responsible_dirs) ? 0 : -1; -} - -/** Return true if this node is currently acting as hidden service - * directory, false otherwise. */ -int -hid_serv_acting_as_directory(void) -{ - const routerinfo_t *me = router_get_my_routerinfo(); - if (!me) - return 0; - return 1; -} - -/** Return true if this node is responsible for storing the descriptor ID - * in query and false otherwise. */ -MOCK_IMPL(int, hid_serv_responsible_for_desc_id, - (const char *query)) -{ - const routerinfo_t *me; - routerstatus_t *last_rs; - const char *my_id, *last_id; - int result; - smartlist_t *responsible; - if (!hid_serv_acting_as_directory()) - return 0; - if (!(me = router_get_my_routerinfo())) - return 0; /* This is redundant, but let's be paranoid. */ - my_id = me->cache_info.identity_digest; - responsible = smartlist_new(); - if (hid_serv_get_responsible_directories(responsible, query) < 0) { - smartlist_free(responsible); - return 0; - } - last_rs = smartlist_get(responsible, smartlist_len(responsible)-1); - last_id = last_rs->identity_digest; - result = rend_id_is_in_interval(my_id, query, last_id); - smartlist_free(responsible); - return result; -} - diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 5b6e26a..bc48c20 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -202,11 +202,6 @@ void routers_sort_by_identity(smartlist_t *routers); void refresh_all_country_info(void); -int hid_serv_get_responsible_directories(smartlist_t *responsible_dirs, - const char *id); -int hid_serv_acting_as_directory(void); -MOCK_DECL(int, hid_serv_responsible_for_desc_id, (const char *id)); - void list_pending_microdesc_downloads(digest256map_t *result); void launch_descriptor_downloads(int purpose, smartlist_t *downloadable,

1 0