Create rendservice.h

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 5621e4fe7b0854d37d0a39a60b3a95c6596eb065..3bdd8acb14556b2f776b3ff7b96226a8eb330d3b 100644 (file)
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -12,6 +12,7 @@
 #include "or.h"
 #include "rendclient.h"
 #include "rendcommon.h"
+#include "rendservice.h"
 #include "router.h"
 #include "routerlist.h"
 

diff --git a/src/or/config.c b/src/or/config.c
index b4d863700d677281e6b89aabceb41f8532e1a10a..27bdf93679fbe780f0acfb392e3c12ca2ae81d3f 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -14,6 +14,7 @@
 #include "or.h"
 #include "geoip.h"
 #include "rendclient.h"
+#include "rendservice.h"
 #include "router.h"
 #include "routerlist.h"
 #ifdef MS_WINDOWS

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 4adb250ebf7eabfc6efcd302de3453c4cba81d49..44e366b60ce233949e9eb3ebd0368db3d369416c 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -13,6 +13,7 @@
 #include "dnsserv.h"
 #include "rendclient.h"
 #include "rendcommon.h"
+#include "rendservice.h"
 #include "router.h"
 #include "routerlist.h"
 

diff --git a/src/or/main.c b/src/or/main.c
index 3bc282330a5b0b4539cd1c74ab500edd4cada9c3..4bd3b0a0fcb1bbdf56c8fc6fc05027529eb483e5 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -16,6 +16,7 @@
 #include "geoip.h"
 #include "rendclient.h"
 #include "rendcommon.h"
+#include "rendservice.h"
 #include "router.h"
 #include "routerlist.h"
 #ifdef USE_DMALLOC

diff --git a/src/or/or.h b/src/or/or.h
index 7c2bf077f6cb3eccae991a2f8f13eb0460e1d804..ef2a3030064dbffe03cafcb4b00291e8c9199f31 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4661,30 +4661,6 @@ typedef struct rend_cache_entry_t {
   rend_service_descriptor_t *parsed; /**< Parsed value of 'desc' */
 } rend_cache_entry_t;
 
-/********************************* rendservice.c ***************************/
-
-int num_rend_services(void);
-int rend_config_services(or_options_t *options, int validate_only);
-int rend_service_load_keys(void);
-void rend_services_init(void);
-void rend_services_introduce(void);
-void rend_consider_services_upload(time_t now);
-void rend_hsdir_routers_changed(void);
-void rend_consider_descriptor_republication(void);
-
-void rend_service_intro_has_opened(origin_circuit_t *circuit);
-int rend_service_intro_established(origin_circuit_t *circuit,
-                                   const char *request,
-                                   size_t request_len);
-void rend_service_rendezvous_has_opened(origin_circuit_t *circuit);
-int rend_service_introduce(origin_circuit_t *circuit, const char *request,
-                           size_t request_len);
-void rend_service_relaunch_rendezvous(origin_circuit_t *oldcirc);
-int rend_service_set_connection_addr_port(edge_connection_t *conn,
-                                          origin_circuit_t *circ);
-void rend_service_dump_stats(int severity);
-void rend_service_free_all(void);
-
 /********************************* rendmid.c *******************************/
 int rend_mid_establish_intro(or_circuit_t *circ, const char *request,
                              size_t request_len);

diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index e4a2d61c3a413d2e8ac4e19d627f26b26877c5a2..60f4d25c78ce3ec73fba4b4574e44586cfc26583 100644 (file)
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -11,6 +11,7 @@
 #include "or.h"
 #include "rendclient.h"
 #include "rendcommon.h"
+#include "rendservice.h"
 #include "routerlist.h"
 
 /** Return 0 if one and two are the same service ids, else -1 or 1 */

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 839d501f23667ea95e0b2e3398378e69ce414323..4fc031330b1225778aea86eed9dda33388f4bc89 100644 (file)
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -10,6 +10,7 @@
 #include "or.h"
 #include "rendclient.h"
 #include "rendcommon.h"
+#include "rendservice.h"
 #include "router.h"
 #include "routerlist.h"
 

diff --git a/src/or/rendservice.h b/src/or/rendservice.h
new file mode 100644 (file)
index 0000000..1087492
--- /dev/null
+++ b/src/or/rendservice.h
@@ -0,0 +1,38 @@
+/* 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 rendservice.h
+ * \brief Header file for rendservice functions
+ **/
+
+#ifndef _TOR_RENDSERVICE_H
+#define _TOR_RENDSERVICE_H
+
+int num_rend_services(void);
+int rend_config_services(or_options_t *options, int validate_only);
+int rend_service_load_keys(void);
+void rend_services_init(void);
+void rend_services_introduce(void);
+void rend_consider_services_upload(time_t now);
+void rend_hsdir_routers_changed(void);
+void rend_consider_descriptor_republication(void);
+
+void rend_service_intro_has_opened(origin_circuit_t *circuit);
+int rend_service_intro_established(origin_circuit_t *circuit,
+                                   const char *request,
+                                   size_t request_len);
+void rend_service_rendezvous_has_opened(origin_circuit_t *circuit);
+int rend_service_introduce(origin_circuit_t *circuit, const char *request,
+                           size_t request_len);
+void rend_service_relaunch_rendezvous(origin_circuit_t *oldcirc);
+int rend_service_set_connection_addr_port(edge_connection_t *conn,
+                                          origin_circuit_t *circ);
+void rend_service_dump_stats(int severity);
+void rend_service_free_all(void);
+
+#endif
+

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 02480af0305b7fe29e23ef18e0633f43a93bac0f..6beecac40650fe97acbbc12b94c4d5d3909b9f26 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -14,6 +14,7 @@
 #include "or.h"
 #include "geoip.h"
 #include "rendcommon.h"
+#include "rendservice.h"
 #include "router.h"
 #include "routerlist.h"