aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-15 12:54:55 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-15 12:54:55 -0400
commite13f59416c8c97b540828b8a78cfc913a89ddf71 (patch)
tree3ff7b820907e2115eb3308e2bcda93e4c1ebacbb /src
parentc9e4ebf96a9d5fe8d6ae74be96ea00f8c5d493ac (diff)
downloadtor-e13f59416c8c97b540828b8a78cfc913a89ddf71.tar.gz
tor-e13f59416c8c97b540828b8a78cfc913a89ddf71.zip
Move measured_bw_line_t into dirserv.h
Diffstat (limited to 'src')
-rw-r--r--src/or/dirserv.h8
-rw-r--r--src/or/or.h9
2 files changed, 8 insertions, 9 deletions
diff --git a/src/or/dirserv.h b/src/or/dirserv.h
index f0b8913c5c..b79963cf8e 100644
--- a/src/or/dirserv.h
+++ b/src/or/dirserv.h
@@ -87,6 +87,14 @@ typedef struct spooled_resource_t {
off_t cached_dir_offset;
} spooled_resource_t;
+#ifdef DIRSERV_PRIVATE
+typedef struct measured_bw_line_t {
+ char node_id[DIGEST_LEN];
+ char node_hex[MAX_HEX_NICKNAME_LEN+1];
+ long int bw_kb;
+} measured_bw_line_t;
+#endif /* defined(DIRSERV_PRIVATE) */
+
int connection_dirserv_flushed_some(dir_connection_t *conn);
int dirserv_add_own_fingerprint(crypto_pk_t *pk);
diff --git a/src/or/or.h b/src/or/or.h
index 5b7d4344c4..3d0611c637 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3894,15 +3894,6 @@ typedef enum {
NS_V3_CONSENSUS_MICRODESC
} routerstatus_format_type_t;
-#ifdef DIRSERV_PRIVATE
-typedef struct measured_bw_line_t {
- char node_id[DIGEST_LEN];
- char node_hex[MAX_HEX_NICKNAME_LEN+1];
- long int bw_kb;
-} measured_bw_line_t;
-
-#endif /* defined(DIRSERV_PRIVATE) */
-
/********************************* dirvote.c ************************/
typedef struct vote_timing_t vote_timing_t;