Create rephist.h

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index b78845fdd6de9dc169059da04521d38f66cae1cb..fc3dbda13d0505d070db692d026c48187d541bfa 100644 (file)
--- a/src/or/circuitbuild.c
+++ b/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"

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index df4aec727b92a3da5af7936447d1b79086c16040..c581365f8b4e0197841f1dcee7ad326cb343a320 100644 (file)
--- a/src/or/circuitlist.c
+++ b/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"
 

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index b13e558d0796f6e464ab4d464b85802e3a85dfd6..a3f10a8841043da9863c0e524eff0df118475f24 100644 (file)
--- a/src/or/circuituse.c
+++ b/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"
 

diff --git a/src/or/config.c b/src/or/config.c
index 4fdf32e0ad1908d2faaf384d48d270074535bd7a..a4e4f89c1af67e312355a92b5d0c5d3ce7f23c22 100644 (file)
--- a/src/or/config.c
+++ b/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

diff --git a/src/or/connection.c b/src/or/connection.c
index d9aa1cf782e5c112d8bf0a91f29b89b2b7ad9186..02acd97e75fd2e8fd9a29de333af65bc7287aa1d 100644 (file)
--- a/src/or/connection.c
+++ b/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(

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 83ba230588ac4d49780cacf77c32f38378b9f9ad..7522368c562686395eace0be7774a642044f9aab 100644 (file)
--- a/src/or/connection_edge.c
+++ b/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"
 

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index bf19503d5ff80f7795d0fcc22f403c3fff1b267b..405df1578b50914796c8d4f2584a14c9d244a4ca 100644 (file)
--- a/src/or/connection_or.c
+++ b/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"
 

diff --git a/src/or/directory.c b/src/or/directory.c
index 1c13cbd3df9465d4fe812429943cf80ca45c9d11..c1e68bf4531885a781ee87a9541718a20b7d5243 100644 (file)
--- a/src/or/directory.c
+++ b/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"
 

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 38fc8f161ad3188cd06502c910d82aec96da58a7..397a0c866f291a57eae896af6217c048bc992619 100644 (file)
--- a/src/or/dirserv.c
+++ b/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"
 

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 7873e49e7ae91507e82c6f53e82173c8e6cefc8d..2448a6a19873b4a7f6483fb5ccd7fffbe398ea42 100644 (file)
--- a/src/or/dirvote.c
+++ b/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"
 

diff --git a/src/or/main.c b/src/or/main.c
index e202a109d506ea70fa933cec53bf0553e94e6632..92c60e7e8c0914b406154d883483b4df0f0582be 100644 (file)
--- a/src/or/main.c
+++ b/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

diff --git a/src/or/onion.c b/src/or/onion.c
index 1612d389de0946f6f3556ceffa4254661a9189e7..ebc35836485efa7625e1f2fafd7857edaa206e30 100644 (file)
--- a/src/or/onion.c
+++ b/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. */

diff --git a/src/or/or.h b/src/or/or.h
index 3e7fe23103df9315e6124c666983c0be15aa4214..f51da60f71cdabf0bed669ec40af793e51761a8f 100644 (file)
--- a/src/or/or.h
+++ b/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 ***************************/
 

diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 166d38da898b371d4ca4b17cfa1d8d7e280406d5..0377f121cca968a9da12151744538d0dc2b7416c 100644 (file)
--- a/src/or/rendclient.c
+++ b/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:

diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index fc43f11bb36153141c6c97a6ad3b6b2e1116733c..8a4de3cca6f6d61d3a6f20d090383a37f06e98e2 100644 (file)
--- a/src/or/rendcommon.c
+++ b/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 */

diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 48cb10f52e1e16b4ff1fe1a5d285415e031cef62..d392f8e53ab08349c8dddd028f6ea3491af0bddd 100644 (file)
--- a/src/or/rendmid.c
+++ b/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.

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 2c1c8cfde43f2ce31c71d0b3836416a8bd8c1a30..f7ab60dbf921bc0278c3aa07a6a66c17f9d4e9f9 100644 (file)
--- a/src/or/rendservice.c
+++ b/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,

diff --git a/src/or/rephist.c b/src/or/rephist.c
index 88ba83e3e5c63ce3a60554aa603aef01784d19f2..a419f31e77e98bc543dff5ab23893cd96f98f33e 100644 (file)
--- a/src/or/rephist.c
+++ b/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"

diff --git a/src/or/rephist.h b/src/or/rephist.h
new file mode 100644 (file)
index 0000000..1720c9a
--- /dev/null
+++ b/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
+

diff --git a/src/or/router.c b/src/or/router.c
index bf4256677962c4bb6db7289224174ca4319ea966..36e2d2608c5b8239e4d7a522bf077c6342d69954 100644 (file)
--- a/src/or/router.c
+++ b/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"
 

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 1fb3dbc404c517600bf65c756d273c5b4b21ae77..7f47e7128aa88f24d486ca1232d5717295332cf8 100644 (file)
--- a/src/or/routerlist.c
+++ b/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"
 

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 0662fd3a18d476ee7127dbe01240b1d5c004eb81..88fbdbf6c2d34bcc1f5e3722da34121a1ba3db52 100644 (file)
--- a/src/or/routerparse.c
+++ b/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>
 

diff --git a/src/test/test.c b/src/test/test.c
index b5c908a215f0c191aa95c64e68f26e06e525876b..8bb694dbaeac56757342312d3b08ff4d060c3348 100644 (file)
--- a/src/test/test.c
+++ b/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>