Create cpuworker.h

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

diff --git a/src/or/config.c b/src/or/config.c
index 2a1f2822fb2bfecf0ba8c5f194b440509434ec05..3f18984f00ef3b86fd2757ef43148e11c3fcc773 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -18,6 +18,7 @@
 #include "connection.h"
 #include "connection_edge.h"
 #include "control.h"
+#include "cpuworker.h"
 #include "geoip.h"
 #include "rendclient.h"
 #include "rendservice.h"

diff --git a/src/or/connection.c b/src/or/connection.c
index ae81ae0419e8d793449fdefd638869d822a07c36..ac8123cf37f68f7188caee1f86e4e5c8709993b1 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -20,6 +20,7 @@
 #include "connection_edge.h"
 #include "connection_or.h"
 #include "control.h"
+#include "cpuworker.h"
 #include "dnsserv.h"
 #include "geoip.h"
 #include "rendclient.h"

diff --git a/src/or/cpuworker.h b/src/or/cpuworker.h
new file mode 100644 (file)
index 0000000..e09703f
--- /dev/null
+++ b/src/or/cpuworker.h
@@ -0,0 +1,25 @@
+/* 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 cpuworker.h
+ * \brief Header file for cpuworker.c.
+ **/
+
+#ifndef _TOR_CPUWORKER_H
+#define _TOR_CPUWORKER_H
+
+void cpu_init(void);
+void cpuworkers_rotate(void);
+int connection_cpu_finished_flushing(connection_t *conn);
+int connection_cpu_reached_eof(connection_t *conn);
+int connection_cpu_process_inbuf(connection_t *conn);
+int assign_onionskin_to_cpuworker(connection_t *cpuworker,
+                                  or_circuit_t *circ,
+                                  char *onionskin);
+
+#endif
+

diff --git a/src/or/main.c b/src/or/main.c
index 63848639e971d4a3349815f2791f37a08af4b2c8..46ab044c34f382baea43cede0a17985dc6287e6c 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -22,6 +22,7 @@
 #include "connection_edge.h"
 #include "connection_or.h"
 #include "control.h"
+#include "cpuworker.h"
 #include "dnsserv.h"
 #include "geoip.h"
 #include "rendclient.h"

diff --git a/src/or/or.h b/src/or/or.h
index 91509eab02c2bb700e78ae3262b4f3dae1b6cc97..f38567f539ffb49e5281d8d007381ee9ca95abb4 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3164,17 +3164,6 @@ typedef enum {
   BOOTSTRAP_STATUS_DONE=100
 } bootstrap_status_t;
 
-/********************************* cpuworker.c *****************************/
-
-void cpu_init(void);
-void cpuworkers_rotate(void);
-int connection_cpu_finished_flushing(connection_t *conn);
-int connection_cpu_reached_eof(connection_t *conn);
-int connection_cpu_process_inbuf(connection_t *conn);
-int assign_onionskin_to_cpuworker(connection_t *cpuworker,
-                                  or_circuit_t *circ,
-                                  char *onionskin);
-
 /********************************* directory.c ***************************/
 
 int directories_have_accepted_server_descriptor(void);