Commit d7fab360 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Make directory_request_set_guard_state static.

parent 81045e19

src/or/directory.c

+10 −3
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ static int client_likes_consensus(networkstatus_t *v, const char *want_url); 


static void connection_dir_close_consensus_fetches(

                   dir_connection_t *except_this_one, const char *resource);

static void directory_request_set_guard_state(directory_request_t *req,

                                       struct circuit_guard_state_t *state);



/********* START VARIABLES **********/
@@ -1045,7 +1047,10 @@ struct directory_request_t { 
  time_t if_modified_since;

  /** Hidden-service-specific information */

  const rend_data_t *rend_query;

  circuit_guard_state_t *guard_state; // XXXX Does this belong?

  /** Used internally to directory.c: gets informed when the attempt to

   * connect to the directory succeeds or fails, if that attempt bears on the

   * directory's usability as a directory guard. */

  circuit_guard_state_t *guard_state;

};



/**
@@ -1195,11 +1200,13 @@ directory_request_set_rend_query(directory_request_t *req, 
  }

  req->rend_query = query;

}

void

/** Set a static circuit_guard_state_t object to affliate with the request in

 * <b>req</b>.  This object will receive notification when the attempt to

 * connect to the guard either succeeds or fails. */

static void

directory_request_set_guard_state(directory_request_t *req,

                                  circuit_guard_state_t *state)

{

  // XXXX make static.

  req->guard_state = state;

}

src/or/directory.h

+0 −2
Original line number Diff line number Diff line
@@ -69,8 +69,6 @@ void directory_request_set_if_modified_since(directory_request_t *req, 
                                             time_t if_modified_since);

void directory_request_set_rend_query(directory_request_t *req,

                                      const rend_data_t *query);

void directory_request_set_guard_state(directory_request_t *req,

                                       struct circuit_guard_state_t *state);



void directory_request_set_routerstatus(directory_request_t *req,

                                        const routerstatus_t *rs);