Move extend_info_t into its own header.

diff --git a/src/or/bridges.c b/src/or/bridges.c
index 013c45cd53b489cf88d15b3bf593d2f149afe1ee..793f292a542ddb0586d15e5586f5b3a71e4b070b 100644 (file)
--- a/src/or/bridges.c
+++ b/src/or/bridges.c
@@ -27,6 +27,7 @@
 #include "routerset.h"
 #include "transports.h"
 
+#include "extend_info_st.h"
 #include "node_st.h"
 #include "routerinfo_st.h"
 #include "routerstatus_st.h"

diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index e2b6cabd46cef3b8bc528d1478f2a71fbed3bee0..c345364cde88a4a1078fef38367a4f620a78c691 100644 (file)
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -62,6 +62,7 @@
 
 #include "cell_st.h"
 #include "cell_queue_st.h"
+#include "extend_info_st.h"
 #include "or_connection_st.h"
 #include "or_handshake_certs_st.h"
 #include "or_handshake_state_st.h"

diff --git a/src/or/circpathbias.c b/src/or/circpathbias.c
index a36d67526d8d28c8976b90a4148a05182394086a..6586fe4472eb50881757ea487143dd53c1b21e32 100644 (file)
--- a/src/or/circpathbias.c
+++ b/src/or/circpathbias.c
@@ -38,6 +38,7 @@
 #include "cell_st.h"
 #include "cpath_build_state_st.h"
 #include "crypt_path_st.h"
+#include "extend_info_st.h"
 #include "origin_circuit_st.h"
 
 static void pathbias_count_successful_close(origin_circuit_t *circ);

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 41afb75439c5c1c70998329d716068e88d30d4b2..dfe293d4e722999ee1df99abfa98808f743cb3fd 100644 (file)
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -68,6 +68,7 @@
 #include "cell_st.h"
 #include "cpath_build_state_st.h"
 #include "entry_connection_st.h"
+#include "extend_info_st.h"
 #include "node_st.h"
 #include "or_circuit_st.h"
 #include "origin_circuit_st.h"

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 46974aea433b428cecaa1059f22246510d15f8a8..95463fde38ac53301c84b48038ea13bc2dc53474 100644 (file)
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -96,6 +96,7 @@
 #include "crypt_path_reference_st.h"
 #include "dir_connection_st.h"
 #include "edge_connection_st.h"
+#include "extend_info_st.h"
 #include "or_circuit_st.h"
 #include "origin_circuit_st.h"
 

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 370e2c0b74eccc3ade1fffcc104e4c4c7fc799dd..60ffe95b1b353de2ba2c1afb24ff5117c8cb8ad8 100644 (file)
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -60,6 +60,7 @@
 #include "cpath_build_state_st.h"
 #include "dir_connection_st.h"
 #include "entry_connection_st.h"
+#include "extend_info_st.h"
 #include "or_circuit_st.h"
 #include "origin_circuit_st.h"
 #include "socks_request_st.h"

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 4f1b5d2d58f9c1c8d8abb340af0164cdccbdcffa..7ceb97e7cca6a38febb1957a7cc3ef08415f12de 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -101,6 +101,7 @@
 #include "cpath_build_state_st.h"
 #include "dir_connection_st.h"
 #include "entry_connection_st.h"
+#include "extend_info_st.h"
 #include "node_st.h"
 #include "or_circuit_st.h"
 #include "origin_circuit_st.h"

diff --git a/src/or/extend_info_st.h b/src/or/extend_info_st.h
new file mode 100644 (file)
index 0000000..42c638d
--- /dev/null
+++ b/src/or/extend_info_st.h
@@ -0,0 +1,28 @@
+/* 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 EXTEND_INFO_ST_H
+#define EXTEND_INFO_ST_H
+
+/** Information on router used when extending a circuit. We don't need a
+ * full routerinfo_t to extend: we only need addr:port:keyid to build an OR
+ * connection, and onion_key to create the onionskin. Note that for onehop
+ * general-purpose tunnels, the onion_key is NULL. */
+struct extend_info_t {
+  char nickname[MAX_HEX_NICKNAME_LEN+1]; /**< This router's nickname for
+                                          * display. */
+  /** Hash of this router's RSA identity key. */
+  char identity_digest[DIGEST_LEN];
+  /** Ed25519 identity for this router, if any. */
+  ed25519_public_key_t ed_identity;
+  uint16_t port; /**< OR port. */
+  tor_addr_t addr; /**< IP address. */
+  crypto_pk_t *onion_key; /**< Current onionskin key. */
+  curve25519_public_key_t curve25519_onion_key;
+};
+
+#endif
+

