Extract networkstatus_t and ..sr_info_t into their own headers

diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c
index b90660e6c78570d0f4a3736a227359828b80fc2f..f1b7601ca6f3b0be04dfa25def80d35903869259 100644 (file)
--- a/src/or/consdiffmgr.c
+++ b/src/or/consdiffmgr.c
@@ -23,6 +23,7 @@
 #include "routerparse.h"
 #include "workqueue.h"
 
+#include "networkstatus_st.h"
 #include "networkstatus_voter_info_st.h"
 
 /**

diff --git a/src/or/control.c b/src/or/control.c
index ee79dfcd5276ca1554b1b039a08945aae126cefc..0afd6cf973f7e1e8c29129b41984e135af9a43b6 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -84,6 +84,7 @@
 #include "control_connection_st.h"
 #include "cpath_build_state_st.h"
 #include "entry_connection_st.h"
+#include "networkstatus_st.h"
 #include "node_st.h"
 #include "or_connection_st.h"
 #include "or_circuit_st.h"

diff --git a/src/or/dirauth/dircollate.c b/src/or/dirauth/dircollate.c
index 388885fe0b854b1fada1a3587ca944a8fffebe2b..81f0bf31eb09b6ce78b3489b634e59c4f413222c 100644 (file)
--- a/src/or/dirauth/dircollate.c
+++ b/src/or/dirauth/dircollate.c
@@ -25,6 +25,7 @@
 #include "dircollate.h"
 #include "dirvote.h"
 
+#include "networkstatus_st.h"
 #include "vote_routerstatus_st.h"
 
 static void dircollator_collate_by_ed25519(dircollator_t *dc);

diff --git a/src/or/dirauth/dirvote.c b/src/or/dirauth/dirvote.c
index 5dee8a879772e3d8d217c54a4361726ee6690673..aa30a11f5c903b9895d27d3966ea60302d72b4a1 100644 (file)
--- a/src/or/dirauth/dirvote.c
+++ b/src/or/dirauth/dirvote.c
@@ -30,6 +30,7 @@
 
 #include "dir_server_st.h"
 #include "document_signature_st.h"
+#include "networkstatus_st.h"
 #include "networkstatus_voter_info_st.h"
 #include "node_st.h"
 #include "vote_microdesc_hash_st.h"

diff --git a/src/or/dirauth/shared_random.c b/src/or/dirauth/shared_random.c
index 6dd1f330e01b0ba782edea1761ddc9e94ede733e..137f695dbed0b87f7199ace92bda490c60eb2b21 100644 (file)
--- a/src/or/dirauth/shared_random.c
+++ b/src/or/dirauth/shared_random.c
@@ -105,6 +105,8 @@
 #include "dirauth/dirvote.h"
 #include "dirauth/mode.h"
 
+#include "networkstatus_st.h"
+
 /* String prefix of shared random values in votes/consensuses. */
 static const char previous_srv_str[] = "shared-rand-previous-value";
 static const char current_srv_str[] = "shared-rand-current-value";

diff --git a/src/or/directory.c b/src/or/directory.c
index 8392dd81f2474a4257ff63aec4f9235daea37d9d..b5a07f6b3e475185b6b3eba278d8243495af6515 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -57,6 +57,7 @@
 #include "dir_connection_st.h"
 #include "dir_server_st.h"
 #include "entry_connection_st.h"
+#include "networkstatus_st.h"
 #include "node_st.h"
 #include "rend_service_descriptor_st.h"
 

diff --git a/src/or/hs_cache.c b/src/or/hs_cache.c
index ecc845d17fb7b7954e8c97b102ffd75256fb556a..092d944b86e584d01ac7f0bdf718dc0178200771 100644 (file)
--- a/src/or/hs_cache.c
+++ b/src/or/hs_cache.c
@@ -21,6 +21,8 @@
 
 #include "hs_cache.h"
 
+#include "networkstatus_st.h"
+
 static int cached_client_descriptor_has_expired(time_t now,
            const hs_cache_client_descriptor_t *cached_desc);
 

diff --git a/src/or/hs_common.c b/src/or/hs_common.c
index c5f59059e4f84ff15170b15e9fb065b57ad15248..e5d15a1b1c4a03b883547c7ebefe869617f877f1 100644 (file)
--- a/src/or/hs_common.c
+++ b/src/or/hs_common.c
@@ -34,6 +34,7 @@
 #include "dirauth/shared_random_state.h"
 
 #include "edge_connection_st.h"
