[tor-commits] [tor/master] relay: Rename relay_resolve_addr.{c|h} file
nickm at torproject.org
nickm at torproject.org
Thu May 7 12:31:37 UTC 2020
commit c81c5a2646763c651a9bc17b6213bd25a480eca9
Author: David Goulet <dgoulet at torproject.org>
Date: Tue May 5 15:34:58 2020 -0400
relay: Rename relay_resolve_addr.{c|h} file
New name is more accurate semantically.
Closes #33789
Signed-off-by: David Goulet <dgoulet at torproject.org>
---
src/feature/client/transports.c | 2 +-
src/feature/control/control_getinfo.c | 2 +-
src/feature/dirclient/dirclient.c | 2 +-
src/feature/dirclient/dirclient_modes.c | 2 +-
src/feature/relay/include.am | 4 ++--
.../relay/{relay_resolve_addr.c => relay_find_addr.c} | 6 +++---
.../relay/{relay_resolve_addr.h => relay_find_addr.h} | 14 +++++++-------
src/feature/relay/router.c | 2 +-
src/test/test_config.c | 2 +-
9 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c
index b2a39c678..2bdc0ae15 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 673920c9b..685deb8ec 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 c80a6606a..f590c1594 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 b385a6e86..31a3f8af5 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 2aa298560..84bb1ff35 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
similarity index 97%
rename from src/feature/relay/relay_resolve_addr.c
rename to src/feature/relay/relay_find_addr.c
index c929219d4..86cd799d4 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
similarity index 58%
rename from src/feature/relay/relay_resolve_addr.h
rename to src/feature/relay/relay_find_addr.h
index 1ead2baf7..ac51a977e 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 e20e7709e..267dee848 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"
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 5e57aab52..095eb24c4 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -43,7 +43,7 @@
#include "core/or/policies.h"
#include "feature/rend/rendclient.h"
#include "feature/rend/rendservice.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/nodelist/dirlist.h"
More information about the tor-commits
mailing list