diff --git a/src/or/hs_client.c b/src/or/hs_client.c
index 18276bfb84e40b87fe21efc2e10e62f90912be97..2237699bc748595d4fc959956ea494c1b0cdeac1 100644 (file)
--- a/src/or/hs_client.c
+++ b/src/or/hs_client.c
@@ -38,6 +38,7 @@
 #include "cpath_build_state_st.h"
 #include "dir_connection_st.h"
 #include "entry_connection_st.h"
+#include "extend_info_st.h"
 #include "origin_circuit_st.h"
 
 /* Return a human-readable string for the client fetch status code. */

diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c
index 096122392dc9f2bdd8d7201fa107f5da88ce954c..bda4dd64b759915e258c9fcb419954ce1835a468 100644 (file)
--- a/src/or/hs_descriptor.c
+++ b/src/or/hs_descriptor.c
@@ -67,6 +67,8 @@
 #include "hs_config.h"
 #include "torcert.h" /* tor_cert_encode_ed22519() */
 
+#include "extend_info_st.h"
+
 /* Constant string value used for the descriptor format. */
 #define str_hs_desc "hs-descriptor"
 #define str_desc_cert "descriptor-signing-key-cert"

diff --git a/src/or/hs_service.c b/src/or/hs_service.c
index ef809a69f4b10509748c7c081a520db80ed95eac..46fb3bf6827006889ff2cd22587fa790c974b80b 100644 (file)
--- a/src/or/hs_service.c
+++ b/src/or/hs_service.c
@@ -41,6 +41,7 @@
 
 #include "dir_connection_st.h"
 #include "edge_connection_st.h"
+#include "extend_info_st.h"
 #include "networkstatus_st.h"
 #include "node_st.h"
 #include "origin_circuit_st.h"

diff --git a/src/or/include.am b/src/or/include.am
index ec8e2755621bddb454f279acbd1e177ddf7edf15..06e61e00d0a1a42094e825b2f53b5711406e8fab 100644 (file)
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -230,6 +230,7 @@ ORHEADERS = \
        src/or/entry_connection_st.h                    \
        src/or/entry_port_cfg_st.h                      \
        src/or/ext_orport.h                             \
+       src/or/extend_info_st.h                         \
        src/or/extrainfo_st.h                           \
        src/or/fallback_dirs.inc                        \
        src/or/fp_pair.h                                \

diff --git a/src/or/onion.c b/src/or/onion.c
index ac2f40a55378f2c209e9518bde1589f79d86f8eb..c84cb13ade5e01dead6b8551924eb500102bbf06 100644 (file)
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -78,6 +78,7 @@
 #include "router.h"
 
 #include "cell_st.h"
+#include "extend_info_st.h"
 #include "or_circuit_st.h"
 
 // trunnel

