diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-03-25 12:11:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-03-25 12:11:59 -0400 |
| commit | a49f506e05364eb0fd14d02e3cd482941942928e (patch) | |
| tree | e48ab73919520424a82c80dc6c1faf574913e822 /src/feature/relay | |
| parent | d4d541c53c209370ae33f5f6caad2ec13743a4ba (diff) | |
| download | tor-a49f506e05364eb0fd14d02e3cd482941942928e.tar.gz tor-a49f506e05364eb0fd14d02e3cd482941942928e.zip | |
Split all controller events code into a new control_events.c
Also, split the formatting code shared by control.c and
control_events.c into controller_fmt.c.
Diffstat (limited to 'src/feature/relay')
| -rw-r--r-- | src/feature/relay/dns.c | 2 | ||||
| -rw-r--r-- | src/feature/relay/ext_orport.c | 3 | ||||
| -rw-r--r-- | src/feature/relay/router.c | 2 | ||||
| -rw-r--r-- | src/feature/relay/selftest.c | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index fa0a1b5910..664edf96a9 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -59,7 +59,7 @@ #include "core/or/connection_edge.h" #include "core/or/policies.h" #include "core/or/relay.h" -#include "feature/control/control.h" +#include "feature/control/control_events.h" #include "feature/relay/dns.h" #include "feature/relay/router.h" #include "feature/relay/routermode.h" diff --git a/src/feature/relay/ext_orport.c b/src/feature/relay/ext_orport.c index 8589efb48d..c343d19b8d 100644 --- a/src/feature/relay/ext_orport.c +++ b/src/feature/relay/ext_orport.c @@ -20,7 +20,7 @@ #include "core/or/or.h" #include "core/mainloop/connection.h" #include "core/or/connection_or.h" -#include "feature/control/control.h" +#include "feature/control/control_events.h" #include "app/config/config.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" @@ -659,4 +659,3 @@ ext_orport_free_all(void) if (ext_or_auth_cookie) /* Free the auth cookie */ tor_free(ext_or_auth_cookie); } - diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index cdd032f78d..fcc84730bd 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -16,7 +16,7 @@ #include "core/or/policies.h" #include "core/or/protover.h" #include "feature/client/transports.h" -#include "feature/control/control.h" +#include "feature/control/control_events.h" #include "feature/dirauth/process_descs.h" #include "feature/dircache/dirserv.h" #include "feature/dirclient/dirclient.h" diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 064eea6c46..eeddd09b63 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -26,7 +26,7 @@ #include "core/or/crypt_path_st.h" #include "core/or/origin_circuit_st.h" #include "core/or/relay.h" -#include "feature/control/control.h" +#include "feature/control/control_events.h" #include "feature/dirclient/dirclient.h" #include "feature/dircommon/directory.h" #include "feature/nodelist/authority_cert_st.h" |