Split rend_authorized_client_t and encoded_.._t into their own headers

diff --git a/src/or/control.c b/src/or/control.c
index 401135ca82477b17363ee4d2cf959f242a939e19..966ddfa8c59eecd25d35168f0681e84531f29f37 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -87,6 +87,8 @@
 #include "or_connection_st.h"
 #include "or_circuit_st.h"
 #include "origin_circuit_st.h"
+#include "rend_authorized_client_st.h"
+#include "rend_encoded_v2_service_descriptor_st.h"
 #include "rend_service_descriptor_st.h"
 
 #ifndef _WIN32

diff --git a/src/or/include.am b/src/or/include.am
index ede01c79e461ee6607f8315dfc531c44a1414eec..353d52ea2b97faa31b4d1e5c2d2e58c43fd82c29 100644 (file)
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -279,6 +279,8 @@ ORHEADERS = \
        src/or/rendcommon.h                             \
        src/or/rendmid.h                                \
        src/or/rendservice.h                            \
+       src/or/rend_authorized_client_st.h              \
+       src/or/rend_encoded_v2_service_descriptor_st.h  \
        src/or/rend_intro_point_st.h                    \
        src/or/rend_service_descriptor_st.h             \
        src/or/rephist.h                                \

diff --git a/src/or/or.h b/src/or/or.h
index 41953806ac2b8ab7a3aabacf0a7e280451880f54..d390c47bf0b22293709607bd44719e8ada005263 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4038,18 +4038,9 @@ typedef enum {
 
 /********************************* rendcommon.c ***************************/
 
-/** Hidden-service side configuration of client authorization. */
-typedef struct rend_authorized_client_t {
-  char *client_name;
-  uint8_t descriptor_cookie[REND_DESC_COOKIE_LEN];
-  crypto_pk_t *client_key;
-} rend_authorized_client_t;
-
-/** ASCII-encoded v2 hidden service descriptor. */
-typedef struct rend_encoded_v2_service_descriptor_t {
-  char desc_id[DIGEST_LEN]; /**< Descriptor ID. */
-  char *desc_str; /**< Descriptor string. */
-} rend_encoded_v2_service_descriptor_t;
+typedef struct rend_authorized_client_t rend_authorized_client_t;
+typedef struct rend_encoded_v2_service_descriptor_t
+               rend_encoded_v2_service_descriptor_t;
 
 /** The maximum number of non-circuit-build-timeout failures a hidden
  * service client will tolerate while trying to build a circuit to an

diff --git a/src/or/rend_authorized_client_st.h b/src/or/rend_authorized_client_st.h
new file mode 100644 (file)
index 0000000..e06620f
--- /dev/null
+++ b/src/or/rend_authorized_client_st.h
@@ -0,0 +1,18 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2017, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+#ifndef REND_AUTHORIZED_CLIENT_ST_H
+#define REND_AUTHORIZED_CLIENT_ST_H
+
+/** Hidden-service side configuration of client authorization. */
+struct rend_authorized_client_t {
+  char *client_name;
+  uint8_t descriptor_cookie[REND_DESC_COOKIE_LEN];
+  crypto_pk_t *client_key;
+};
+
+#endif
+

diff --git a/src/or/rend_encoded_v2_service_descriptor_st.h b/src/or/rend_encoded_v2_service_descriptor_st.h
new file mode 100644 (file)
index 0000000..05176eb
--- /dev/null
+++ b/src/or/rend_encoded_v2_service_descriptor_st.h
@@ -0,0 +1,17 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2017, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+#ifndef REND_ENCODED_V2_SERVICE_DESCRIPTOR_ST_H
+#define REND_ENCODED_V2_SERVICE_DESCRIPTOR_ST_H
+
+/** ASCII-encoded v2 hidden service descriptor. */
+struct rend_encoded_v2_service_descriptor_t {
+  char desc_id[DIGEST_LEN]; /**< Descriptor ID. */
+  char *desc_str; /**< Descriptor string. */
+};
+
+#endif
+

diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 2494311cb575839a17de838aee529dd6649f7a14..0ab42fb4269a8289d077c79f3d4cb8b2628144f5 100644 (file)
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -34,6 +34,7 @@
 #include "cpath_build_state_st.h"
 #include "crypt_path_st.h"
 #include "origin_circuit_st.h"
+#include "rend_encoded_v2_service_descriptor_st.h"
 #include "rend_intro_point_st.h"
 #include "rend_service_descriptor_st.h"
 

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index d82ea4789e33e2449fac1c1e937569b33c713e00..4a8b7a0e158c686095f1fbcb3c70c0ae3f1cc5b8 100644 (file)
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -41,6 +41,8 @@
 #include "crypt_path_reference_st.h"
 #include "edge_connection_st.h"
 #include "origin_circuit_st.h"
+#include "rend_authorized_client_st.h"
+#include "rend_encoded_v2_service_descriptor_st.h"
 #include "rend_intro_point_st.h"
 #include "rend_service_descriptor_st.h"
 

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 20a6f85a4273c587ffaf1d0c80c5ed52994d4782..e75dc2ee974a047652bb2e654bdf897c24bbf509 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -81,6 +81,7 @@
 
 #include "dirauth/dirvote.h"
 
+#include "rend_authorized_client_st.h"
 #include "rend_intro_point_st.h"
 #include "rend_service_descriptor_st.h"
 #include "tor_version_st.h"

diff --git a/src/test/test.c b/src/test/test.c
index 4476319a4bd3156f4f21f4517d53883d3882d99d..871498aa010f1260d37444c514531517e8546d4a 100644 (file)
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -63,6 +63,7 @@ double fabs(double x);
 #include "crypto_curve25519.h"
 
 #include "or_circuit_st.h"
+#include "rend_encoded_v2_service_descriptor_st.h"
 #include "rend_intro_point_st.h"
 #include "rend_service_descriptor_st.h"
 

diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c
index 188735a5420817c9c1e5ca37fa378f27cc1f40de..ff9740b91115b85628df166217660f1c574f2b8a 100644 (file)
--- a/src/test/test_dir_handle_get.c
+++ b/src/test/test_dir_handle_get.c
@@ -36,6 +36,7 @@
 
 #include "dir_connection_st.h"
 #include "dir_server_st.h"
+#include "rend_encoded_v2_service_descriptor_st.h"
 
 #ifdef _WIN32
 /* For mkdir() */

diff --git a/src/test/test_hs.c b/src/test/test_hs.c
index 0505285f3d43741c07fbf731d99d8a3587b2a347..9343d131f2f655192f5b966b9550c3aa6928e3a3 100644 (file)
--- a/src/test/test_hs.c
+++ b/src/test/test_hs.c
@@ -22,6 +22,7 @@
 #include "routerset.h"
 #include "circuitbuild.h"
 
+#include "rend_encoded_v2_service_descriptor_st.h"
 #include "rend_intro_point_st.h"
 
 #include "test_helpers.h"

diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c
index b4b76df882d3fda2cc643264b5424978a8a0e3d3..e5d5316179b0eb23de10c4dd6797b346cca1f264 100644 (file)
--- a/src/test/test_rendcache.c
+++ b/src/test/test_rendcache.c
@@ -12,6 +12,7 @@
 #include "config.h"
 #include "hs_common.h"
 
+#include "rend_encoded_v2_service_descriptor_st.h"
 #include "rend_intro_point_st.h"
 #include "rend_service_descriptor_st.h"