+#include "networkstatus_st.h"
 #include "node_st.h"
 #include "origin_circuit_st.h"
 

diff --git a/src/or/hs_service.c b/src/or/hs_service.c
index 90e607225bba771f54b3edcf307b160b4994a01c..007c84cafca5ab57444e8e2d668f566113f73e1b 100644 (file)
--- a/src/or/hs_service.c
+++ b/src/or/hs_service.c
@@ -41,6 +41,7 @@
 
 #include "dir_connection_st.h"
 #include "edge_connection_st.h"
+#include "networkstatus_st.h"
 #include "node_st.h"
 #include "origin_circuit_st.h"
 

diff --git a/src/or/include.am b/src/or/include.am
index 6ced3e1558e0112a36eb9164134845191955a8b2..e6f23e916de4ba48373119e0f9b8e371a786ed0c 100644 (file)
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -248,6 +248,8 @@ ORHEADERS = \
        src/or/main.h                                   \
        src/or/microdesc.h                              \
        src/or/networkstatus.h                          \
+       src/or/networkstatus_st.h                       \
+       src/or/networkstatus_sr_info_st.h               \
        src/or/networkstatus_voter_info_st.h            \
        src/or/nodelist.h                               \
        src/or/node_st.h                                \

diff --git a/src/or/main.c b/src/or/main.c
index 0daebfc4fd593074a93a667b1ba9864b880792ac..73c23ee980a0cfc1ac089b8c662f8d3e81d894c7 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -123,6 +123,7 @@
 #include "dirauth/shared_random.h"
 
 #include "entry_connection_st.h"
+#include "networkstatus_st.h"
 #include "or_connection_st.h"
 #include "port_cfg_st.h"
 #include "socks_request_st.h"

diff --git a/src/or/microdesc.c b/src/or/microdesc.c
index f06c4bd2ae47d8890794cd413b7614079997f752..208f35b1ccd55262c29455e36bb8f7052a2d8d3e 100644 (file)
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@ -22,6 +22,7 @@
 #include "routerlist.h"
 #include "routerparse.h"
 
+#include "networkstatus_st.h"
 #include "node_st.h"
 
 /** A data structure to hold a bunch of cached microdescriptors.  There are

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 11021a7ead1827501bad35c67a3eb447244ac114..8ad1bb25b7dc39a8bd32dc149933c5f59126de99 100644 (file)
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -77,6 +77,7 @@
 #include "dir_connection_st.h"
 #include "dir_server_st.h"
 #include "document_signature_st.h"
+#include "networkstatus_st.h"
 #include "networkstatus_voter_info_st.h"
 #include "node_st.h"
 #include "vote_microdesc_hash_st.h"

diff --git a/src/or/networkstatus_sr_info_st.h b/src/or/networkstatus_sr_info_st.h
new file mode 100644 (file)
index 0000000..3b2690f
--- /dev/null
+++ b/src/or/networkstatus_sr_info_st.h
@@ -0,0 +1,23 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2017, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+#ifndef NETWORKSTATUS_SR_INFO_ST_H
+#define NETWORKSTATUS_SR_INFO_ST_H
+
+struct networkstatus_sr_info_t {
+  /* Indicate if the dirauth partitipates in the SR protocol with its vote.
+   * This is tied to the SR flag in the vote. */
+  unsigned int participate:1;
+  /* Both vote and consensus: Current and previous SRV. If list is empty,
+   * this means none were found in either the consensus or vote. */
+  struct sr_srv_t *previous_srv;
+  struct sr_srv_t *current_srv;
+  /* Vote only: List of commitments. */
+  smartlist_t *commits;
+};
+
+#endif
+

