[tor-commits] [tor/master] Use dir_server_mode() in find_dl_schedule()

[nickm@xxxxxxxxxxxxxx]

commit ea6f88478cec6b3151a992cf2fd99539997ebb94
Author: David Goulet <dgoulet@xxxxxxxxx>
Date:   Wed Dec 16 16:32:07 2015 +0100

    Use dir_server_mode() in find_dl_schedule()
    
    Signed-off-by: David Goulet <dgoulet@xxxxxxxxx>
---
 src/or/directory.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index 31a7860..21abfb1 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3673,8 +3673,7 @@ connection_dir_finished_connecting(dir_connection_t *conn)
 static const smartlist_t *
 find_dl_schedule(download_status_t *dls, const or_options_t *options)
 {
-  /* XX/teor Replace with dir_server_mode from #12538 */
-  const int dir_server = options->DirPort_set;
+  const int dir_server = dir_server_mode(options);
   const int multi_d = networkstatus_consensus_can_use_multiple_directories(
                                                                     options);
   const int we_are_bootstrapping = networkstatus_consensus_is_boostrapping(



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits