[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] [tor/master 24/40] Create hibernate.h
Author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
Date: Thu, 22 Jul 2010 12:30:46 +0200
Subject: Create hibernate.h
Commit: a86f464f6b04e2f592d3e8dcbd2b26414a36e971
---
src/or/command.c | 1 +
src/or/config.c | 1 +
src/or/connection_edge.c | 1 +
src/or/control.c | 1 +
src/or/dirserv.c | 1 +
src/or/hibernate.c | 1 +
src/or/hibernate.h | 30 ++++++++++++++++++++++++++++++
src/or/main.c | 1 +
src/or/or.h | 16 ----------------
src/or/router.c | 1 +
src/or/routerlist.c | 1 +
11 files changed, 39 insertions(+), 16 deletions(-)
create mode 100644 src/or/hibernate.h
diff --git a/src/or/command.c b/src/or/command.c
index 771dcc4..796f75c 100644
--- 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 eed14f2..68710ee 100644
--- 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 0277b88..28ed9ad 100644
--- 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 9ad6dfd..f8a3f20 100644
--- 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 b9fc489..d3fe0a7 100644
--- 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 cd7cdad..a30e25e 100644
--- 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
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 d42cda2..d330721 100644
--- 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 828908e..550331f 100644
--- 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 44cffa4..e4ffc2f 100644
--- 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 85e2d14..0e42acf 100644
--- 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"
--
1.7.1