relay: Rename relay_resolve_addr.{c|h} file

New name is more accurate semantically.

Closes #33789

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

8 files changed, 17 insertions, 17 deletions

diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c
index b2a39c6787..2bdc0ae151 100644
--- a/src/feature/client/transports.c
+++ b/src/feature/client/transports.c
@@ -97,7 +97,7 @@
 #include "core/or/circuitbuild.h"
 #include "feature/client/transports.h"
 #include "feature/relay/router.h"
-#include "feature/relay/relay_resolve_addr.h"
+#include "feature/relay/relay_find_addr.h"
 /* 31851: split the server transport code out of the client module */
 #include "feature/relay/transport_config.h"
 #include "app/config/statefile.h"
diff --git a/src/feature/control/control_getinfo.c b/src/feature/control/control_getinfo.c
index 673920c9b7..685deb8ecc 100644
--- a/src/feature/control/control_getinfo.c
+++ b/src/feature/control/control_getinfo.c
@@ -44,7 +44,7 @@
 #include "feature/nodelist/nodelist.h"
 #include "feature/nodelist/routerinfo.h"
 #include "feature/nodelist/routerlist.h"
-#include "feature/relay/relay_resolve_addr.h"
+#include "feature/relay/relay_find_addr.h"
 #include "feature/relay/router.h"
 #include "feature/relay/routermode.h"
 #include "feature/relay/selftest.h"
diff --git a/src/feature/dirclient/dirclient.c b/src/feature/dirclient/dirclient.c
index c80a6606a7..f590c1594c 100644
--- a/src/feature/dirclient/dirclient.c
+++ b/src/feature/dirclient/dirclient.c
@@ -44,7 +44,7 @@
 #include "feature/nodelist/routerinfo.h"
 #include "feature/nodelist/routerlist.h"
 #include "feature/nodelist/routerset.h"
-#include "feature/relay/relay_resolve_addr.h"
+#include "feature/relay/relay_find_addr.h"
 #include "feature/relay/routermode.h"
 #include "feature/relay/selftest.h"
 #include "feature/rend/rendcache.h"
diff --git a/src/feature/dirclient/dirclient_modes.c b/src/feature/dirclient/dirclient_modes.c
index b385a6e86c..31a3f8af58 100644
--- a/src/feature/dirclient/dirclient_modes.c
+++ b/src/feature/dirclient/dirclient_modes.c
@@ -16,7 +16,7 @@
 
 #include "feature/dirclient/dirclient_modes.h"
 #include "feature/dircache/dirserv.h"
-#include "feature/relay/relay_resolve_addr.h"
+#include "feature/relay/relay_find_addr.h"
 #include "feature/relay/router.h"
 #include "feature/relay/routermode.h"
 #include "feature/stats/predict_ports.h"
diff --git a/src/feature/relay/include.am b/src/feature/relay/include.am
index 2aa2985607..84bb1ff35e 100644
--- a/src/feature/relay/include.am
+++ b/src/feature/relay/include.am
@@ -2,7 +2,7 @@
 # Legacy shared relay code: migrate to the relay module over time
 LIBTOR_APP_A_SOURCES += 			\
 	src/feature/relay/onion_queue.c		\
-	src/feature/relay/relay_resolve_addr.c	\
+	src/feature/relay/relay_find_addr.c	\
 	src/feature/relay/router.c
 
 # The Relay module.
@@ -32,7 +32,7 @@ noinst_HEADERS +=					\
 	src/feature/relay/relay_handshake.h		\
 	src/feature/relay/relay_periodic.h		\
 	src/feature/relay/relay_sys.h			\
-	src/feature/relay/relay_resolve_addr.h		\
+	src/feature/relay/relay_find_addr.h		\
 	src/feature/relay/router.h			\
 	src/feature/relay/routerkeys.h			\
 	src/feature/relay/routermode.h			\
diff --git a/src/feature/relay/relay_resolve_addr.c b/src/feature/relay/relay_find_addr.c
index c929219d45..86cd799d42 100644
--- a/src/feature/relay/relay_resolve_addr.c
+++ b/src/feature/relay/relay_find_addr.c
@@ -2,8 +2,8 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file relay_resolve_addr.c
- * \brief Implement relay resolving address mechanism.
+ * \file relay_find_addr.c
+ * \brief Implement mechanism for a relay to find its address.
  **/
 
 #include "core/or/or.h"
@@ -15,7 +15,7 @@
 
 #include "feature/control/control_events.h"
 #include "feature/dircommon/dir_connection_st.h"
-#include "feature/relay/relay_resolve_addr.h"
+#include "feature/relay/relay_find_addr.h"
 #include "feature/relay/router.h"
 #include "feature/relay/routermode.h"
 
diff --git a/src/feature/relay/relay_resolve_addr.h b/src/feature/relay/relay_find_addr.h
index 1ead2baf7a..ac51a977e6 100644
--- a/src/feature/relay/relay_resolve_addr.h
+++ b/src/feature/relay/relay_find_addr.h
@@ -2,12 +2,12 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file relay_resolve_addr.h
- * \brief Header file for relay_resolve_addr.c.
+ * \file relay_find_addr.h
+ * \brief Header file for relay_find_addr.c.
  **/
 
-#ifndef TOR_RELAY_RESOLVE_ADDR_H
-#define TOR_RELAY_RESOLVE_ADDR_H
+#ifndef TOR_RELAY_FIND_ADDR_H
+#define TOR_RELAY_FIND_ADDR_H
 
 MOCK_DECL(int, router_pick_published_address,
           (const or_options_t *options, uint32_t *addr, int cache_only));
@@ -15,9 +15,9 @@ MOCK_DECL(int, router_pick_published_address,
 void router_new_address_suggestion(const char *suggestion,
                                    const dir_connection_t *d_conn);
 
-#ifdef RELAY_RESOLVE_ADDR_PRIVATE
+#ifdef RELAY_FIND_ADDR_PRIVATE
 
-#endif /* RELAY_RESOLVE_ADDR_PRIVATE */
+#endif /* RELAY_FIND_ADDR_PRIVATE */
 
-#endif /* TOR_RELAY_RESOLVE_ADDR_H */
+#endif /* TOR_RELAY_FIND_ADDR_H */
 
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index e20e7709e9..267dee8483 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -37,7 +37,7 @@
 #include "feature/nodelist/torcert.h"
 #include "feature/relay/dns.h"
 #include "feature/relay/relay_config.h"
-#include "feature/relay/relay_resolve_addr.h"
+#include "feature/relay/relay_find_addr.h"
 #include "feature/relay/router.h"
 #include "feature/relay/routerkeys.h"
 #include "feature/relay/routermode.h"