diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-20 15:19:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-21 09:14:06 -0400 |
| commit | c7ce6b9821be22e734b79e07e318f2bfba32722d (patch) | |
| tree | 0582d70285c6fcd33f9804af6684f8de27273c36 /src/feature/relay | |
| parent | 98ef3e82e48c2d57c09d5f551b72e7d6bfe5347a (diff) | |
| download | tor-c7ce6b9821be22e734b79e07e318f2bfba32722d.tar.gz tor-c7ce6b9821be22e734b79e07e318f2bfba32722d.zip | |
Split main.c into main.c and mainloop.c
The main.c code is responsible for initialization and shutdown;
the mainloop.c code is responsible for running the main loop of Tor.
Splitting the "generic event loop" part of mainloop.c from the
event-loop-specific part is not done as part of this patch.
Diffstat (limited to 'src/feature/relay')
| -rw-r--r-- | src/feature/relay/dns.c | 2 | ||||
| -rw-r--r-- | src/feature/relay/ext_orport.c | 2 | ||||
| -rw-r--r-- | src/feature/relay/router.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 48319b47c8..6e9be5e2e7 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -58,7 +58,7 @@ #include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" #include "feature/relay/dns.h" -#include "core/mainloop/main.h" +#include "core/mainloop/mainloop.h" #include "core/or/policies.h" #include "core/or/relay.h" #include "feature/relay/router.h" diff --git a/src/feature/relay/ext_orport.c b/src/feature/relay/ext_orport.c index 7de57ac65d..3607bdede4 100644 --- a/src/feature/relay/ext_orport.c +++ b/src/feature/relay/ext_orport.c @@ -25,7 +25,7 @@ #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" #include "feature/relay/ext_orport.h" -#include "core/mainloop/main.h" +#include "core/mainloop/mainloop.h" #include "core/proto/proto_ext_or.h" #include "core/or/or_connection_st.h" diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 8029edfb75..447c21e897 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -22,7 +22,8 @@ #include "feature/relay/dns.h" #include "feature/stats/geoip.h" #include "feature/hibernate/hibernate.h" -#include "core/mainloop/main.h" +#include "app/main/main.h" +#include "core/mainloop/mainloop.h" #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodelist.h" #include "core/or/policies.h" |