hs: Stub link_specifier_t in hs_descriptor.h

Avoid including a huge trunnel interface everytime we include hs_descriptor.h

Signed-off-by: David Goulet <dgoulet@torproject.org>

diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c
index 71f16fee1a5a73740a6b5fcebaac28d716944e8c..b9233c6d7c0c0848ae65675b1f7bd7b7731f39d8 100644 (file)
--- a/src/or/hs_descriptor.c
+++ b/src/or/hs_descriptor.c
@@ -55,11 +55,10 @@
 /* For unit tests.*/
 #define HS_DESCRIPTOR_PRIVATE
 
-#include "hs_descriptor.h"
-
 #include "or.h"
-#include "circuitbuild.h"
 #include "ed25519_cert.h" /* Trunnel interface. */
+#include "hs_descriptor.h"
+#include "circuitbuild.h"
 #include "parsecommon.h"
 #include "rendcache.h"
 #include "hs_cache.h"

diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h
index b4cda7b8454dfe69d7b5e0a21884ca7ebf188ac7..eeeb3e38a40baf41a9837aeaf7c8fe7d0b2f936a 100644 (file)
--- a/src/or/hs_descriptor.h
+++ b/src/or/hs_descriptor.h
@@ -19,7 +19,7 @@
 #include "torcert.h"
 
 /* Trunnel */
-#include "ed25519_cert.h"
+struct link_specifier_t;
 
 /* The earliest descriptor format version we support. */
 #define HS_DESC_SUPPORTED_FORMAT_VERSION_MIN 3