nodelist: Move router_get_verbose_nickname() declaration

The declaration was in nodelist/routerinfo.h, but the implementation
was in nodelist/describe.h.

Part of 21003.

diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c
index 9e0966ca54e60a7c0217feb374c314dc137f9eed..82ea9439990050f933160506eb6a2be9376155ce 100644 (file)
--- a/src/feature/control/control_events.c
+++ b/src/feature/control/control_events.c
@@ -26,9 +26,9 @@
 #include "feature/control/control_fmt.h"
 #include "feature/control/control_proto.h"
 #include "feature/dircommon/directory.h"
+#include "feature/nodelist/describe.h"
 #include "feature/nodelist/networkstatus.h"
 #include "feature/nodelist/nodelist.h"
-#include "feature/nodelist/routerinfo.h"
 
 #include "feature/control/control_connection_st.h"
 #include "core/or/entry_connection_st.h"

diff --git a/src/feature/control/fmt_serverstatus.c b/src/feature/control/fmt_serverstatus.c
index a80bf50ad9d6a120cee23a8269da500df843079f..33c5ba133619991880254784679442751327c448 100644 (file)
--- a/src/feature/control/fmt_serverstatus.c
+++ b/src/feature/control/fmt_serverstatus.c
@@ -9,8 +9,8 @@
 #include "app/config/config.h"
 #include "feature/dirauth/authmode.h"
 #include "feature/dirauth/voteflags.h"// XXXX remove
+#include "feature/nodelist/describe.h"
 #include "feature/nodelist/nodelist.h"
-#include "feature/nodelist/routerinfo.h"
 
 #include "feature/nodelist/node_st.h"
 #include "feature/nodelist/routerinfo_st.h"

diff --git a/src/feature/nodelist/describe.c b/src/feature/nodelist/describe.c
index 5c376408c0bddddae0e9b22b9c16a57808415f50..573669185737fda48710a768d02cbc1493157cb9 100644 (file)
--- a/src/feature/nodelist/describe.c
+++ b/src/feature/nodelist/describe.c
@@ -11,7 +11,6 @@
 
 #include "core/or/or.h"
 #include "feature/nodelist/describe.h"
-#include "feature/nodelist/routerinfo.h"
 
 #include "core/or/extend_info_st.h"
 #include "feature/nodelist/node_st.h"

diff --git a/src/feature/nodelist/describe.h b/src/feature/nodelist/describe.h
index d29192200e8d8d41162737dd46ab7b1267c3152f..05f52c47c9a22671765d35f68b27810c73ddea82 100644 (file)
--- a/src/feature/nodelist/describe.h
+++ b/src/feature/nodelist/describe.h
@@ -22,4 +22,6 @@ const char *node_describe(const struct node_t *node);
 const char *router_describe(const struct routerinfo_t *ri);
 const char *routerstatus_describe(const struct routerstatus_t *ri);
 
+void router_get_verbose_nickname(char *buf, const routerinfo_t *router);
+
 #endif /* !defined(TOR_DESCRIBE_H) */

diff --git a/src/feature/nodelist/routerinfo.h b/src/feature/nodelist/routerinfo.h
index ca66e660b39cc69dafac4fc3dfe717ba9e2252dc..8465060f93ec5c684fb40eff2068b9a3627ff7ad 100644 (file)
--- a/src/feature/nodelist/routerinfo.h
+++ b/src/feature/nodelist/routerinfo.h
@@ -17,8 +17,6 @@ void router_get_prim_orport(const routerinfo_t *router,
 int router_has_orport(const routerinfo_t *router,
                       const tor_addr_port_t *orport);
 
-void router_get_verbose_nickname(char *buf, const routerinfo_t *router);
-
 smartlist_t *router_get_all_orports(const routerinfo_t *ri);
 
 const char *router_purpose_to_string(uint8_t p);