diff options
| author | teor <teor@torproject.org> | 2019-08-19 16:26:28 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-08-19 16:40:41 +1000 |
| commit | 81256c079f0939e1046aa1e905fe488f53c37ded (patch) | |
| tree | bbbd26bb797eb6aa1e59e5281605c2f6a301a2b1 /src/feature | |
| parent | 8a10c0696da526ff29076cba536633d5c2483439 (diff) | |
| download | tor-81256c079f0939e1046aa1e905fe488f53c37ded.tar.gz tor-81256c079f0939e1046aa1e905fe488f53c37ded.zip | |
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.
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/control/control_events.c | 2 | ||||
| -rw-r--r-- | src/feature/control/fmt_serverstatus.c | 2 | ||||
| -rw-r--r-- | src/feature/nodelist/describe.c | 1 | ||||
| -rw-r--r-- | src/feature/nodelist/describe.h | 2 | ||||
| -rw-r--r-- | src/feature/nodelist/routerinfo.h | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index 9e0966ca54..82ea943999 100644 --- 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 a80bf50ad9..33c5ba1336 100644 --- 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 5c376408c0..5736691857 100644 --- 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 d29192200e..05f52c47c9 100644 --- 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 ca66e660b3..8465060f93 100644 --- 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); |