diff --git a/src/or/networkstatus_st.h b/src/or/networkstatus_st.h
new file mode 100644 (file)
index 0000000..8196539
--- /dev/null
+++ b/src/or/networkstatus_st.h
@@ -0,0 +1,95 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2017, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+#ifndef NETWORKSTATUS_ST_H
+#define NETWORKSTATUS_ST_H
+
+#include "networkstatus_sr_info_st.h"
+
+/** A common structure to hold a v3 network status vote, or a v3 network
+ * status consensus. */
+struct networkstatus_t {
+  networkstatus_type_t type; /**< Vote, consensus, or opinion? */
+  consensus_flavor_t flavor; /**< If a consensus, what kind? */
+  unsigned int has_measured_bws : 1;/**< True iff this networkstatus contains
+                                     * measured= bandwidth values. */
+
+  time_t published; /**< Vote only: Time when vote was written. */
+  time_t valid_after; /**< Time after which this vote or consensus applies. */
+  time_t fresh_until; /**< Time before which this is the most recent vote or
+                       * consensus. */
+  time_t valid_until; /**< Time after which this vote or consensus should not
+                       * be used. */
+
+  /** Consensus only: what method was used to produce this consensus? */
+  int consensus_method;
+  /** Vote only: what methods is this voter willing to use? */
+  smartlist_t *supported_methods;
+
+  /** List of 'package' lines describing hashes of downloadable packages */
+  smartlist_t *package_lines;
+
+  /** How long does this vote/consensus claim that authorities take to
+   * distribute their votes to one another? */
+  int vote_seconds;
+  /** How long does this vote/consensus claim that authorities take to
+   * distribute their consensus signatures to one another? */
+  int dist_seconds;
+
+  /** Comma-separated list of recommended client software, or NULL if this
+   * voter has no opinion. */
+  char *client_versions;
+  char *server_versions;
+
+  /** Lists of subprotocol versions which are _recommended_ for relays and
+   * clients, or which are _require_ for relays and clients. Tor shouldn't
+   * make any more network connections if a required protocol is missing.
+   */
+  char *recommended_relay_protocols;
+  char *recommended_client_protocols;
+  char *required_relay_protocols;
+  char *required_client_protocols;
+
+  /** List of flags that this vote/consensus applies to routers.  If a flag is
+   * not listed here, the voter has no opinion on what its value should be. */
+  smartlist_t *known_flags;
+
+  /** List of key=value strings for the parameters in this vote or
+   * consensus, sorted by key. */
+  smartlist_t *net_params;
+
+  /** List of key=value strings for the bw weight parameters in the
+   * consensus. */
+  smartlist_t *weight_params;
+
+  /** List of networkstatus_voter_info_t.  For a vote, only one element
+   * is included.  For a consensus, one element is included for every voter
+   * whose vote contributed to the consensus. */
+  smartlist_t *voters;
+
+  struct authority_cert_t *cert; /**< Vote only: the voter's certificate. */
+
+  /** Digests of this document, as signed. */
+  common_digests_t digests;
+  /** A SHA3-256 digest of the document, not including signatures: used for
+   * consensus diffs */
+  uint8_t digest_sha3_as_signed[DIGEST256_LEN];
+
+  /** List of router statuses, sorted by identity digest.  For a vote,
+   * the elements are vote_routerstatus_t; for a consensus, the elements
+   * are routerstatus_t. */
+  smartlist_t *routerstatus_list;
+
+  /** If present, a map from descriptor digest to elements of
+   * routerstatus_list. */
+  digestmap_t *desc_digest_map;
+
+  /** Contains the shared random protocol data from a vote or consensus. */
+  networkstatus_sr_info_t sr_info;
+};
+
+#endif
+

diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 72eada57cd6961be69f619ba09f3cebbb57249a1..45a63388f24871e6a3f507e9f7daf7793c92ddbd 100644 (file)
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -69,6 +69,7 @@
 #include "dirauth/mode.h"
 
 #include "dir_server_st.h"
+#include "networkstatus_st.h"
 #include "node_st.h"
 
 static void nodelist_drop_node(node_t *node, int remove_from_ht);

diff --git a/src/or/or.h b/src/or/or.h
index 1069e30d0a6feafdb4ffca174719bd410552901f..43fe09f23bf4a36234194b939c88658e9a70f07f 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1862,18 +1862,7 @@ typedef struct vote_microdesc_hash_t vote_microdesc_hash_t;
 typedef struct vote_routerstatus_t vote_routerstatus_t;
 typedef struct document_signature_t document_signature_t;
 typedef struct networkstatus_voter_info_t networkstatus_voter_info_t;
