diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-20 13:55:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-21 09:14:05 -0400 |
| commit | 98ef3e82e48c2d57c09d5f551b72e7d6bfe5347a (patch) | |
| tree | ffbad59a83bab12d5c48dd21604ee31e7e634d81 /src/core/mainloop | |
| parent | 55122bfe0425c54aeb28d0daa266cc4601247994 (diff) | |
| download | tor-98ef3e82e48c2d57c09d5f551b72e7d6bfe5347a.tar.gz tor-98ef3e82e48c2d57c09d5f551b72e7d6bfe5347a.zip | |
Move the non-crypto parts of onion.c out of src/core/crypto
The parts for handling cell formats should be in src/core/or.
The parts for handling onionskin queues should be in src/core/or.
Only the crypto wrapper belongs in src/core/crypto.
Diffstat (limited to 'src/core/mainloop')
| -rw-r--r-- | src/core/mainloop/cpuworker.c | 4 | ||||
| -rw-r--r-- | src/core/mainloop/main.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/core/mainloop/cpuworker.c b/src/core/mainloop/cpuworker.c index a372db3f17..232d7efa95 100644 --- a/src/core/mainloop/cpuworker.c +++ b/src/core/mainloop/cpuworker.c @@ -27,10 +27,12 @@ #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" #include "core/mainloop/main.h" -#include "core/crypto/onion.h" +#include "core/or/onion.h" +#include "feature/relay/onion_queue.h" #include "feature/stats/rephist.h" #include "feature/relay/router.h" #include "lib/evloop/workqueue.h" +#include "core/crypto/onion_crypto.h" #include "core/or/or_circuit_st.h" #include "lib/intmath/weakrng.h" diff --git a/src/core/mainloop/main.c b/src/core/mainloop/main.c index 2a90192c95..5beccc0a6e 100644 --- a/src/core/mainloop/main.c +++ b/src/core/mainloop/main.c @@ -92,7 +92,8 @@ #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodelist.h" #include "app/main/ntmain.h" -#include "core/crypto/onion.h" +#include "core/or/onion.h" +#include "feature/relay/onion_queue.h" #include "core/mainloop/periodic.h" #include "core/or/policies.h" #include "core/or/protover.h" |