aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2010-07-22 00:30:17 +0200
committerSebastian Hahn <sebastian@torproject.org>2010-07-27 07:56:26 +0200
commit85a1d635d5f15a49bda9f5e6588b0863d4b7b67d (patch)
tree56ad813c65baa5d0919a75a87f797c2070df2425
parent7caa8351b82c764203694dd18a33c17ba1b319e0 (diff)
downloadtor-85a1d635d5f15a49bda9f5e6588b0863d4b7b67d.tar.gz
tor-85a1d635d5f15a49bda9f5e6588b0863d4b7b67d.zip
Create rendservice.h
-rw-r--r--src/or/circuituse.c1
-rw-r--r--src/or/config.c1
-rw-r--r--src/or/connection_edge.c1
-rw-r--r--src/or/main.c1
-rw-r--r--src/or/or.h24
-rw-r--r--src/or/rendcommon.c1
-rw-r--r--src/or/rendservice.c1
-rw-r--r--src/or/rendservice.h38
-rw-r--r--src/or/routerlist.c1
9 files changed, 45 insertions, 24 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 5621e4fe7b..3bdd8acb14 100644
--- 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 b4d863700d..27bdf93679 100644
--- 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 4adb250ebf..44e366b60c 100644
--- 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 3bc282330a..4bd3b0a0fc 100644
--- 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 7c2bf077f6..ef2a303006 100644
--- 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 e4a2d61c3a..60f4d25c78 100644
--- 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 839d501f23..4fc031330b 100644
--- 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
index 0000000000..10874927e7
--- /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 02480af030..6beecac406 100644
--- 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"