commit a65efa7e8378fa470b7312509eecf92aa029817f Merge: 65b75ef3d defd941fe Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 19 13:58:53 2020 -0500
Merge branch 'extract_relay_dns'
changes/ticket33366 | 3 ++ src/core/mainloop/mainloop.c | 1 - src/core/or/connection_edge.c | 19 +++++++++++-- src/core/or/connection_edge.h | 15 ++++++++++ src/feature/client/addressmap.c | 3 +- src/feature/relay/dns.c | 45 ++++-------------------------- src/feature/relay/dns.h | 61 +++++++++++++++++++++++++++++------------ src/feature/relay/include.am | 2 +- src/test/test_dns.c | 8 +++--- 9 files changed, 90 insertions(+), 67 deletions(-)
diff --cc src/feature/relay/include.am index 5cb0731fb,ad81e60d7..aa7c1b35b --- a/src/feature/relay/include.am +++ b/src/feature/relay/include.am @@@ -1,16 -1,17 +1,16 @@@
# Legacy shared relay code: migrate to the relay module over time LIBTOR_APP_A_SOURCES += \ - src/feature/relay/dns.c \ - src/feature/relay/ext_orport.c \ src/feature/relay/onion_queue.c \ src/feature/relay/router.c \ - src/feature/relay/routerkeys.c \ - src/feature/relay/selftest.c + src/feature/relay/routerkeys.c
# The Relay module.
# ADD_C_FILE: INSERT SOURCES HERE. MODULE_RELAY_SOURCES = \ + src/feature/relay/dns.c \ + src/feature/relay/ext_orport.c \ src/feature/relay/routermode.c \ src/feature/relay/relay_config.c \ src/feature/relay/relay_periodic.c \