Create hibernate.h

diff --git a/src/or/command.c b/src/or/command.c
index 771dcc4c4a821391e7574f9718e029d076488cb4..796f75cde4eba9f1a5e431206bd396519a013921 100644 (file)
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "control.h"
 #include "cpuworker.h"
+#include "hibernate.h"
 #include "router.h"
 #include "routerlist.h"
 

diff --git a/src/or/config.c b/src/or/config.c
index eed14f2fe510c85f61abedddd21d0c11f34c7522..68710ee8c7ca0b65a54f44fcf2c15c8021e51564 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -23,6 +23,7 @@
 #include "dirvote.h"
 #include "dns.h"
 #include "geoip.h"
+#include "hibernate.h"
 #include "rendclient.h"
 #include "rendservice.h"
 #include "router.h"

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 0277b88d1bb0fdae81e0f38ce77b697338b91c6a..28ed9ad6294ea3cc49389ed7a534ced2a549e6b3 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -21,6 +21,7 @@
 #include "dns.h"
 #include "dnsserv.h"
 #include "dirserv.h"
+#include "hibernate.h"
 #include "rendclient.h"
 #include "rendcommon.h"
 #include "rendservice.h"

diff --git a/src/or/control.c b/src/or/control.c
index 9ad6dfd47c070416cbb4fa86886f8e5e8f8a3169..f8a3f20ec92ae6c52070d4de5b2046b876d84530 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -23,6 +23,7 @@
 #include "dirserv.h"
 #include "dnsserv.h"
 #include "geoip.h"
+#include "hibernate.h"
 #include "router.h"
 #include "routerlist.h"
 

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index b9fc489d553ae0d2a553f50024a29586c4f7c0a7..d3fe0a709457db8ee9b24f4dd0b0b1f70bff8147 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -13,6 +13,7 @@
 #include "directory.h"
 #include "dirserv.h"
 #include "dirvote.h"
+#include "hibernate.h"
 #include "router.h"
 #include "routerlist.h"
 

diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index cd7cdad3dfc3e4cd9d00984c99c91bc9023f9ca5..a30e25ee9c6e1b26754e810d2bac12c275fc77b3 100644 (file)
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -25,6 +25,7 @@ hibernating, phase 2:
 #include "config.h"
 #include "connection.h"
 #include "connection_edge.h"
+#include "hibernate.h"
 #include "router.h"
 
 /** Possible values of hibernate_state */

diff --git a/src/or/hibernate.h b/src/or/hibernate.h
new file mode 100644 (file)
index 0000000..8192ac5
--- /dev/null
+++ b/src/or/hibernate.h
@@ -0,0 +1,30 @@
+/* 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 hibernate.h
+ * \brief Header file for hibernate.c.
+ **/
+
+#ifndef _TOR_HIBERNATE_H
+#define _TOR_HIBERNATE_H
+
+int accounting_parse_options(or_options_t *options, int validate_only);
+int accounting_is_enabled(or_options_t *options);
+void configure_accounting(time_t now);
+void accounting_run_housekeeping(time_t now);
+void accounting_add_bytes(size_t n_read, size_t n_written, int seconds);
+int accounting_record_bandwidth_usage(time_t now, or_state_t *state);
+void hibernate_begin_shutdown(void);
+int we_are_hibernating(void);
+void consider_hibernation(time_t now);
+int getinfo_helper_accounting(control_connection_t *conn,
+                              const char *question, char **answer,
+                              const char **errmsg);
+void accounting_set_bandwidth_usage_from_state(or_state_t *state);
+
+#endif
+

diff --git a/src/or/main.c b/src/or/main.c
index d42cda27a0cf9291afd1db000832f7f8f6604828..d33072197ceaba24f2143660d051fdef3b72c3d8 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -29,6 +29,7 @@
 #include "dns.h"
 #include "dnsserv.h"
 #include "geoip.h"
+#include "hibernate.h"
 #include "rendclient.h"
 #include "rendcommon.h"
 #include "rendservice.h"

diff --git a/src/or/or.h b/src/or/or.h
index 828908e666d0051db3c162e15ee84171cbc67c4e..550331fce7de767cd34823198e112e56af9f92e3 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3268,22 +3268,6 @@ typedef enum {
   DIRREQ_OR_CONN_BUFFER_FLUSHED = 4
 } dirreq_state_t;
 
-/********************************* hibernate.c **********************/
-
-int accounting_parse_options(or_options_t *options, int validate_only);
-int accounting_is_enabled(or_options_t *options);
-void configure_accounting(time_t now);
-void accounting_run_housekeeping(time_t now);
-void accounting_add_bytes(size_t n_read, size_t n_written, int seconds);
-int accounting_record_bandwidth_usage(time_t now, or_state_t *state);
-void hibernate_begin_shutdown(void);
-int we_are_hibernating(void);
-void consider_hibernation(time_t now);
-int getinfo_helper_accounting(control_connection_t *conn,
-                              const char *question, char **answer,
-                              const char **errmsg);
-void accounting_set_bandwidth_usage_from_state(or_state_t *state);
-
 /********************************* main.c ***************************/
 
 extern int has_completed_circuit;

diff --git a/src/or/router.c b/src/or/router.c
index 44cffa4a36f42c539821fa4db89d7b2acaba95be..e4ffc2f21c1321cf062c9565a36bbcfab966c62c 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -16,6 +16,7 @@
 #include "dirserv.h"
 #include "dns.h"
 #include "geoip.h"
+#include "hibernate.h"
 #include "router.h"
 #include "routerlist.h"
 

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 85e2d14edc4cf975caa6a28636d3253275d0b9f5..0e42acfee0f81155a0cc1c241028537a0a3365f6 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -20,6 +20,7 @@
 #include "dirserv.h"
 #include "dirvote.h"
 #include "geoip.h"
+#include "hibernate.h"
 #include "rendcommon.h"
 #include "rendservice.h"
 #include "router.h"