aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/connection_edge.h
diff options
context:
space:
mode:
authorAlexander Færøy <ahf@torproject.org>2018-09-15 16:33:31 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2018-09-15 16:52:36 +0300
commit9b511dc5d6a9e44bd8c8c644ad9445cab7cdafe2 (patch)
tree9bfd824f5f790295477178ebe45232213ce042d2 /src/core/or/connection_edge.h
parent8f085841ef40f00bbc2bb146a2d555aba527738f (diff)
downloadtor-9b511dc5d6a9e44bd8c8c644ad9445cab7cdafe2.tar.gz
tor-9b511dc5d6a9e44bd8c8c644ad9445cab7cdafe2.zip
Change HiddenServiceExportCircuitID to take a string parameter: the protocol.
This patch changes HiddenServiceExportCircuitID so instead of being a boolean it takes a string, which is the protocol. Currently only the 'haproxy' protocol is defined. See: https://bugs.torproject.org/4700
Diffstat (limited to 'src/core/or/connection_edge.h')
-rw-r--r--src/core/or/connection_edge.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/or/connection_edge.h b/src/core/or/connection_edge.h
index adec4998e8..c5ad3128a2 100644
--- a/src/core/or/connection_edge.h
+++ b/src/core/or/connection_edge.h
@@ -14,6 +14,8 @@
#include "lib/testsupport/testsupport.h"
+#include "feature/hs/hs_service.h"
+
edge_connection_t *TO_EDGE_CONN(connection_t *);
entry_connection_t *TO_ENTRY_CONN(connection_t *);
entry_connection_t *EDGE_TO_ENTRY_CONN(edge_connection_t *);
@@ -244,8 +246,10 @@ STATIC void connection_ap_handshake_rewrite(entry_connection_t *conn,
STATIC int connection_ap_process_http_connect(entry_connection_t *conn);
STATIC void
-export_hs_client_circuit_id_haproxy(const edge_connection_t *edge_conn,
- connection_t *conn);
+export_hs_client_circuit_id(const edge_connection_t *edge_conn,
+ connection_t *conn,
+ hs_circuit_id_protocol_t protocol);
+
#endif /* defined(CONNECTION_EDGE_PRIVATE) */
#endif /* !defined(TOR_CONNECTION_EDGE_H) */