Create rephist.h

src/or/circuitbuild.c

@@ -26,6 +26,7 @@
 #include "onion.h"
 #include "policies.h"
 #include "relay.h"
+#include "rephist.h"
 #include "router.h"
 #include "routerlist.h"
 #include "crypto.h"

src/or/circuitlist.c

@@ -23,6 +23,7 @@
 #include "relay.h"
 #include "rendclient.h"
 #include "rendcommon.h"
+#include "rephist.h"
 #include "routerlist.h"
 #include "ht.h"
 

src/or/circuituse.c

@@ -21,6 +21,7 @@
 #include "rendclient.h"
 #include "rendcommon.h"
 #include "rendservice.h"
+#include "rephist.h"
 #include "router.h"
 #include "routerlist.h"
 

src/or/config.c

@@ -30,6 +30,7 @@
 #include "relay.h"
 #include "rendclient.h"
 #include "rendservice.h"
+#include "rephist.h"
 #include "router.h"
 #include "routerlist.h"
 #ifdef MS_WINDOWS

src/or/connection.c

@@ -32,6 +32,7 @@
 #include "relay.h"
 #include "rendclient.h"
 #include "rendcommon.h"
+#include "rephist.h"
 #include "router.h"
 
 static connection_t *connection_create_listener(

src/or/connection_edge.c

@@ -29,6 +29,7 @@
 #include "rendclient.h"
 #include "rendcommon.h"
 #include "rendservice.h"
+#include "rephist.h"
 #include "router.h"
 #include "routerlist.h"
 

src/or/connection_or.c

@@ -24,6 +24,7 @@
 #include "networkstatus.h"
 #include "reasons.h"
 #include "relay.h"
+#include "rephist.h"
 #include "router.h"
 #include "routerlist.h"
 

src/or/directory.c

@@ -19,6 +19,7 @@
 #include "policies.h"
 #include "rendclient.h"
 #include "rendcommon.h"
+#include "rephist.h"
 #include "router.h"
 #include "routerlist.h"
 

src/or/dirserv.c

@@ -17,6 +17,7 @@
 #include "microdesc.h"
 #include "networkstatus.h"
 #include "policies.h"
+#include "rephist.h"
 #include "router.h"
 #include "routerlist.h"
 

src/or/dirvote.c

@@ -12,6 +12,7 @@
 #include "microdesc.h"
 #include "networkstatus.h"
 #include "policies.h"
+#include "rephist.h"
 #include "router.h"
 #include "routerlist.h"
 

src/or/main.c

@@ -40,6 +40,7 @@
 #include "rendclient.h"
 #include "rendcommon.h"
 #include "rendservice.h"
+#include "rephist.h"
 #include "router.h"
 #include "routerlist.h"
 #ifdef USE_DMALLOC

src/or/onion.c

@@ -14,6 +14,7 @@
 #include "circuitlist.h"
 #include "config.h"
 #include "onion.h"
+#include "rephist.h"
 
 /** Type for a linked list of circuits that are waiting for a free CPU worker
  * to process a waiting onion handshake. */

src/or/or.h

@@ -3311,51 +3311,6 @@ typedef enum {
 
 /********************************* rephist.c ***************************/
 
-void rep_hist_init(void);
-void rep_hist_note_connect_failed(const char* nickname, time_t when);
-void rep_hist_note_connect_succeeded(const char* nickname, time_t when);
-void rep_hist_note_disconnect(const char* nickname, time_t when);
-void rep_hist_note_connection_died(const char* nickname, time_t when);
-void rep_hist_note_extend_succeeded(const char *from_name,
-                                    const char *to_name);
-void rep_hist_note_extend_failed(const char *from_name, const char *to_name);
-void rep_hist_dump_stats(time_t now, int severity);
-void rep_hist_note_bytes_read(size_t num_bytes, time_t when);
-void rep_hist_note_bytes_written(size_t num_bytes, time_t when);
-void rep_hist_note_exit_bytes_read(uint16_t port, size_t num_bytes);
-void rep_hist_note_exit_bytes_written(uint16_t port, size_t num_bytes);
-void rep_hist_note_exit_stream_opened(uint16_t port);
-void rep_hist_exit_stats_init(time_t now);
-void rep_hist_exit_stats_write(time_t now);
-int rep_hist_bandwidth_assess(void);
-char *rep_hist_get_bandwidth_lines(int for_extrainfo);
-void rep_hist_update_state(or_state_t *state);
-int rep_hist_load_state(or_state_t *state, char **err);
-void rep_history_clean(time_t before);
-
-void rep_hist_note_router_reachable(const char *id, time_t when);
-void rep_hist_note_router_unreachable(const char *id, time_t when);
-int rep_hist_record_mtbf_data(time_t now, int missing_means_down);
-int rep_hist_load_mtbf_data(time_t now);
-
-time_t rep_hist_downrate_old_runs(time_t now);
-double rep_hist_get_stability(const char *id, time_t when);
-double rep_hist_get_weighted_fractional_uptime(const char *id, time_t when);
-long rep_hist_get_weighted_time_known(const char *id, time_t when);
-int rep_hist_have_measured_enough_stability(void);
-const char *rep_hist_get_router_stability_doc(time_t now);
-
-void rep_hist_note_used_port(time_t now, uint16_t port);
-smartlist_t *rep_hist_get_predicted_ports(time_t now);
-void rep_hist_note_used_resolve(time_t now);
-void rep_hist_note_used_internal(time_t now, int need_uptime,
-                                 int need_capacity);
-int rep_hist_get_predicted_internal(time_t now, int *need_uptime,
-                                    int *need_capacity);
-
-int any_predicted_circuits(time_t now);
-int rep_hist_circbuilding_dormant(time_t now);
-
 /** Possible public/private key operations in Tor: used to keep track of where
  * we're spending our time. */
 typedef enum {
@@ -3365,23 +3320,6 @@ typedef enum {
   TLS_HANDSHAKE_C, TLS_HANDSHAKE_S,
   REND_CLIENT, REND_MID, REND_SERVER,
 } pk_op_t;
-void note_crypto_pk_op(pk_op_t operation);
-void dump_pk_ops(int severity);
-
-void rep_hist_free_all(void);
-
-/* for hidden service usage statistics */
-void hs_usage_note_publish_total(const char *service_id, time_t now);
-void hs_usage_note_publish_novel(const char *service_id, time_t now);
-void hs_usage_note_fetch_total(const char *service_id, time_t now);
-void hs_usage_note_fetch_successful(const char *service_id, time_t now);
-void hs_usage_write_statistics_to_file(time_t now);
-void hs_usage_free_all(void);
-
-void rep_hist_buffer_stats_init(time_t now);
-void rep_hist_buffer_stats_add_circ(circuit_t *circ,
-                                    time_t end_of_interval);
-void rep_hist_buffer_stats_write(time_t now);
 
 /********************************* rendcommon.c ***************************/
 

src/or/rendclient.c

@@ -19,6 +19,7 @@
 #include "relay.h"
 #include "rendclient.h"
 #include "rendcommon.h"
+#include "rephist.h"
 #include "routerlist.h"
 
 /** Called when we've established a circuit to an introduction point:

src/or/rendcommon.c

@@ -15,6 +15,7 @@
 #include "rendcommon.h"
 #include "rendmid.h"
 #include "rendservice.h"
+#include "rephist.h"
 #include "routerlist.h"
 
 /** Return 0 if one and two are the same service ids, else -1 or 1 */

src/or/rendmid.c

@@ -12,6 +12,7 @@
 #include "config.h"
 #include "relay.h"
 #include "rendmid.h"
+#include "rephist.h"
 
 /** Respond to an ESTABLISH_INTRO cell by checking the signed data and
  * setting the circuit's purpose and service pk digest.

src/or/rendservice.c

@@ -19,6 +19,7 @@
 #include "rendservice.h"
 #include "router.h"
 #include "relay.h"
+#include "rephist.h"
 #include "routerlist.h"
 
 static origin_circuit_t *find_intro_circuit(rend_intro_point_t *intro,

src/or/rephist.c

@@ -13,6 +13,7 @@
 #include "circuitlist.h"
 #include "circuituse.h"
 #include "config.h"
+#include "rephist.h"
 #include "router.h"
 #include "routerlist.h"
 #include "ht.h"

src/or/rephist.h

@@ -0,0 +1,79 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2010, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file rephist.h
+ * \brief Header file for rephist functions
+ **/
+
+#ifndef _TOR_REPHIST_H
+#define _TOR_REPHIST_H
+
+void rep_hist_init(void);
+void rep_hist_note_connect_failed(const char* nickname, time_t when);
+void rep_hist_note_connect_succeeded(const char* nickname, time_t when);
+void rep_hist_note_disconnect(const char* nickname, time_t when);
+void rep_hist_note_connection_died(const char* nickname, time_t when);
+void rep_hist_note_extend_succeeded(const char *from_name,
+                                    const char *to_name);
+void rep_hist_note_extend_failed(const char *from_name, const char *to_name);
+void rep_hist_dump_stats(time_t now, int severity);
+void rep_hist_note_bytes_read(size_t num_bytes, time_t when);
+void rep_hist_note_bytes_written(size_t num_bytes, time_t when);
+void rep_hist_note_exit_bytes_read(uint16_t port, size_t num_bytes);
+void rep_hist_note_exit_bytes_written(uint16_t port, size_t num_bytes);
+void rep_hist_note_exit_stream_opened(uint16_t port);
+void rep_hist_exit_stats_init(time_t now);
+void rep_hist_exit_stats_write(time_t now);
+int rep_hist_bandwidth_assess(void);
+char *rep_hist_get_bandwidth_lines(int for_extrainfo);
+void rep_hist_update_state(or_state_t *state);
+int rep_hist_load_state(or_state_t *state, char **err);
+void rep_history_clean(time_t before);
+
+void rep_hist_note_router_reachable(const char *id, time_t when);
+void rep_hist_note_router_unreachable(const char *id, time_t when);
+int rep_hist_record_mtbf_data(time_t now, int missing_means_down);
+int rep_hist_load_mtbf_data(time_t now);
+
+time_t rep_hist_downrate_old_runs(time_t now);
+double rep_hist_get_stability(const char *id, time_t when);
+double rep_hist_get_weighted_fractional_uptime(const char *id, time_t when);
+long rep_hist_get_weighted_time_known(const char *id, time_t when);
+int rep_hist_have_measured_enough_stability(void);
+const char *rep_hist_get_router_stability_doc(time_t now);
+
+void rep_hist_note_used_port(time_t now, uint16_t port);
+smartlist_t *rep_hist_get_predicted_ports(time_t now);
+void rep_hist_note_used_resolve(time_t now);
+void rep_hist_note_used_internal(time_t now, int need_uptime,
+                                 int need_capacity);
+int rep_hist_get_predicted_internal(time_t now, int *need_uptime,
+                                    int *need_capacity);
+
+int any_predicted_circuits(time_t now);
+int rep_hist_circbuilding_dormant(time_t now);
+
+void note_crypto_pk_op(pk_op_t operation);
+void dump_pk_ops(int severity);
+
+void rep_hist_free_all(void);
+
+/* for hidden service usage statistics */
+void hs_usage_note_publish_total(const char *service_id, time_t now);
+void hs_usage_note_publish_novel(const char *service_id, time_t now);
+void hs_usage_note_fetch_total(const char *service_id, time_t now);
+void hs_usage_note_fetch_successful(const char *service_id, time_t now);
+void hs_usage_write_statistics_to_file(time_t now);
+void hs_usage_free_all(void);
+
+void rep_hist_buffer_stats_init(time_t now);
+void rep_hist_buffer_stats_add_circ(circuit_t *circ,
+                                    time_t end_of_interval);
+void rep_hist_buffer_stats_write(time_t now);
+
+#endif
+

src/or/router.c

@@ -20,6 +20,7 @@
 #include "main.h"
 #include "policies.h"
 #include "relay.h"
+#include "rephist.h"
 #include "router.h"
 #include "routerlist.h"
 

src/or/routerlist.c

@@ -26,6 +26,7 @@
 #include "policies.h"
 #include "rendcommon.h"
 #include "rendservice.h"
+#include "rephist.h"
 #include "router.h"
 #include "routerlist.h"
 

src/or/routerparse.c

@@ -20,6 +20,7 @@
 #include "memarea.h"
 #include "microdesc.h"
 #include "networkstatus.h"
+#include "rephist.h"
 #undef log
 #include <math.h>
 

src/test/test.c

@@ -55,6 +55,7 @@ double fabs(double x);
 #include "memarea.h"
 #include "onion.h"
 #include "policies.h"
+#include "rephist.h"
 
 #ifdef USE_DMALLOC
 #include <dmalloc.h>