瀏覽代碼

Move measured_bw_line_t into dirserv.h

Nick Mathewson 7 年之前
父節點
當前提交
e13f59416c
共有 2 個文件被更改,包括 8 次插入9 次删除
  1. 8 0
      src/or/dirserv.h
  2. 0 9
      src/or/or.h

+ 8 - 0
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);

+ 0 - 9
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;