-
-typedef struct networkstatus_sr_info_t {
-  /* Indicate if the dirauth partitipates in the SR protocol with its vote.
-   * This is tied to the SR flag in the vote. */
-  unsigned int participate:1;
-  /* Both vote and consensus: Current and previous SRV. If list is empty,
-   * this means none were found in either the consensus or vote. */
-  struct sr_srv_t *previous_srv;
-  struct sr_srv_t *current_srv;
-  /* Vote only: List of commitments. */
-  smartlist_t *commits;
-} networkstatus_sr_info_t;
+typedef struct networkstatus_sr_info_t networkstatus_sr_info_t;
 
 /** Enumerates the possible seriousness values of a networkstatus document. */
 typedef enum {
@@ -1893,87 +1882,7 @@ typedef enum {
 /** How many different consensus flavors are there? */
 #define N_CONSENSUS_FLAVORS ((int)(FLAV_MICRODESC)+1)
 
-/** A common structure to hold a v3 network status vote, or a v3 network
- * status consensus. */
-typedef struct networkstatus_t {
-  networkstatus_type_t type; /**< Vote, consensus, or opinion? */
-  consensus_flavor_t flavor; /**< If a consensus, what kind? */
-  unsigned int has_measured_bws : 1;/**< True iff this networkstatus contains
-                                     * measured= bandwidth values. */
-
-  time_t published; /**< Vote only: Time when vote was written. */
-  time_t valid_after; /**< Time after which this vote or consensus applies. */
-  time_t fresh_until; /**< Time before which this is the most recent vote or
-                       * consensus. */
-  time_t valid_until; /**< Time after which this vote or consensus should not
-                       * be used. */
-
-  /** Consensus only: what method was used to produce this consensus? */
-  int consensus_method;
-  /** Vote only: what methods is this voter willing to use? */
-  smartlist_t *supported_methods;
-
-  /** List of 'package' lines describing hashes of downloadable packages */
-  smartlist_t *package_lines;
-
-  /** How long does this vote/consensus claim that authorities take to
-   * distribute their votes to one another? */
-  int vote_seconds;
-  /** How long does this vote/consensus claim that authorities take to
-   * distribute their consensus signatures to one another? */
-  int dist_seconds;
-
-  /** Comma-separated list of recommended client software, or NULL if this
-   * voter has no opinion. */
-  char *client_versions;
-  char *server_versions;
-
-  /** Lists of subprotocol versions which are _recommended_ for relays and
-   * clients, or which are _require_ for relays and clients. Tor shouldn't
-   * make any more network connections if a required protocol is missing.
-   */
-  char *recommended_relay_protocols;
-  char *recommended_client_protocols;
-  char *required_relay_protocols;
-  char *required_client_protocols;
-
-  /** List of flags that this vote/consensus applies to routers.  If a flag is
-   * not listed here, the voter has no opinion on what its value should be. */
-  smartlist_t *known_flags;
-
-  /** List of key=value strings for the parameters in this vote or
-   * consensus, sorted by key. */
-  smartlist_t *net_params;
-
-  /** List of key=value strings for the bw weight parameters in the
-   * consensus. */
-  smartlist_t *weight_params;
-
-  /** List of networkstatus_voter_info_t.  For a vote, only one element
-   * is included.  For a consensus, one element is included for every voter
-   * whose vote contributed to the consensus. */
-  smartlist_t *voters;
-
-  struct authority_cert_t *cert; /**< Vote only: the voter's certificate. */
-
-  /** Digests of this document, as signed. */
-  common_digests_t digests;
-  /** A SHA3-256 digest of the document, not including signatures: used for
-   * consensus diffs */
-  uint8_t digest_sha3_as_signed[DIGEST256_LEN];
-
-  /** List of router statuses, sorted by identity digest.  For a vote,
-   * the elements are vote_routerstatus_t; for a consensus, the elements
-   * are routerstatus_t. */
-  smartlist_t *routerstatus_list;
-
-  /** If present, a map from descriptor digest to elements of
-   * routerstatus_list. */
-  digestmap_t *desc_digest_map;
-
-  /** Contains the shared random protocol data from a vote or consensus. */
-  networkstatus_sr_info_t sr_info;
-} networkstatus_t;
+typedef struct networkstatus_t networkstatus_t;
 
 /** A set of signatures for a networkstatus consensus.  Unless otherwise
  * noted, all fields are as for networkstatus_t. */

diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 0ab42fb4269a8289d077c79f3d4cb8b2628144f5..694b52db1f4a9ace180ce4fb0ce37a9d1a12aec5 100644 (file)
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -33,6 +33,7 @@
 
 #include "cpath_build_state_st.h"
 #include "crypt_path_st.h"
+#include "networkstatus_st.h"
 #include "origin_circuit_st.h"
 #include "rend_encoded_v2_service_descriptor_st.h"
 #include "rend_intro_point_st.h"

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 4a8b7a0e158c686095f1fbcb3c70c0ae3f1cc5b8..8552fedd3197a3c3e7f6fb38da5c785a17cece90 100644 (file)
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -40,6 +40,7 @@
 #include "crypt_path_st.h"
 #include "crypt_path_reference_st.h"
 #include "edge_connection_st.h"
+#include "networkstatus_st.h"
 #include "origin_circuit_st.h"
 #include "rend_authorized_client_st.h"
 #include "rend_encoded_v2_service_descriptor_st.h"

diff --git a/src/or/rephist.c b/src/or/rephist.c
index 909cd043b8c74b7c9f3929cfb729c2e686a5829a..efc338c5e01dec00db67201f4c12c45b8a557992 100644 (file)
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -89,6 +89,7 @@
 #include "connection_or.h"
 #include "statefile.h"
 
+#include "networkstatus_st.h"
 #include "or_circuit_st.h"
 
 static void bw_arrays_init(void);

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 5a8d19f6f463f087f4859a9cd5269393ad9a9e41..0f9318153369deb6557b0bd30d7e1daeabf9aea8 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -128,6 +128,7 @@
 #include "dir_connection_st.h"
 #include "dir_server_st.h"
 #include "document_signature_st.h"
+#include "networkstatus_st.h"
 #include "networkstatus_voter_info_st.h"
 #include "node_st.h"
 #include "vote_routerstatus_st.h"

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 73721bf2360083049c546527880fc4bd5544f941..ab64b1c825ccd313a87d9ddca7b5486111349eae 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -82,6 +82,7 @@
 #include "dirauth/dirvote.h"
 
 #include "document_signature_st.h"
+#include "networkstatus_st.h"
 #include "networkstatus_voter_info_st.h"
 #include "rend_authorized_client_st.h"
 #include "rend_intro_point_st.h"

diff --git a/src/or/shared_random_client.c b/src/or/shared_random_client.c
index 3aef83cef46774c0d2ea79de034700d767aaf89d..14997b21baac1fc589a4ae3ff60f8e25272cc38a 100644 (file)
--- a/src/or/shared_random_client.c
+++ b/src/or/shared_random_client.c
@@ -17,6 +17,8 @@
 #include "util.h"
 #include "util_format.h"
 
+#include "networkstatus_st.h"
+
 /* Convert a given srv object to a string for the control port. This doesn't
  * fail and the srv object MUST be valid. */
 static char *

diff --git a/src/or/voting_schedule.c b/src/or/voting_schedule.c
index 1d66b5e225111885755ba95d7e6a83184f9f2575..983cabbbf3a5f3a70b0eb4c4cb67be1758c414a7 100644 (file)
--- a/src/or/voting_schedule.c
+++ b/src/or/voting_schedule.c
@@ -15,6 +15,8 @@
 #include "config.h"
 #include "networkstatus.h"
 
+#include "networkstatus_st.h"
+
 /* =====
  * Vote scheduling
  * ===== */

diff --git a/src/test/fuzz/fuzz_vrs.c b/src/test/fuzz/fuzz_vrs.c
index 7225fd54561317b5f4e73f1a4ce42962d5d7f5e2..a597674940b511a023d5606c5aa44cce86534558 100644 (file)
--- a/src/test/fuzz/fuzz_vrs.c
+++ b/src/test/fuzz/fuzz_vrs.c
@@ -8,6 +8,7 @@
 #include "microdesc.h"
 #include "networkstatus.h"
 
+#include "networkstatus_st.h"
 #include "vote_routerstatus_st.h"
 
 #include "fuzzing.h"

diff --git a/src/test/test_address_set.c b/src/test/test_address_set.c
index f7441a6491029b2c1fb83cab034b7e70f64c486c..441d14927ddd8b361c01cfbc467276363adf854d 100644 (file)
--- a/src/test/test_address_set.c
+++ b/src/test/test_address_set.c
@@ -10,6 +10,8 @@
 #include "routerlist.h"
 #include "torcert.h"
 
+#include "networkstatus_st.h"
+
 #include "test.h"
 
 static networkstatus_t *dummy_ns = NULL;

diff --git a/src/test/test_channel.c b/src/test/test_channel.c
index c41afff5d0ec60e73082f1fc2c33073e765efd85..8177f92a1af3cd8e6cc479aef711c85fe1c98ca8 100644 (file)
--- a/src/test/test_channel.c
+++ b/src/test/test_channel.c
@@ -20,6 +20,7 @@
 #include "scheduler.h"
 #include "networkstatus.h"
 
+#include "networkstatus_st.h"
 #include "origin_circuit_st.h"
 
 /* Test suite stuff */

diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c
index b8e3492eaaf722e9b2c3e0549006bbf39c71c258..2b4ff59a32300f80c1a059b8e8490f1f07d3598d 100644 (file)
--- a/src/test/test_channelpadding.c
+++ b/src/test/test_channelpadding.c
@@ -20,6 +20,7 @@
 #include "networkstatus.h"
 #include "log_test_helpers.h"
 
+#include "networkstatus_st.h"
 #include "or_connection_st.h"
 
 int channelpadding_get_netflow_inactive_timeout_ms(channel_t *chan);

diff --git a/src/test/test_consdiffmgr.c b/src/test/test_consdiffmgr.c
index 3b91baca39fc947c3212a1b2c23a38c7e823e7de..dc223274b9131c3cfa24a5547e68234de595a423 100644 (file)
--- a/src/test/test_consdiffmgr.c
+++ b/src/test/test_consdiffmgr.c
@@ -14,6 +14,8 @@
 #include "routerparse.h"
 #include "workqueue.h"
 
+#include "networkstatus_st.h"
+
 #include "test.h"
 #include "log_test_helpers.h"
 

diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index f5a3b6f65c2ea4e049c95f441eaab6749a1962f8..10169a70cf880bd579c7ec8d70ec270a0f4da173 100644 (file)
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -46,6 +46,7 @@
 #include "voting_schedule.h"
 
 #include "document_signature_st.h"
+#include "networkstatus_st.h"
 #include "networkstatus_voter_info_st.h"
 #include "port_cfg_st.h"
 #include "tor_version_st.h"

diff --git a/src/test/test_dir_common.c b/src/test/test_dir_common.c
index fca132c9f7f4910345ed49c88d711c34b9d2e1ba..3fad1c3af07d6890e3027bc0aacd2ee68e01448b 100644 (file)
--- a/src/test/test_dir_common.c
+++ b/src/test/test_dir_common.c
@@ -14,6 +14,7 @@
 #include "test_dir_common.h"
 #include "voting_schedule.h"
 
+#include "networkstatus_st.h"
 #include "networkstatus_voter_info_st.h"
 #include "vote_microdesc_hash_st.h"
 #include "vote_routerstatus_st.h"

diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c
index ff9740b91115b85628df166217660f1c574f2b8a..2e9eb3b748830fd042be30c2138b2890d3c5f0d8 100644 (file)
--- a/src/test/test_dir_handle_get.c
+++ b/src/test/test_dir_handle_get.c
@@ -36,6 +36,7 @@
 
 #include "dir_connection_st.h"
 #include "dir_server_st.h"
+#include "networkstatus_st.h"
 #include "rend_encoded_v2_service_descriptor_st.h"
 
 #ifdef _WIN32

diff --git a/src/test/test_dos.c b/src/test/test_dos.c
index fcc537499a6a1046410fd04f181e71c8dcb6d49b..714533908492aac764a1eb4807b0fa767606949f 100644 (file)
--- a/src/test/test_dos.c
+++ b/src/test/test_dos.c
@@ -16,6 +16,7 @@
 #include "nodelist.h"
 #include "routerlist.h"
 
+#include "networkstatus_st.h"
 #include "or_connection_st.h"
 
 #include "test.h"

diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index cf9da232ca72a43743f3943986e2c180129f43de..5722637735cecc4bc6fa569e293b0eac17fd0712 100644 (file)
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -33,6 +33,7 @@
 #include "cpath_build_state_st.h"
 #include "crypt_path_st.h"
 #include "dir_connection_st.h"
+#include "networkstatus_st.h"
 #include "node_st.h"
 #include "origin_circuit_st.h"
 

diff --git a/src/test/test_guardfraction.c b/src/test/test_guardfraction.c
index 24bf58f9421b5ee40ed750a0a6db17852cbbc652..38f237c5dd4e15684cf593deaef40db17d0206a6 100644 (file)
--- a/src/test/test_guardfraction.c
+++ b/src/test/test_guardfraction.c
@@ -15,6 +15,7 @@
 #include "routerparse.h"
 #include "networkstatus.h"
 
+#include "networkstatus_st.h"
 #include "vote_microdesc_hash_st.h"
 #include "vote_routerstatus_st.h"
 

diff --git a/src/test/test_hs_cache.c b/src/test/test_hs_cache.c
index b2f892c7f2130bfe3a4410a7c3e7ebb3e89c09ca..415f6f30eea9df2f8607df809f30a908df1c910a 100644 (file)
--- a/src/test/test_hs_cache.c
+++ b/src/test/test_hs_cache.c
@@ -19,6 +19,7 @@
 #include "proto_http.h"
 
 #include "dir_connection_st.h"
+#include "networkstatus_st.h"
 
 #include "hs_test_helpers.h"
 #include "test_helpers.h"

diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c
index b75e743d3cdf51917106d0113a074a466b149c79..ca87d5e92dfce0bd4dac4d2b6ca4509585ca63c0 100644 (file)
--- a/src/test/test_hs_client.c
+++ b/src/test/test_hs_client.c
@@ -41,6 +41,7 @@
 #include "crypt_path_st.h"
 #include "dir_connection_st.h"
 #include "entry_connection_st.h"
+#include "networkstatus_st.h"
 #include "origin_circuit_st.h"
 #include "socks_request_st.h"
 

diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index 21a109d2bc4ff7f74557760b1762fe31dc55b10c..1cfa4a2409325543b090b25bbfeed9358a35b7e1 100644 (file)
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -33,6 +33,7 @@
 #include "util.h"
 #include "voting_schedule.h"
 
+#include "networkstatus_st.h"
 #include "node_st.h"
 
 /** Test the validation of HS v3 addresses */

diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index 83a9d3cb598637cc0f7c90a4ffbc97d02de8f5ec..ab27b4dc4e73b400b964bcb236ae0752fab9d649 100644 (file)
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -55,6 +55,7 @@
 
 #include "cpath_build_state_st.h"
 #include "crypt_path_st.h"
+#include "networkstatus_st.h"
 #include "node_st.h"
 #include "origin_circuit_st.h"
 

diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c
index 4b168f49eddacde6857feb95c2389e048ce472e3..27fdf4a9d0003b75dc90333bc1c8dfa79f7dd824 100644 (file)
--- a/src/test/test_microdesc.c
+++ b/src/test/test_microdesc.c
@@ -13,6 +13,8 @@
 #include "routerparse.h"
 #include "torcert.h"
 
+#include "networkstatus_st.h"
+
 #include "test.h"
 
 #ifdef _WIN32

diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c
index a3f2de29f0b945566844c60fa5224f81f5fd30ab..4a876f3557717d9a43758edcd6f7bf7d3309b6c2 100644 (file)
--- a/src/test/test_nodelist.c
+++ b/src/test/test_nodelist.c
@@ -12,6 +12,7 @@
 #include "nodelist.h"
 #include "torcert.h"
 
+#include "networkstatus_st.h"
 #include "node_st.h"
 
 #include "test.h"

diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index bf97499eee3ab8b9654ce9a4f50537c5ea9586ba..45d63a8061c214d11e1183bfea3277f0c608620b 100644 (file)
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -35,6 +35,7 @@
 #include "statefile.h"
 
 #include "dir_connection_st.h"
+#include "networkstatus_st.h"
 #include "node_st.h"
 
 #include "test.h"

diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c
index baafb9813b75645e09b28ddb7b05776a9c8c1d44..a1b4d60a2c210ecf14f3b814af6719f79ae42b2c 100644 (file)
--- a/src/test/test_shared_random.c
+++ b/src/test/test_shared_random.c
@@ -23,6 +23,7 @@
 #include "voting_schedule.h"
 
 #include "dir_server_st.h"
+#include "networkstatus_st.h"
 
 static authority_cert_t *mock_cert;