diff --git a/src/or/or.h b/src/or/or.h
index 66c863a828f503b74c8d96c9abe7ea4919cdd03c..b164cf0e7f25b3ef42dce31b964d8489ef6eeb0d 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1502,24 +1502,7 @@ typedef enum store_type_t {
 
 typedef struct desc_store_t desc_store_t;
 typedef struct routerlist_t routerlist_t;
-
-/** Information on router used when extending a circuit. We don't need a
- * full routerinfo_t to extend: we only need addr:port:keyid to build an OR
- * connection, and onion_key to create the onionskin. Note that for onehop
- * general-purpose tunnels, the onion_key is NULL. */
-typedef struct extend_info_t {
-  char nickname[MAX_HEX_NICKNAME_LEN+1]; /**< This router's nickname for
-                                          * display. */
-  /** Hash of this router's RSA identity key. */
-  char identity_digest[DIGEST_LEN];
-  /** Ed25519 identity for this router, if any. */
-  ed25519_public_key_t ed_identity;
-  uint16_t port; /**< OR port. */
-  tor_addr_t addr; /**< IP address. */
-  crypto_pk_t *onion_key; /**< Current onionskin key. */
-  curve25519_public_key_t curve25519_onion_key;
-} extend_info_t;
-
+typedef struct extend_info_t extend_info_t;
 typedef struct authority_cert_t authority_cert_t;
 
 /** Bitfield enum type listing types of information that directory authorities

diff --git a/src/or/relay.c b/src/or/relay.c
index 62c9204dbec020e2fb40fdbf7a2f9262dd234f7a..6af7c8d1d6e6f0652031806b2f67626fa6a683e5 100644 (file)
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -88,6 +88,7 @@
 #include "dir_connection_st.h"
 #include "destroy_cell_queue_st.h"
 #include "entry_connection_st.h"
+#include "extend_info_st.h"
 #include "or_circuit_st.h"
 #include "origin_circuit_st.h"
 #include "routerinfo_st.h"

diff --git a/src/or/rendcache.c b/src/or/rendcache.c
index 093cbe7ce21a622eefcc5df7ea5d2cf6466de7ed..196ae9ad1ae949c97648a3a2a530568b533cdfbe 100644 (file)
--- a/src/or/rendcache.c
+++ b/src/or/rendcache.c
@@ -15,6 +15,7 @@
 #include "routerparse.h"
 #include "rendcommon.h"
 
+#include "extend_info_st.h"
 #include "rend_intro_point_st.h"
 #include "rend_service_descriptor_st.h"
 

diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 3236127852c371ea01eedea9178b4bfe4721c258..4154030b8fec9018058eee8ae95d99f16baa2b47 100644 (file)
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -37,6 +37,7 @@
 #include "crypt_path_st.h"
 #include "dir_connection_st.h"
 #include "entry_connection_st.h"
+#include "extend_info_st.h"
 #include "origin_circuit_st.h"
 #include "rend_intro_point_st.h"
 #include "rend_service_descriptor_st.h"

diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 9049699465c173fd73366cf82d2421458a9edebd..80cb79846691e981c46b1ffdec8ca891a50d2360 100644 (file)
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -33,6 +33,7 @@
 
 #include "cpath_build_state_st.h"
 #include "crypt_path_st.h"
+#include "extend_info_st.h"
 #include "networkstatus_st.h"
 #include "origin_circuit_st.h"
 #include "rend_encoded_v2_service_descriptor_st.h"

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 170d78147a7f4c96ce70974a68fdc6201822d25e..e207707e931ba064726e51f37de5aefc26fcf970 100644 (file)
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -40,6 +40,7 @@
 #include "crypt_path_st.h"
 #include "crypt_path_reference_st.h"
 #include "edge_connection_st.h"
+#include "extend_info_st.h"
 #include "networkstatus_st.h"
 #include "origin_circuit_st.h"
 #include "rend_authorized_client_st.h"

diff --git a/src/or/router.c b/src/or/router.c
index ddbfb03135d8433a477fce3f0b050cae55bc21f2..614860f611b23d0057d068baef9f4d4483b023d6 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -43,6 +43,7 @@
 #include "crypt_path_st.h"
 #include "dir_connection_st.h"
 #include "dir_server_st.h"
+#include "extend_info_st.h"
 #include "extrainfo_st.h"
 #include "node_st.h"
 #include "origin_circuit_st.h"

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 040745f651f2c679d98101d53408fda43f2aa438..31c545edf46d22ab892e7a7c4fd301de291b0cac 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -83,6 +83,7 @@
 
 #include "authority_cert_st.h"
 #include "document_signature_st.h"
+#include "extend_info_st.h"
 #include "extrainfo_st.h"
 #include "microdesc_st.h"
 #include "networkstatus_st.h"

diff --git a/src/or/routerset.c b/src/or/routerset.c
index 415fa0ce7c66a1749034bf124e51952e4b1f89a0..6da1c201b7c31e2be06561664413ba8798ae668d 100644 (file)
--- a/src/or/routerset.c
+++ b/src/or/routerset.c
@@ -36,6 +36,7 @@
 #include "routerparse.h"
 #include "routerset.h"
 
+#include "extend_info_st.h"
 #include "node_st.h"
 #include "routerinfo_st.h"
 #include "routerstatus_st.h"

diff --git a/src/test/rend_test_helpers.c b/src/test/rend_test_helpers.c
index fb2e4cf50b597d5daeeb773bda277c5e6414bfca..ec252c39b3f8495d004f2f040af9488936c1e723 100644 (file)
--- a/src/test/rend_test_helpers.c
+++ b/src/test/rend_test_helpers.c
@@ -7,6 +7,7 @@
 #include "rendcommon.h"
 #include "rend_test_helpers.h"
 
+#include "extend_info_st.h"
 #include "rend_intro_point_st.h"
 #include "rend_service_descriptor_st.h"
 

diff --git a/src/test/test.c b/src/test/test.c
index 871498aa010f1260d37444c514531517e8546d4a..14456d8666207728f473551787b363ff396da64c 100644 (file)
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -62,6 +62,7 @@ double fabs(double x);
 #include "statefile.h"
 #include "crypto_curve25519.h"
 
+#include "extend_info_st.h"
 #include "or_circuit_st.h"
 #include "rend_encoded_v2_service_descriptor_st.h"
 #include "rend_intro_point_st.h"

diff --git a/src/test/test_circuitbuild.c b/src/test/test_circuitbuild.c
index a5282df69d9ab2db7c8d9e8830e339daa719c3dc..b09f7bf553d98aa4f7ed797ddcf9c240c0b61a71 100644 (file)
--- a/src/test/test_circuitbuild.c
+++ b/src/test/test_circuitbuild.c
@@ -12,6 +12,8 @@
 #include "config.h"
 #include "circuitbuild.h"
 
+#include "extend_info_st.h"
+
 /* Dummy nodes smartlist for testing */
 static smartlist_t dummy_nodes;
 /* Dummy exit extend_info for testing */

diff --git a/src/test/test_circuitstats.c b/src/test/test_circuitstats.c
index 9f6f4626da14c4748ff89bf1fe95c5efa4a04e50..b8056e0d1d5632d66672b8fb20af76de931d3b5f 100644 (file)
--- a/src/test/test_circuitstats.c
+++ b/src/test/test_circuitstats.c
@@ -19,6 +19,7 @@
 
 #include "cpath_build_state_st.h"
 #include "crypt_path_st.h"
+#include "extend_info_st.h"
 #include "origin_circuit_st.h"
 
 void test_circuitstats_timeout(void *arg);

diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c
index ca87d5e92dfce0bd4dac4d2b6ca4509585ca63c0..64c098dbb1fc6834af4376e76757287c82e1d83d 100644 (file)
--- a/src/test/test_hs_client.c
+++ b/src/test/test_hs_client.c
@@ -41,6 +41,7 @@
 #include "crypt_path_st.h"
 #include "dir_connection_st.h"
 #include "entry_connection_st.h"
+#include "extend_info_st.h"
 #include "networkstatus_st.h"
 #include "origin_circuit_st.h"
 #include "socks_request_st.h"

diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c
index 22af3473baa60f043854ca27adf098d0ca13868d..6bc8038281ea14616eda90bdaf9d7c0c4239ffc0 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 "extend_info_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_routerset.c b/src/test/test_routerset.c
index 004b88ac8320bee08a07530c61aafdfb2ebfc2e9..11a1ff2aff30bb2c15d404fce096dfcf1f7a430d 100644 (file)
--- a/src/test/test_routerset.c
+++ b/src/test/test_routerset.c
@@ -10,6 +10,7 @@
 #include "policies.h"
 #include "nodelist.h"
 
+#include "extend_info_st.h"
 #include "node_st.h"
 #include "routerinfo_st.h"
 #include "routerstatus_st.h"