Create rendclient.h

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 2de5b4e901546e8408e72ed43d35f57b82765b68..b1272dd7f1ecb4fb2178e5bada45d63e281be321 100644 (file)
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -10,6 +10,7 @@
  **/
 
 #include "or.h"
+#include "rendclient.h"
 #include "rendcommon.h"
 #include "routerlist.h"
 #include "ht.h"

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

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

diff --git a/src/or/connection.c b/src/or/connection.c
index 2a3cdab8cf31e9f3bd893e7810b1a6bd0a4a964b..e8b78eab54791277dc17f4e1944806e8212131a3 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -13,6 +13,7 @@
 #include "or.h"
 #include "dnsserv.h"
 #include "geoip.h"
+#include "rendclient.h"
 #include "rendcommon.h"
 #include "router.h"
 

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

diff --git a/src/or/directory.c b/src/or/directory.c
index d81a3db7047f90e864be944fa9e10ff96066b91a..d1bb78f20f60e564f95b5f790261441ac403c459 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -5,6 +5,7 @@
 
 #include "or.h"
 #include "geoip.h"
+#include "rendclient.h"
 #include "rendcommon.h"
 #include "router.h"
 #include "routerlist.h"

diff --git a/src/or/main.c b/src/or/main.c
index 12f1c9eaa47572f49c98bb21ddb136b2ffd54f1a..3bc282330a5b0b4539cd1c74ab500edd4cada9c3 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -14,6 +14,7 @@
 #include "or.h"
 #include "dnsserv.h"
 #include "geoip.h"
+#include "rendclient.h"
 #include "rendcommon.h"
 #include "router.h"
 #include "routerlist.h"

diff --git a/src/or/or.h b/src/or/or.h
index d1c15e2d12406c62e186dfe45d588b2d7e0c1832..7c2bf077f6cb3eccae991a2f8f13eb0460e1d804 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4612,32 +4612,6 @@ void rep_hist_buffer_stats_add_circ(circuit_t *circ,
                                     time_t end_of_interval);
 void rep_hist_buffer_stats_write(time_t now);
 
-/********************************* rendclient.c ***************************/
-
-void rend_client_introcirc_has_opened(origin_circuit_t *circ);
-void rend_client_rendcirc_has_opened(origin_circuit_t *circ);
-int rend_client_introduction_acked(origin_circuit_t *circ, const char *request,
-                                   size_t request_len);
-void rend_client_refetch_v2_renddesc(const rend_data_t *rend_query);
-int rend_client_remove_intro_point(extend_info_t *failed_intro,
-                                   const rend_data_t *rend_query);
-int rend_client_rendezvous_acked(origin_circuit_t *circ, const char *request,
-                                 size_t request_len);
-int rend_client_receive_rendezvous(origin_circuit_t *circ, const char *request,
-                                   size_t request_len);
-void rend_client_desc_trynow(const char *query);
-
-extend_info_t *rend_client_get_random_intro(const rend_data_t *rend_query);
-
-int rend_client_send_introduction(origin_circuit_t *introcirc,
-                                  origin_circuit_t *rendcirc);
-int rend_parse_service_authorization(or_options_t *options,
-                                     int validate_only);
-rend_service_authorization_t *rend_client_lookup_service_authorization(
-                                                const char *onion_address);
-void rend_service_authorization_free_all(void);
-rend_data_t *rend_data_dup(const rend_data_t *request);
-
 /********************************* rendcommon.c ***************************/
 
 /** Hidden-service side configuration of client authorization. */

diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 880182f90a4b465c81ea4fed1a4aec120c84f2d7..2313dcefd2c2066fd891f6fc8873c29f8c3dc19c 100644 (file)
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -8,6 +8,7 @@
  **/
 
 #include "or.h"
+#include "rendclient.h"
 #include "rendcommon.h"
 #include "routerlist.h"
 

diff --git a/src/or/rendclient.h b/src/or/rendclient.h
new file mode 100644 (file)
index 0000000..4e6587b
--- /dev/null
+++ b/src/or/rendclient.h
@@ -0,0 +1,40 @@
+/* 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 rendclient.h
+ * \brief Header file for client rend functions
+ **/
+
+#ifndef _TOR_RENDCLIENT_H
+#define _TOR_RENDCLIENT_H
+
+void rend_client_introcirc_has_opened(origin_circuit_t *circ);
+void rend_client_rendcirc_has_opened(origin_circuit_t *circ);
+int rend_client_introduction_acked(origin_circuit_t *circ, const char *request,
+                                   size_t request_len);
+void rend_client_refetch_v2_renddesc(const rend_data_t *rend_query);
+int rend_client_remove_intro_point(extend_info_t *failed_intro,
+                                   const rend_data_t *rend_query);
+int rend_client_rendezvous_acked(origin_circuit_t *circ, const char *request,
+                                 size_t request_len);
+int rend_client_receive_rendezvous(origin_circuit_t *circ, const char *request,
+                                   size_t request_len);
+void rend_client_desc_trynow(const char *query);
+
+extend_info_t *rend_client_get_random_intro(const rend_data_t *rend_query);
+
+int rend_client_send_introduction(origin_circuit_t *introcirc,
+                                  origin_circuit_t *rendcirc);
+int rend_parse_service_authorization(or_options_t *options,
+                                     int validate_only);
+rend_service_authorization_t *rend_client_lookup_service_authorization(
+                                                const char *onion_address);
+void rend_service_authorization_free_all(void);
+rend_data_t *rend_data_dup(const rend_data_t *request);
+
+#endif
+

diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 891973dfc9884925a7e13349d1b6764d017e8197..e4a2d61c3a413d2e8ac4e19d627f26b26877c5a2 100644 (file)
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -9,6 +9,7 @@
  **/
 
 #include "or.h"
+#include "rendclient.h"
 #include "rendcommon.h"
 #include "routerlist.h"
 

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