nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix every include path changed in the previous commit (automated)

Browse Source 
I am very glad to have written this script.
This commit is contained in:
Nick Mathewson 2018-07-05 16:34:59 -04:00
parent 63b4ea22af
commit ef486e3c02
274 changed files with 2536 additions and 2536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/app/config/config.c
View File

@ -60,52 +60,52 @@
**/ **/
#define CONFIG_PRIVATE #define CONFIG_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/bridges.h" #include "feature/client/bridges.h"
#include "or/addressmap.h" #include "feature/client/addressmap.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/circuitmux.h" #include "core/or/circuitmux.h"
#include "or/circuitmux_ewma.h" #include "core/or/circuitmux_ewma.h"
#include "or/circuitstats.h" #include "core/or/circuitstats.h"
#include "lib/compress/compress.h" #include "lib/compress/compress.h"
#include "or/config.h" #include "app/config/config.h"
#include "lib/encoding/confline.h" #include "lib/encoding/confline.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_edge.h" #include "core/or/connection_edge.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "or/consdiffmgr.h" #include "feature/dircache/consdiffmgr.h"
#include "or/control.h" #include "feature/control/control.h"
#include "or/confparse.h" #include "app/config/confparse.h"
#include "or/cpuworker.h" #include "core/mainloop/cpuworker.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/dirserv.h" #include "feature/dircache/dirserv.h"
#include "or/dns.h" #include "feature/relay/dns.h"
#include "or/dos.h" #include "core/or/dos.h"
#include "or/entrynodes.h" #include "feature/client/entrynodes.h"
#include "or/git_revision.h" #include "core/or/git_revision.h"
#include "or/geoip.h" #include "feature/stats/geoip.h"
#include "or/hibernate.h" #include "feature/hibernate/hibernate.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/rendclient.h" #include "feature/rend/rendclient.h"
#include "or/rendservice.h" #include "feature/rend/rendservice.h"
#include "or/hs_config.h" #include "feature/hs/hs_config.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "lib/sandbox/sandbox.h" #include "lib/sandbox/sandbox.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/routerset.h" #include "feature/nodelist/routerset.h"
#include "or/scheduler.h" #include "core/or/scheduler.h"
#include "or/statefile.h" #include "app/config/statefile.h"
#include "or/transports.h" #include "feature/client/transports.h"
#include "or/ext_orport.h" #include "feature/relay/ext_orport.h"
#include "or/voting_schedule.h" #include "feature/dircommon/voting_schedule.h"
#ifdef _WIN32 #ifdef _WIN32
#include <shlobj.h> #include <shlobj.h>
#endif #endif
@ -133,11 +133,11 @@
#include "lib/fs/conffile.h" #include "lib/fs/conffile.h"
#include "lib/evloop/procmon.h" #include "lib/evloop/procmon.h"
#include "or/dirauth/dirvote.h" #include "feature/dirauth/dirvote.h"
#include "or/dirauth/mode.h" #include "feature/dirauth/mode.h"
#include "or/connection_st.h" #include "core/or/connection_st.h"
#include "or/port_cfg_st.h" #include "core/or/port_cfg_st.h"
#ifdef HAVE_SYSTEMD #ifdef HAVE_SYSTEMD
# if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) # if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__)

2
src/app/config/config.h
View File

@ -12,7 +12,7 @@
#ifndef TOR_CONFIG_H #ifndef TOR_CONFIG_H
#define TOR_CONFIG_H #define TOR_CONFIG_H
#include "or/or_options_st.h" #include "app/config/or_options_st.h"
#include "lib/testsupport/testsupport.h" #include "lib/testsupport/testsupport.h"
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(DARWIN) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(DARWIN)

6
src/app/config/confparse.c
View File

@ -21,9 +21,9 @@
* specified, and a linked list of key-value pairs. * specified, and a linked list of key-value pairs.
*/ */
#include "or/or.h" #include "core/or/or.h"
#include "or/confparse.h" #include "app/config/confparse.h"
#include "or/routerset.h" #include "feature/nodelist/routerset.h"
#include "lib/container/bitarray.h" #include "lib/container/bitarray.h"
#include "lib/encoding/confline.h" #include "lib/encoding/confline.h"

26
src/app/config/statefile.c
View File

@ -29,22 +29,22 @@
*/ */
#define STATEFILE_PRIVATE #define STATEFILE_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/circuitstats.h" #include "core/or/circuitstats.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/confparse.h" #include "app/config/confparse.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/control.h" #include "feature/control/control.h"
#include "or/entrynodes.h" #include "feature/client/entrynodes.h"
#include "or/hibernate.h" #include "feature/hibernate/hibernate.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "lib/sandbox/sandbox.h" #include "lib/sandbox/sandbox.h"
#include "or/statefile.h" #include "app/config/statefile.h"
#include "lib/encoding/confline.h" #include "lib/encoding/confline.h"
#include "or/or_state_st.h" #include "app/config/or_state_st.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>

8
src/app/main/ntmain.c
View File

@ -19,10 +19,10 @@
#ifdef _WIN32 #ifdef _WIN32
#include "or/or.h" #include "core/or/or.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "app/ntmain.h" #include "app/main/ntmain.h"
#include "lib/log/win32err.h" #include "lib/log/win32err.h"
#include "lib/fs/winlib.h" #include "lib/fs/winlib.h"
#include "lib/evloop/compat_libevent.h" #include "lib/evloop/compat_libevent.h"

4
src/core/crypto/hs_ntor.c
View File

@ -24,11 +24,11 @@
* rendezvous key expansion to setup end-to-end rend circuit keys. * rendezvous key expansion to setup end-to-end rend circuit keys.
*/ */
#include "or/or.h" #include "core/or/or.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_curve25519.h"
#include "lib/crypt_ops/crypto_ed25519.h" #include "lib/crypt_ops/crypto_ed25519.h"
#include "or/hs_ntor.h" #include "core/crypto/hs_ntor.h"
/* String constants used by the ntor HS protocol */ /* String constants used by the ntor HS protocol */
#define PROTOID "tor-hs-ntor-curve25519-sha3-256-1" #define PROTOID "tor-hs-ntor-curve25519-sha3-256-1"

2
src/core/crypto/hs_ntor.h
View File

@ -4,7 +4,7 @@
#ifndef TOR_HS_NTOR_H #ifndef TOR_HS_NTOR_H
#define TOR_HS_NTOR_H #define TOR_HS_NTOR_H
#include "or/or.h" #include "core/or/or.h"
struct ed25519_public_key_t; struct ed25519_public_key_t;
struct curve25519_public_key_t; struct curve25519_public_key_t;
struct curve25519_keypair_t; struct curve25519_keypair_t;

32
src/core/crypto/onion.c
View File

@ -62,25 +62,25 @@
* onion_fast.c for more information. * onion_fast.c for more information.
**/ **/
#include "or/or.h" #include "core/or/or.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/cpuworker.h" #include "core/mainloop/cpuworker.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "lib/crypt_ops/crypto_dh.h" #include "lib/crypt_ops/crypto_dh.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/onion.h" #include "core/crypto/onion.h"
#include "or/onion_fast.h" #include "core/crypto/onion_fast.h"
#include "or/onion_ntor.h" #include "core/crypto/onion_ntor.h"
#include "or/onion_tap.h" #include "core/crypto/onion_tap.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/cell_st.h" #include "core/or/cell_st.h"
#include "or/extend_info_st.h" #include "core/or/extend_info_st.h"
#include "or/or_circuit_st.h" #include "core/or/or_circuit_st.h"
// trunnel // trunnel
#include "trunnel/ed25519_cert.h" #include "trunnel/ed25519_cert.h"

4
src/core/crypto/onion_fast.c
View File

@ -27,8 +27,8 @@
* many RSA1024 keys. * many RSA1024 keys.
**/ **/
#include "or/or.h" #include "core/or/or.h"
#include "or/onion_fast.h" #include "core/crypto/onion_fast.h"
#include "lib/crypt_ops/crypto_hkdf.h" #include "lib/crypt_ops/crypto_hkdf.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"

2
src/core/crypto/onion_ntor.c
View File

@ -29,7 +29,7 @@
#include "lib/ctime/di_ops.h" #include "lib/ctime/di_ops.h"
#include "lib/log/torlog.h" #include "lib/log/torlog.h"
#include "lib/log/util_bug.h" #include "lib/log/util_bug.h"
#include "or/onion_ntor.h" #include "core/crypto/onion_ntor.h"
#include <string.h> #include <string.h>

8
src/core/crypto/onion_tap.c
View File

@ -27,13 +27,13 @@
* invoked from onion.c. * invoked from onion.c.
**/ **/
#include "or/or.h" #include "core/or/or.h"
#include "or/config.h" #include "app/config/config.h"
#include "lib/crypt_ops/crypto_dh.h" #include "lib/crypt_ops/crypto_dh.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/onion_tap.h" #include "core/crypto/onion_tap.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/

18
src/core/crypto/relay_crypto.c
View File

@ -4,18 +4,18 @@
* Copyright (c) 2007-2018, The Tor Project, Inc. */ * Copyright (c) 2007-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */ /* See LICENSE for licensing information */
#include "or/or.h" #include "core/or/or.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/config.h" #include "app/config/config.h"
#include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/hs_ntor.h" // for HS_NTOR_KEY_EXPANSION_KDF_OUT_LEN #include "core/crypto/hs_ntor.h" // for HS_NTOR_KEY_EXPANSION_KDF_OUT_LEN
#include "or/relay.h" #include "core/or/relay.h"
#include "or/relay_crypto.h" #include "core/crypto/relay_crypto.h"
#include "or/cell_st.h" #include "core/or/cell_st.h"
#include "or/or_circuit_st.h" #include "core/or/or_circuit_st.h"
#include "or/origin_circuit_st.h" #include "core/or/origin_circuit_st.h"
/** Update digest from the payload of cell. Assign integrity part to /** Update digest from the payload of cell. Assign integrity part to
* cell. * cell.

90
src/core/mainloop/connection.c
View File

@ -55,8 +55,8 @@
**/ **/
#define CONNECTION_PRIVATE #define CONNECTION_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/bridges.h" #include "feature/client/bridges.h"
#include "lib/container/buffers.h" #include "lib/container/buffers.h"
#include "lib/tls/buffers_tls.h" #include "lib/tls/buffers_tls.h"
/* /*
@ -66,42 +66,42 @@
#define TOR_CHANNEL_INTERNAL_ #define TOR_CHANNEL_INTERNAL_
#define CONNECTION_PRIVATE #define CONNECTION_PRIVATE
#include "lib/err/backtrace.h" #include "lib/err/backtrace.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/channeltls.h" #include "core/or/channeltls.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/circuituse.h" #include "core/or/circuituse.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_edge.h" #include "core/or/connection_edge.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "or/control.h" #include "feature/control/control.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/directory.h" #include "feature/dircache/directory.h"
#include "or/dirserv.h" #include "feature/dircache/dirserv.h"
#include "or/dns.h" #include "feature/relay/dns.h"
#include "or/dnsserv.h" #include "feature/client/dnsserv.h"
#include "or/dos.h" #include "core/or/dos.h"
#include "or/entrynodes.h" #include "feature/client/entrynodes.h"
#include "or/ext_orport.h" #include "feature/relay/ext_orport.h"
#include "or/geoip.h" #include "feature/stats/geoip.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/hibernate.h" #include "feature/hibernate/hibernate.h"
#include "or/hs_common.h" #include "feature/hs/hs_common.h"
#include "or/hs_ident.h" #include "feature/hs/hs_ident.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/proto_http.h" #include "core/proto/proto_http.h"
#include "or/proto_socks.h" #include "core/proto/proto_socks.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/reasons.h" #include "core/or/reasons.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/rendclient.h" #include "feature/rend/rendclient.h"
#include "or/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/transports.h" #include "feature/client/transports.h"
#include "or/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "lib/sandbox/sandbox.h" #include "lib/sandbox/sandbox.h"
#include "lib/net/buffers_net.h" #include "lib/net/buffers_net.h"
#include "lib/tls/tortls.h" #include "lib/tls/tortls.h"
@ -124,14 +124,14 @@
#include <sys/un.h> #include <sys/un.h>
#endif #endif
#include "or/dir_connection_st.h" #include "feature/dircommon/dir_connection_st.h"
#include "or/control_connection_st.h" #include "feature/control/control_connection_st.h"
#include "or/entry_connection_st.h" #include "core/or/entry_connection_st.h"
#include "or/listener_connection_st.h" #include "core/or/listener_connection_st.h"
#include "or/or_connection_st.h" #include "core/or/or_connection_st.h"
#include "or/port_cfg_st.h" #include "core/or/port_cfg_st.h"
#include "or/routerinfo_st.h" #include "feature/nodelist/routerinfo_st.h"
#include "or/socks_request_st.h" #include "core/or/socks_request_st.h"
static connection_t *connection_listener_new( static connection_t *connection_listener_new(
const struct sockaddr *listensockaddr, const struct sockaddr *listensockaddr,

24
src/core/mainloop/cpuworker.c
View File

@ -17,22 +17,22 @@
* <li>and for calculating diffs and compressing them in consdiffmgr.c. * <li>and for calculating diffs and compressing them in consdiffmgr.c.
* </ul> * </ul>
**/ **/
#include "or/or.h" #include "core/or/or.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/cpuworker.h" #include "core/mainloop/cpuworker.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/onion.h" #include "core/crypto/onion.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "lib/evloop/workqueue.h" #include "lib/evloop/workqueue.h"
#include "or/or_circuit_st.h" #include "core/or/or_circuit_st.h"
#include "lib/intmath/weakrng.h" #include "lib/intmath/weakrng.h"
static void queue_pending_tasks(void); static void queue_pending_tasks(void);

134
src/core/mainloop/main.c
View File

@ -47,69 +47,69 @@
**/ **/
#define MAIN_PRIVATE #define MAIN_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/addressmap.h" #include "feature/client/addressmap.h"
#include "lib/err/backtrace.h" #include "lib/err/backtrace.h"
#include "or/bridges.h" #include "feature/client/bridges.h"
#include "lib/container/buffers.h" #include "lib/container/buffers.h"
#include "lib/tls/buffers_tls.h" #include "lib/tls/buffers_tls.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/channeltls.h" #include "core/or/channeltls.h"
#include "or/channelpadding.h" #include "core/or/channelpadding.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/circuituse.h" #include "core/or/circuituse.h"
#include "or/circuitmux_ewma.h" #include "core/or/circuitmux_ewma.h"
#include "or/command.h" #include "core/or/command.h"
#include "lib/compress/compress.h" #include "lib/compress/compress.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/confparse.h" #include "app/config/confparse.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_edge.h" #include "core/or/connection_edge.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "or/consdiffmgr.h" #include "feature/dircache/consdiffmgr.h"
#include "or/control.h" #include "feature/control/control.h"
#include "or/cpuworker.h" #include "core/mainloop/cpuworker.h"
#include "lib/crypt_ops/crypto_s2k.h" #include "lib/crypt_ops/crypto_s2k.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "or/directory.h" #include "feature/dircache/directory.h"
#include "or/dirserv.h" #include "feature/dircache/dirserv.h"
#include "or/dns.h" #include "feature/relay/dns.h"
#include "or/dnsserv.h" #include "feature/client/dnsserv.h"
#include "or/dos.h" #include "core/or/dos.h"
#include "or/entrynodes.h" #include "feature/client/entrynodes.h"
#include "or/geoip.h" #include "feature/stats/geoip.h"
#include "or/hibernate.h" #include "feature/hibernate/hibernate.h"
#include "or/hs_cache.h" #include "feature/hs/hs_cache.h"
#include "or/hs_circuitmap.h" #include "feature/hs/hs_circuitmap.h"
#include "or/hs_client.h" #include "feature/hs/hs_client.h"
#include "or/keypin.h" #include "feature/dirauth/keypin.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/microdesc.h" #include "feature/nodelist/microdesc.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "app/ntmain.h" #include "app/main/ntmain.h"
#include "or/onion.h" #include "core/crypto/onion.h"
#include "or/periodic.h" #include "core/mainloop/periodic.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/protover.h" #include "core/proto/protover.h"
#include "or/transports.h" #include "feature/client/transports.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/rendclient.h" #include "feature/rend/rendclient.h"
#include "or/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "or/rendservice.h" #include "feature/rend/rendservice.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerkeys.h" #include "feature/relay/routerkeys.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "or/scheduler.h" #include "core/or/scheduler.h"
#include "or/statefile.h" #include "app/config/statefile.h"
#include "or/status.h" #include "core/or/status.h"
#include "or/tor_api.h" #include "feature/api/tor_api.h"
#include "or/tor_api_internal.h" #include "feature/api/tor_api_internal.h"
#include "lib/process/waitpid.h" #include "lib/process/waitpid.h"
#include "or/ext_orport.h" #include "feature/relay/ext_orport.h"
#include "lib/memarea/memarea.h" #include "lib/memarea/memarea.h"
#include "lib/meminfo/meminfo.h" #include "lib/meminfo/meminfo.h"
#include "lib/osinfo/uname.h" #include "lib/osinfo/uname.h"
@ -123,18 +123,18 @@
#include <event2/event.h> #include <event2/event.h>
#include "or/dirauth/dirvote.h" #include "feature/dirauth/dirvote.h"
#include "or/dirauth/mode.h" #include "feature/dirauth/mode.h"
#include "or/dirauth/shared_random.h" #include "feature/dirauth/shared_random.h"
#include "or/cell_st.h" #include "core/or/cell_st.h"
#include "or/entry_connection_st.h" #include "core/or/entry_connection_st.h"
#include "or/networkstatus_st.h" #include "feature/nodelist/networkstatus_st.h"
#include "or/or_connection_st.h" #include "core/or/or_connection_st.h"
#include "or/or_state_st.h" #include "app/config/or_state_st.h"
#include "or/port_cfg_st.h" #include "core/or/port_cfg_st.h"
#include "or/routerinfo_st.h" #include "feature/nodelist/routerinfo_st.h"
#include "or/socks_request_st.h" #include "core/or/socks_request_st.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>

2
src/core/mainloop/main.h
View File

@ -114,7 +114,7 @@ STATIC int get_my_roles(const or_options_t *options);
extern smartlist_t *connection_array; extern smartlist_t *connection_array;
/* We need the periodic_event_item_t definition. */ /* We need the periodic_event_item_t definition. */
#include "or/periodic.h" #include "core/mainloop/periodic.h"
extern periodic_event_item_t periodic_events[]; extern periodic_event_item_t periodic_events[];
#endif #endif
#endif /* defined(MAIN_PRIVATE) */ #endif /* defined(MAIN_PRIVATE) */

8
src/core/mainloop/periodic.c
View File

@ -11,11 +11,11 @@
* that they fire. See periodic_events[] in main.c for examples. * that they fire. See periodic_events[] in main.c for examples.
*/ */
#include "or/or.h" #include "core/or/or.h"
#include "lib/evloop/compat_libevent.h" #include "lib/evloop/compat_libevent.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/periodic.h" #include "core/mainloop/periodic.h"
#include "lib/evloop/compat_libevent.h" #include "lib/evloop/compat_libevent.h"
/** We disable any interval greater than this number of seconds, on the /** We disable any interval greater than this number of seconds, on the

2
src/core/or/address_set.c
View File

@ -11,7 +11,7 @@
**/ **/
#include "orconfig.h" #include "orconfig.h"
#include "or/address_set.h" #include "core/or/address_set.h"
#include "lib/net/address.h" #include "lib/net/address.h"
#include "lib/container/bloomfilt.h" #include "lib/container/bloomfilt.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"

44
src/core/or/channel.c
View File

@ -57,31 +57,31 @@
/* This one's for stuff only channel.c and the test suite should see */ /* This one's for stuff only channel.c and the test suite should see */
#define CHANNEL_PRIVATE_ #define CHANNEL_PRIVATE_
#include "or/or.h" #include "core/or/or.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/channeltls.h" #include "core/or/channeltls.h"
#include "or/channelpadding.h" #include "core/or/channelpadding.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/circuitstats.h" #include "core/or/circuitstats.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/connection_or.h" /* For var_cell_free() */ #include "core/or/connection_or.h" /* For var_cell_free() */
#include "or/circuitmux.h" #include "core/or/circuitmux.h"
#include "or/entrynodes.h" #include "feature/client/entrynodes.h"
#include "or/geoip.h" #include "feature/stats/geoip.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/scheduler.h" #include "core/or/scheduler.h"
#include "lib/time/compat_time.h" #include "lib/time/compat_time.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/rendservice.h" #include "feature/rend/rendservice.h"
#include "lib/evloop/timers.h" #include "lib/evloop/timers.h"
#include "or/cell_queue_st.h" #include "core/or/cell_queue_st.h"
/* Global lists of channels */ /* Global lists of channels */

4
src/core/or/channel.h
View File

@ -9,8 +9,8 @@
#ifndef TOR_CHANNEL_H #ifndef TOR_CHANNEL_H
#define TOR_CHANNEL_H #define TOR_CHANNEL_H
#include "or/or.h" #include "core/or/or.h"
#include "or/circuitmux.h" #include "core/or/circuitmux.h"
#include "lib/container/handles.h" #include "lib/container/handles.h"
#include "lib/crypt_ops/crypto_ed25519.h" #include "lib/crypt_ops/crypto_ed25519.h"

28
src/core/or/channelpadding.c
View File

@ -8,24 +8,24 @@
* channelpadding_channel_to_channelinfo() */ * channelpadding_channel_to_channelinfo() */
#define TOR_CHANNEL_INTERNAL_ #define TOR_CHANNEL_INTERNAL_
#include "or/or.h" #include "core/or/or.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/channelpadding.h" #include "core/or/channelpadding.h"
#include "or/channeltls.h" #include "core/or/channeltls.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "lib/time/compat_time.h" #include "lib/time/compat_time.h"
#include "or/rendservice.h" #include "feature/rend/rendservice.h"
#include "lib/evloop/timers.h" #include "lib/evloop/timers.h"
#include "or/cell_st.h" #include "core/or/cell_st.h"
#include "or/or_connection_st.h" #include "core/or/or_connection_st.h"
STATIC int32_t channelpadding_get_netflow_inactive_timeout_ms( STATIC int32_t channelpadding_get_netflow_inactive_timeout_ms(
const channel_t *); const channel_t *);

54
src/core/or/channeltls.c
View File

@ -38,36 +38,36 @@
#define CHANNELTLS_PRIVATE #define CHANNELTLS_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/channeltls.h" #include "core/or/channeltls.h"
#include "or/circuitmux.h" #include "core/or/circuitmux.h"
#include "or/circuitmux_ewma.h" #include "core/or/circuitmux_ewma.h"
#include "or/command.h" #include "core/or/command.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "or/control.h" #include "feature/control/control.h"
#include "or/entrynodes.h" #include "feature/client/entrynodes.h"
#include "trunnel/link_handshake.h" #include "trunnel/link_handshake.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/scheduler.h" #include "core/or/scheduler.h"
#include "or/torcert.h" #include "feature/nodelist/torcert.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "trunnel/channelpadding_negotiation.h" #include "trunnel/channelpadding_negotiation.h"
#include "or/channelpadding.h" #include "core/or/channelpadding.h"
#include "or/cell_st.h" #include "core/or/cell_st.h"
#include "or/cell_queue_st.h" #include "core/or/cell_queue_st.h"
#include "or/extend_info_st.h" #include "core/or/extend_info_st.h"
#include "or/or_connection_st.h" #include "core/or/or_connection_st.h"
#include "or/or_handshake_certs_st.h" #include "core/or/or_handshake_certs_st.h"
#include "or/or_handshake_state_st.h" #include "core/or/or_handshake_state_st.h"
#include "or/routerinfo_st.h" #include "feature/nodelist/routerinfo_st.h"
#include "or/var_cell_st.h" #include "core/or/var_cell_st.h"
#include "lib/tls/tortls.h" #include "lib/tls/tortls.h"

4
src/core/or/channeltls.h
View File

@ -9,8 +9,8 @@
#ifndef TOR_CHANNELTLS_H #ifndef TOR_CHANNELTLS_H
#define TOR_CHANNELTLS_H #define TOR_CHANNELTLS_H
#include "or/or.h" #include "core/or/or.h"
#include "or/channel.h" #include "core/or/channel.h"
struct ed25519_public_key_t; struct ed25519_public_key_t;
struct curve25519_public_key_t; struct curve25519_public_key_t;

4
src/core/or/circuit_st.h
View File

@ -7,9 +7,9 @@
#ifndef CIRCUIT_ST_H #ifndef CIRCUIT_ST_H
#define CIRCUIT_ST_H #define CIRCUIT_ST_H
#include "or/or.h" #include "core/or/or.h"
#include "or/cell_queue_st.h" #include "core/or/cell_queue_st.h"
struct hs_token_t; struct hs_token_t;

90
src/core/or/circuitbuild.c
View File

@ -27,54 +27,54 @@
#define CIRCUITBUILD_PRIVATE #define CIRCUITBUILD_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/bridges.h" #include "feature/client/bridges.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/circpathbias.h" #include "feature/client/circpathbias.h"
#define CIRCUITBUILD_PRIVATE #define CIRCUITBUILD_PRIVATE
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/circuitstats.h" #include "core/or/circuitstats.h"
#include "or/circuituse.h" #include "core/or/circuituse.h"
#include "or/command.h" #include "core/or/command.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/confparse.h" #include "app/config/confparse.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_edge.h" #include "core/or/connection_edge.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "or/control.h" #include "feature/control/control.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "or/directory.h" #include "feature/dircache/directory.h"
#include "or/entrynodes.h" #include "feature/client/entrynodes.h"
#include "or/hs_ntor.h" #include "core/crypto/hs_ntor.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/microdesc.h" #include "feature/nodelist/microdesc.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/onion.h" #include "core/crypto/onion.h"
#include "or/onion_tap.h" #include "core/crypto/onion_tap.h"
#include "or/onion_fast.h" #include "core/crypto/onion_fast.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/relay_crypto.h" #include "core/crypto/relay_crypto.h"
#include "or/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "or/routerset.h" #include "feature/nodelist/routerset.h"
#include "or/transports.h" #include "feature/client/transports.h"
#include "or/cell_st.h" #include "core/or/cell_st.h"
#include "or/cpath_build_state_st.h" #include "core/or/cpath_build_state_st.h"
#include "or/entry_connection_st.h" #include "core/or/entry_connection_st.h"
#include "or/extend_info_st.h" #include "core/or/extend_info_st.h"
#include "or/node_st.h" #include "feature/nodelist/node_st.h"
#include "or/or_circuit_st.h" #include "core/or/or_circuit_st.h"
#include "or/origin_circuit_st.h" #include "core/or/origin_circuit_st.h"
#include "or/microdesc_st.h" #include "feature/nodelist/microdesc_st.h"
#include "or/routerinfo_st.h" #include "feature/nodelist/routerinfo_st.h"
#include "or/routerstatus_st.h" #include "feature/nodelist/routerstatus_st.h"
static channel_t * channel_connect_for_circuit(const tor_addr_t *addr, static channel_t * channel_connect_for_circuit(const tor_addr_t *addr,
uint16_t port, uint16_t port,

76
src/core/or/circuitlist.c
View File

@ -53,40 +53,40 @@
#define CIRCUITLIST_PRIVATE #define CIRCUITLIST_PRIVATE
#include "lib/cc/torint.h" /* TOR_PRIuSZ */ #include "lib/cc/torint.h" /* TOR_PRIuSZ */
#include "or/or.h" #include "core/or/or.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/circpathbias.h" #include "feature/client/circpathbias.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/circuituse.h" #include "core/or/circuituse.h"
#include "or/circuitstats.h" #include "core/or/circuitstats.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/connection_edge.h" #include "core/or/connection_edge.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "or/control.h" #include "feature/control/control.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "lib/crypt_ops/crypto_dh.h" #include "lib/crypt_ops/crypto_dh.h"
#include "or/directory.h" #include "feature/dircache/directory.h"
#include "or/entrynodes.h" #include "feature/client/entrynodes.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/hs_circuit.h" #include "feature/hs/hs_circuit.h"
#include "or/hs_circuitmap.h" #include "feature/hs/hs_circuitmap.h"
#include "or/hs_ident.h" #include "feature/hs/hs_ident.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/onion.h" #include "core/crypto/onion.h"
#include "or/onion_fast.h" #include "core/crypto/onion_fast.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/relay_crypto.h" #include "core/crypto/relay_crypto.h"
#include "or/rendclient.h" #include "feature/rend/rendclient.h"
#include "or/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/routerset.h" #include "feature/nodelist/routerset.h"
#include "or/channelpadding.h" #include "core/or/channelpadding.h"
#include "lib/compress/compress.h" #include "lib/compress/compress.h"
#include "lib/compress/compress_lzma.h" #include "lib/compress/compress_lzma.h"
#include "lib/compress/compress_zlib.h" #include "lib/compress/compress_zlib.h"
@ -95,13 +95,13 @@
#include "ht.h" #include "ht.h"
#include "or/cpath_build_state_st.h" #include "core/or/cpath_build_state_st.h"
#include "or/crypt_path_reference_st.h" #include "core/or/crypt_path_reference_st.h"
#include "or/dir_connection_st.h" #include "feature/dircommon/dir_connection_st.h"
#include "or/edge_connection_st.h" #include "core/or/edge_connection_st.h"
#include "or/extend_info_st.h" #include "core/or/extend_info_st.h"
#include "or/or_circuit_st.h" #include "core/or/or_circuit_st.h"
#include "or/origin_circuit_st.h" #include "core/or/origin_circuit_st.h"
/********* START VARIABLES **********/ /********* START VARIABLES **********/

2
src/core/or/circuitlist.h
View File

@ -13,7 +13,7 @@
#define TOR_CIRCUITLIST_H #define TOR_CIRCUITLIST_H
#include "lib/testsupport/testsupport.h" #include "lib/testsupport/testsupport.h"
#include "or/hs_ident.h" #include "feature/hs/hs_ident.h"
/** Circuit state: I'm the origin, still haven't done all my handshakes. */ /** Circuit state: I'm the origin, still haven't done all my handshakes. */
#define CIRCUIT_STATE_BUILDING 0 #define CIRCUIT_STATE_BUILDING 0

16
src/core/or/circuitmux.c
View File

@ -69,15 +69,15 @@
* made to attach all existing circuits to the new policy. * made to attach all existing circuits to the new policy.
**/ **/
#include "or/or.h" #include "core/or/or.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/circuitmux.h" #include "core/or/circuitmux.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/cell_queue_st.h" #include "core/or/cell_queue_st.h"
#include "or/destroy_cell_queue_st.h" #include "core/or/destroy_cell_queue_st.h"
#include "or/or_circuit_st.h" #include "core/or/or_circuit_st.h"
/* /*
* Private typedefs for circuitmux.c * Private typedefs for circuitmux.c

2
src/core/or/circuitmux.h
View File

@ -9,7 +9,7 @@
#ifndef TOR_CIRCUITMUX_H #ifndef TOR_CIRCUITMUX_H
#define TOR_CIRCUITMUX_H #define TOR_CIRCUITMUX_H
#include "or/or.h" #include "core/or/or.h"
#include "lib/testsupport/testsupport.h" #include "lib/testsupport/testsupport.h"
typedef struct circuitmux_policy_s circuitmux_policy_t; typedef struct circuitmux_policy_s circuitmux_policy_t;

10
src/core/or/circuitmux_ewma.c
View File

@ -34,12 +34,12 @@
#include <math.h> #include <math.h>
#include "or/or.h" #include "core/or/or.h"
#include "or/circuitmux.h" #include "core/or/circuitmux.h"
#include "or/circuitmux_ewma.h" #include "core/or/circuitmux_ewma.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/or_options_st.h" #include "app/config/or_options_st.h"
/*** EWMA parameter #defines ***/ /*** EWMA parameter #defines ***/

4
src/core/or/circuitmux_ewma.h
View File

@ -9,8 +9,8 @@
#ifndef TOR_CIRCUITMUX_EWMA_H #ifndef TOR_CIRCUITMUX_EWMA_H
#define TOR_CIRCUITMUX_EWMA_H #define TOR_CIRCUITMUX_EWMA_H
#include "or/or.h" #include "core/or/or.h"
#include "or/circuitmux.h" #include "core/or/circuitmux.h"
/* The public EWMA policy callbacks object. */ /* The public EWMA policy callbacks object. */
extern circuitmux_policy_t ewma_policy; extern circuitmux_policy_t ewma_policy;

34
src/core/or/circuitstats.c
View File

@ -25,28 +25,28 @@
#define CIRCUITSTATS_PRIVATE #define CIRCUITSTATS_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitstats.h" #include "core/or/circuitstats.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/confparse.h" #include "app/config/confparse.h"
#include "or/control.h" #include "feature/control/control.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/rendclient.h" #include "feature/rend/rendclient.h"
#include "or/rendservice.h" #include "feature/rend/rendservice.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/statefile.h" #include "app/config/statefile.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/circuituse.h" #include "core/or/circuituse.h"
#include "lib/math/fp.h" #include "lib/math/fp.h"
#include "lib/time/tvdiff.h" #include "lib/time/tvdiff.h"
#include "lib/encoding/confline.h" #include "lib/encoding/confline.h"
#include "or/crypt_path_st.h" #include "core/or/crypt_path_st.h"
#include "or/origin_circuit_st.h" #include "core/or/origin_circuit_st.h"
#include "or/or_state_st.h" #include "app/config/or_state_st.h"
#undef log #undef log
#include <math.h> #include <math.h>

72
src/core/or/circuituse.c
View File

@ -27,45 +27,45 @@
* logic in circuitstats.c. * logic in circuitstats.c.
**/ **/
#include "or/or.h" #include "core/or/or.h"
#include "or/addressmap.h" #include "feature/client/addressmap.h"
#include "or/bridges.h" #include "feature/client/bridges.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/circpathbias.h" #include "feature/client/circpathbias.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/circuitstats.h" #include "core/or/circuitstats.h"
#include "or/circuituse.h" #include "core/or/circuituse.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_edge.h" #include "core/or/connection_edge.h"
#include "or/control.h" #include "feature/control/control.h"
#include "or/directory.h" #include "feature/dircache/directory.h"
#include "or/entrynodes.h" #include "feature/client/entrynodes.h"
#include "or/hs_common.h" #include "feature/hs/hs_common.h"
#include "or/hs_client.h" #include "feature/hs/hs_client.h"
#include "or/hs_circuit.h" #include "feature/hs/hs_circuit.h"
#include "or/hs_ident.h" #include "feature/hs/hs_ident.h"
#include "or/hs_stats.h" #include "feature/hs/hs_stats.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/rendclient.h" #include "feature/rend/rendclient.h"
#include "or/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "or/rendservice.h" #include "feature/rend/rendservice.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "lib/math/fp.h" #include "lib/math/fp.h"
#include "lib/time/tvdiff.h" #include "lib/time/tvdiff.h"
#include "or/cpath_build_state_st.h" #include "core/or/cpath_build_state_st.h"
#include "or/dir_connection_st.h" #include "feature/dircommon/dir_connection_st.h"
#include "or/entry_connection_st.h" #include "core/or/entry_connection_st.h"
#include "or/extend_info_st.h" #include "core/or/extend_info_st.h"
#include "or/or_circuit_st.h" #include "core/or/or_circuit_st.h"
#include "or/origin_circuit_st.h" #include "core/or/origin_circuit_st.h"
#include "or/socks_request_st.h" #include "core/or/socks_request_st.h"
static void circuit_expire_old_circuits_clientside(void); static void circuit_expire_old_circuits_clientside(void);
static void circuit_increment_failure_count(void); static void circuit_increment_failure_count(void);

44
src/core/or/command.c
View File

@ -36,30 +36,30 @@
* callbacks registered in command_setup_channel(), * callbacks registered in command_setup_channel(),
* called when channels are created in circuitbuild.c * called when channels are created in circuitbuild.c
*/ */
#include "or/or.h" #include "core/or/or.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/command.h" #include "core/or/command.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/control.h" #include "feature/control/control.h"
#include "or/cpuworker.h" #include "core/mainloop/cpuworker.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/dos.h" #include "core/or/dos.h"
#include "or/hibernate.h" #include "feature/hibernate/hibernate.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/onion.h" #include "core/crypto/onion.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/cell_st.h" #include "core/or/cell_st.h"
#include "or/or_circuit_st.h" #include "core/or/or_circuit_st.h"
#include "or/origin_circuit_st.h" #include "core/or/origin_circuit_st.h"
#include "or/var_cell_st.h" #include "core/or/var_cell_st.h"
/** How many CELL_CREATE cells have we received, ever? */ /** How many CELL_CREATE cells have we received, ever? */
uint64_t stats_n_create_cells_processed = 0; uint64_t stats_n_create_cells_processed = 0;

2
src/core/or/command.h
View File

@ -12,7 +12,7 @@
#ifndef TOR_COMMAND_H #ifndef TOR_COMMAND_H
#define TOR_COMMAND_H #define TOR_COMMAND_H
#include "or/channel.h" #include "core/or/channel.h"
void command_process_cell(channel_t *chan, cell_t *cell); void command_process_cell(channel_t *chan, cell_t *cell);
void command_process_var_cell(channel_t *chan, var_cell_t *cell); void command_process_var_cell(channel_t *chan, var_cell_t *cell);

90
src/core/or/connection_edge.c
View File

@ -55,57 +55,57 @@
**/ **/
#define CONNECTION_EDGE_PRIVATE #define CONNECTION_EDGE_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "lib/err/backtrace.h" #include "lib/err/backtrace.h"
#include "or/addressmap.h" #include "feature/client/addressmap.h"
#include "lib/container/buffers.h" #include "lib/container/buffers.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/circpathbias.h" #include "feature/client/circpathbias.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/circuituse.h" #include "core/or/circuituse.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_edge.h" #include "core/or/connection_edge.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "or/control.h" #include "feature/control/control.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/dns.h" #include "feature/relay/dns.h"
#include "or/dnsserv.h" #include "feature/client/dnsserv.h"
#include "or/directory.h" #include "feature/dircache/directory.h"
#include "or/dirserv.h" #include "feature/dircache/dirserv.h"
#include "or/hibernate.h" #include "feature/hibernate/hibernate.h"
#include "or/hs_common.h" #include "feature/hs/hs_common.h"
#include "or/hs_cache.h" #include "feature/hs/hs_cache.h"
#include "or/hs_client.h" #include "feature/hs/hs_client.h"
#include "or/hs_circuit.h" #include "feature/hs/hs_circuit.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/proto_http.h" #include "core/proto/proto_http.h"
#include "or/proto_socks.h" #include "core/proto/proto_socks.h"
#include "or/reasons.h" #include "core/or/reasons.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/rendclient.h" #include "feature/rend/rendclient.h"
#include "or/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "or/rendservice.h" #include "feature/rend/rendservice.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/routerset.h" #include "feature/nodelist/routerset.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/cell_st.h" #include "core/or/cell_st.h"
#include "or/cpath_build_state_st.h" #include "core/or/cpath_build_state_st.h"
#include "or/dir_connection_st.h" #include "feature/dircommon/dir_connection_st.h"
#include "or/entry_connection_st.h" #include "core/or/entry_connection_st.h"
#include "or/extend_info_st.h" #include "core/or/extend_info_st.h"
#include "or/node_st.h" #include "feature/nodelist/node_st.h"
#include "or/or_circuit_st.h" #include "core/or/or_circuit_st.h"
#include "or/origin_circuit_st.h" #include "core/or/origin_circuit_st.h"
#include "or/socks_request_st.h" #include "core/or/socks_request_st.h"
#include "lib/evloop/compat_libevent.h" #include "lib/evloop/compat_libevent.h"
#ifdef HAVE_LINUX_TYPES_H #ifdef HAVE_LINUX_TYPES_H

76
src/core/or/connection_or.c
View File

@ -20,8 +20,8 @@
* *
* This module also implements the client side of the v3 Tor link handshake, * This module also implements the client side of the v3 Tor link handshake,
**/ **/
#include "or/or.h" #include "core/or/or.h"
#include "or/bridges.h" #include "feature/client/bridges.h"
#include "lib/container/buffers.h" #include "lib/container/buffers.h"
/* /*
* Define this so we get channel internal functions, since we're implementing * Define this so we get channel internal functions, since we're implementing
@ -29,46 +29,46 @@
*/ */
#define TOR_CHANNEL_INTERNAL_ #define TOR_CHANNEL_INTERNAL_
#define CONNECTION_OR_PRIVATE #define CONNECTION_OR_PRIVATE
#include "or/channel.h" #include "core/or/channel.h"
#include "or/channeltls.h" #include "core/or/channeltls.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/circuitstats.h" #include "core/or/circuitstats.h"
#include "or/command.h" #include "core/or/command.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "or/control.h" #include "feature/control/control.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/dirserv.h" #include "feature/dircache/dirserv.h"
#include "or/entrynodes.h" #include "feature/client/entrynodes.h"
#include "or/geoip.h" #include "feature/stats/geoip.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "trunnel/link_handshake.h" #include "trunnel/link_handshake.h"
#include "or/microdesc.h" #include "feature/nodelist/microdesc.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/proto_cell.h" #include "core/proto/proto_cell.h"
#include "or/reasons.h" #include "core/or/reasons.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerkeys.h" #include "feature/relay/routerkeys.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/ext_orport.h" #include "feature/relay/ext_orport.h"
#include "or/scheduler.h" #include "core/or/scheduler.h"
#include "or/torcert.h" #include "feature/nodelist/torcert.h"
#include "or/channelpadding.h" #include "core/or/channelpadding.h"
#include "or/cell_st.h" #include "core/or/cell_st.h"
#include "or/cell_queue_st.h" #include "core/or/cell_queue_st.h"
#include "or/or_connection_st.h" #include "core/or/or_connection_st.h"
#include "or/or_handshake_certs_st.h" #include "core/or/or_handshake_certs_st.h"
#include "or/or_handshake_state_st.h" #include "core/or/or_handshake_state_st.h"
#include "or/or_state_st.h" #include "app/config/or_state_st.h"
#include "or/routerinfo_st.h" #include "feature/nodelist/routerinfo_st.h"
#include "or/var_cell_st.h" #include "core/or/var_cell_st.h"
#include "lib/crypt_ops/crypto_format.h" #include "lib/crypt_ops/crypto_format.h"
#include "lib/tls/tortls.h" #include "lib/tls/tortls.h"

2
src/core/or/crypt_path_st.h
View File

@ -7,7 +7,7 @@
#ifndef CRYPT_PATH_ST_H #ifndef CRYPT_PATH_ST_H
#define CRYPT_PATH_ST_H #define CRYPT_PATH_ST_H
#include "or/relay_crypto_st.h" #include "core/or/relay_crypto_st.h"
struct crypto_dh_t; struct crypto_dh_t;
#define CRYPT_PATH_MAGIC 0x70127012u #define CRYPT_PATH_MAGIC 0x70127012u

26
src/core/or/dos.c
View File

@ -8,22 +8,22 @@
#define DOS_PRIVATE #define DOS_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "or/geoip.h" #include "feature/stats/geoip.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/dos.h" #include "core/or/dos.h"
#include "or/or_connection_st.h" #include "core/or/or_connection_st.h"
/* /*
* Circuit creation denial of service mitigation. * Circuit creation denial of service mitigation.

4
src/core/or/edge_connection_st.h
View File

@ -7,9 +7,9 @@
#ifndef EDGE_CONNECTION_ST_H #ifndef EDGE_CONNECTION_ST_H
#define EDGE_CONNECTION_ST_H #define EDGE_CONNECTION_ST_H
#include "or/or.h" #include "core/or/or.h"
#include "or/connection_st.h" #include "core/or/connection_st.h"
/** Subtype of connection_t for an "edge connection" -- that is, an entry (ap) /** Subtype of connection_t for an "edge connection" -- that is, an entry (ap)
* connection, or an exit. */ * connection, or an exit. */

2
src/core/or/entry_connection_st.h
View File

@ -7,7 +7,7 @@
#ifndef ENTRY_CONNECTION_ST_H #ifndef ENTRY_CONNECTION_ST_H
#define ENTRY_CONNECTION_ST_H #define ENTRY_CONNECTION_ST_H
#include "or/edge_connection_st.h" #include "core/or/edge_connection_st.h"
/** Subtype of edge_connection_t for an "entry connection" -- that is, a SOCKS /** Subtype of edge_connection_t for an "entry connection" -- that is, a SOCKS
* connection, a DNS request, a TransPort connection or a NATD connection */ * connection, a DNS request, a TransPort connection or a NATD connection */

2
src/core/or/entry_port_cfg_st.h
View File

@ -8,7 +8,7 @@
#define ENTRY_PORT_CFG_ST_H #define ENTRY_PORT_CFG_ST_H
#include "lib/cc/torint.h" #include "lib/cc/torint.h"
#include "or/or.h" #include "core/or/or.h"
struct entry_port_cfg_t { struct entry_port_cfg_t {
/* Client port types (socks, dns, trans, natd) only: */ /* Client port types (socks, dns, trans, natd) only: */

2
src/core/or/git_revision.c
View File

@ -3,7 +3,7 @@
* Copyright (c) 2007-2018, The Tor Project, Inc. */ * Copyright (c) 2007-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */ /* See LICENSE for licensing information */
#include "or/git_revision.h" #include "core/or/git_revision.h"
/** String describing which Tor Git repository version the source was /** String describing which Tor Git repository version the source was
* built from. This string is generated by a bit of shell kludging in * built from. This string is generated by a bit of shell kludging in

2
src/core/or/listener_connection_st.h
View File

@ -7,7 +7,7 @@
#ifndef LISTENER_CONNECTION_ST_H #ifndef LISTENER_CONNECTION_ST_H
#define LISTENER_CONNECTION_ST_H #define LISTENER_CONNECTION_ST_H
#include "or/connection_st.h" #include "core/or/connection_st.h"
/** Subtype of connection_t; used for a listener socket. */ /** Subtype of connection_t; used for a listener socket. */
struct listener_connection_t { struct listener_connection_t {

2
src/core/or/or.h
View File

@ -69,7 +69,7 @@
// These, more than other includes, are for keeping the other struct // These, more than other includes, are for keeping the other struct
// definitions working. We should remove them when we minimize our includes. // definitions working. We should remove them when we minimize our includes.
#include "or/entry_port_cfg_st.h" #include "core/or/entry_port_cfg_st.h"
struct ed25519_public_key_t; struct ed25519_public_key_t;
struct curve25519_public_key_t; struct curve25519_public_key_t;

6
src/core/or/or_circuit_st.h
View File

@ -7,10 +7,10 @@
#ifndef OR_CIRCUIT_ST_H #ifndef OR_CIRCUIT_ST_H
#define OR_CIRCUIT_ST_H #define OR_CIRCUIT_ST_H
#include "or/or.h" #include "core/or/or.h"
#include "or/circuit_st.h" #include "core/or/circuit_st.h"
#include "or/crypt_path_st.h" #include "core/or/crypt_path_st.h"
struct onion_queue_t; struct onion_queue_t;

2
src/core/or/or_connection_st.h
View File

@ -7,7 +7,7 @@
#ifndef OR_CONNECTION_ST_H #ifndef OR_CONNECTION_ST_H
#define OR_CONNECTION_ST_H #define OR_CONNECTION_ST_H
#include "or/connection_st.h" #include "core/or/connection_st.h"
#include "lib/evloop/token_bucket.h" #include "lib/evloop/token_bucket.h"
struct tor_tls_t; struct tor_tls_t;

4
src/core/or/origin_circuit_st.h
View File

@ -7,9 +7,9 @@
#ifndef ORIGIN_CIRCUIT_ST_H #ifndef ORIGIN_CIRCUIT_ST_H
#define ORIGIN_CIRCUIT_ST_H #define ORIGIN_CIRCUIT_ST_H
#include "or/or.h" #include "core/or/or.h"
#include "or/circuit_st.h" #include "core/or/circuit_st.h"
struct onion_queue_t; struct onion_queue_t;

36
src/core/or/policies.c
View File

@ -17,27 +17,27 @@
#define POLICIES_PRIVATE #define POLICIES_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/bridges.h" #include "feature/client/bridges.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/dirserv.h" #include "feature/dircache/dirserv.h"
#include "or/microdesc.h" #include "feature/nodelist/microdesc.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "or/geoip.h" #include "feature/stats/geoip.h"
#include "ht.h" #include "ht.h"
#include "lib/encoding/confline.h" #include "lib/encoding/confline.h"
#include "or/addr_policy_st.h" #include "core/or/addr_policy_st.h"
#include "or/dir_server_st.h" #include "feature/dirclient/dir_server_st.h"
#include "or/microdesc_st.h" #include "feature/nodelist/microdesc_st.h"
#include "or/node_st.h" #include "feature/nodelist/node_st.h"
#include "or/port_cfg_st.h" #include "core/or/port_cfg_st.h"
#include "or/routerinfo_st.h" #include "feature/nodelist/routerinfo_st.h"
#include "or/routerstatus_st.h" #include "feature/nodelist/routerstatus_st.h"
/** Policy that addresses for incoming SOCKS connections must match. */ /** Policy that addresses for incoming SOCKS connections must match. */
static smartlist_t *socks_policy = NULL; static smartlist_t *socks_policy = NULL;

4
src/core/or/port_cfg_st.h
View File

@ -7,8 +7,8 @@
#ifndef PORT_CFG_ST_H #ifndef PORT_CFG_ST_H
#define PORT_CFG_ST_H #define PORT_CFG_ST_H
#include "or/entry_port_cfg_st.h" #include "core/or/entry_port_cfg_st.h"
#include "or/server_port_cfg_st.h" #include "core/or/server_port_cfg_st.h"
/** Configuration for a single port that we're listening on. */ /** Configuration for a single port that we're listening on. */
struct port_cfg_t { struct port_cfg_t {

8
src/core/or/reasons.c
View File

@ -14,10 +14,10 @@
* to another. * to another.
**/ **/
#include "or/or.h" #include "core/or/or.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/reasons.h" #include "core/or/reasons.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "lib/tls/tortls.h" #include "lib/tls/tortls.h"
/***************************** Edge (stream) reasons **********************/ /***************************** Edge (stream) reasons **********************/

82
src/core/or/relay.c
View File

@ -46,53 +46,53 @@
**/ **/
#define RELAY_PRIVATE #define RELAY_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/addressmap.h" #include "feature/client/addressmap.h"
#include "lib/err/backtrace.h" #include "lib/err/backtrace.h"
#include "lib/container/buffers.h" #include "lib/container/buffers.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/circpathbias.h" #include "feature/client/circpathbias.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/circuituse.h" #include "core/or/circuituse.h"
#include "lib/compress/compress.h" #include "lib/compress/compress.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_edge.h" #include "core/or/connection_edge.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "or/control.h" #include "feature/control/control.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/directory.h" #include "feature/dircache/directory.h"
#include "or/geoip.h" #include "feature/stats/geoip.h"
#include "or/hs_cache.h" #include "feature/hs/hs_cache.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/onion.h" #include "core/crypto/onion.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/reasons.h" #include "core/or/reasons.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/relay_crypto.h" #include "core/crypto/relay_crypto.h"
#include "or/rendcache.h" #include "feature/rend/rendcache.h"
#include "or/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "or/scheduler.h" #include "core/or/scheduler.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/cell_st.h" #include "core/or/cell_st.h"
#include "or/cell_queue_st.h" #include "core/or/cell_queue_st.h"
#include "or/cpath_build_state_st.h" #include "core/or/cpath_build_state_st.h"
#include "or/dir_connection_st.h" #include "feature/dircommon/dir_connection_st.h"
#include "or/destroy_cell_queue_st.h" #include "core/or/destroy_cell_queue_st.h"
#include "or/entry_connection_st.h" #include "core/or/entry_connection_st.h"
#include "or/extend_info_st.h" #include "core/or/extend_info_st.h"
#include "or/or_circuit_st.h" #include "core/or/or_circuit_st.h"
#include "or/origin_circuit_st.h" #include "core/or/origin_circuit_st.h"
#include "or/routerinfo_st.h" #include "feature/nodelist/routerinfo_st.h"
#include "or/socks_request_st.h" #include "core/or/socks_request_st.h"
#include "lib/intmath/weakrng.h" #include "lib/intmath/weakrng.h"

12
src/core/or/scheduler.c
View File

@ -1,20 +1,20 @@
/* Copyright (c) 2013-2018, The Tor Project, Inc. */ /* Copyright (c) 2013-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */ /* See LICENSE for licensing information */
#include "or/or.h" #include "core/or/or.h"
#include "or/config.h" #include "app/config/config.h"
#include "lib/evloop/compat_libevent.h" #include "lib/evloop/compat_libevent.h"
#define SCHEDULER_PRIVATE_ #define SCHEDULER_PRIVATE_
#define SCHEDULER_KIST_PRIVATE #define SCHEDULER_KIST_PRIVATE
#include "or/scheduler.h" #include "core/or/scheduler.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "lib/container/buffers.h" #include "lib/container/buffers.h"
#define TOR_CHANNEL_INTERNAL_ #define TOR_CHANNEL_INTERNAL_
#include "or/channeltls.h" #include "core/or/channeltls.h"
#include "lib/evloop/compat_libevent.h" #include "lib/evloop/compat_libevent.h"
#include "or/or_connection_st.h" #include "core/or/or_connection_st.h"
/** /**
* \file scheduler.c * \file scheduler.c

4
src/core/or/scheduler.h
View File

@ -9,8 +9,8 @@
#ifndef TOR_SCHEDULER_H #ifndef TOR_SCHEDULER_H
#define TOR_SCHEDULER_H #define TOR_SCHEDULER_H
#include "or/or.h" #include "core/or/or.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "lib/testsupport/testsupport.h" #include "lib/testsupport/testsupport.h"
/** Scheduler type, we build an ordered list with those values from the /** Scheduler type, we build an ordered list with those values from the

16
src/core/or/scheduler_kist.c
View File

@ -3,19 +3,19 @@
#define SCHEDULER_KIST_PRIVATE #define SCHEDULER_KIST_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "lib/container/buffers.h" #include "lib/container/buffers.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#define TOR_CHANNEL_INTERNAL_ #define TOR_CHANNEL_INTERNAL_
#include "or/channel.h" #include "core/or/channel.h"
#include "or/channeltls.h" #include "core/or/channeltls.h"
#define SCHEDULER_PRIVATE_ #define SCHEDULER_PRIVATE_
#include "or/scheduler.h" #include "core/or/scheduler.h"
#include "lib/math/fp.h" #include "lib/math/fp.h"
#include "or/or_connection_st.h" #include "core/or/or_connection_st.h"
#define TLS_PER_CELL_OVERHEAD 29 #define TLS_PER_CELL_OVERHEAD 29

8
src/core/or/scheduler_vanilla.c
View File

@ -1,12 +1,12 @@
/* Copyright (c) 2017-2018, The Tor Project, Inc. */ /* Copyright (c) 2017-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */ /* See LICENSE for licensing information */
#include "or/or.h" #include "core/or/or.h"
#include "or/config.h" #include "app/config/config.h"
#define TOR_CHANNEL_INTERNAL_ #define TOR_CHANNEL_INTERNAL_
#include "or/channel.h" #include "core/or/channel.h"
#define SCHEDULER_PRIVATE_ #define SCHEDULER_PRIVATE_
#include "or/scheduler.h" #include "core/or/scheduler.h"
/***************************************************************************** /*****************************************************************************
* Other internal data * Other internal data

36
src/core/or/status.c
View File

@ -14,28 +14,28 @@
#define STATUS_PRIVATE #define STATUS_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/circuituse.h" #include "core/or/circuituse.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/status.h" #include "core/or/status.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/hibernate.h" #include "feature/hibernate/hibernate.h"
#include "or/statefile.h" #include "app/config/statefile.h"
#include "or/hs_stats.h" #include "feature/hs/hs_stats.h"
#include "or/hs_service.h" #include "feature/hs/hs_service.h"
#include "or/dos.h" #include "core/or/dos.h"
#include "or/or_state_st.h" #include "app/config/or_state_st.h"
#include "or/routerinfo_st.h" #include "feature/nodelist/routerinfo_st.h"
#include "lib/tls/tortls.h" #include "lib/tls/tortls.h"
static void log_accounting(const time_t now, const or_options_t *options); static void log_accounting(const time_t now, const or_options_t *options);
#include "or/geoip.h" #include "feature/stats/geoip.h"
/** Return the total number of circuits. */ /** Return the total number of circuits. */
STATIC int STATIC int

8
src/core/proto/proto_cell.c
View File

@ -4,13 +4,13 @@
* Copyright (c) 2007-2018, The Tor Project, Inc. */ * Copyright (c) 2007-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */ /* See LICENSE for licensing information */
#include "or/or.h" #include "core/or/or.h"
#include "lib/container/buffers.h" #include "lib/container/buffers.h"
#include "or/proto_cell.h" #include "core/proto/proto_cell.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "or/var_cell_st.h" #include "core/or/var_cell_st.h"
/** True iff the cell command <b>command</b> is one that implies a /** True iff the cell command <b>command</b> is one that implies a
* variable-length cell in Tor link protocol <b>linkproto</b>. */ * variable-length cell in Tor link protocol <b>linkproto</b>. */

4
src/core/proto/proto_control0.c
View File

@ -4,9 +4,9 @@
* Copyright (c) 2007-2018, The Tor Project, Inc. */ * Copyright (c) 2007-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */ /* See LICENSE for licensing information */
#include "or/or.h" #include "core/or/or.h"
#include "lib/container/buffers.h" #include "lib/container/buffers.h"
#include "or/proto_control0.h" #include "core/proto/proto_control0.h"
/** Return 1 iff buf looks more like it has an (obsolete) v0 controller /** Return 1 iff buf looks more like it has an (obsolete) v0 controller
* command on it than any valid v1 controller command. */ * command on it than any valid v1 controller command. */

6
src/core/proto/proto_ext_or.c
View File

@ -4,10 +4,10 @@
* Copyright (c) 2007-2018, The Tor Project, Inc. */ * Copyright (c) 2007-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */ /* See LICENSE for licensing information */
#include "or/or.h" #include "core/or/or.h"
#include "lib/container/buffers.h" #include "lib/container/buffers.h"
#include "or/ext_orport.h" #include "feature/relay/ext_orport.h"
#include "or/proto_ext_or.h" #include "core/proto/proto_ext_or.h"
/** The size of the header of an Extended ORPort message: 2 bytes for /** The size of the header of an Extended ORPort message: 2 bytes for
* COMMAND, 2 bytes for BODYLEN */ * COMMAND, 2 bytes for BODYLEN */

4
src/core/proto/proto_http.c
View File

@ -5,9 +5,9 @@
/* See LICENSE for licensing information */ /* See LICENSE for licensing information */
#define PROTO_HTTP_PRIVATE #define PROTO_HTTP_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "lib/container/buffers.h" #include "lib/container/buffers.h"
#include "or/proto_http.h" #include "core/proto/proto_http.h"
/** Return true if <b>cmd</b> looks like a HTTP (proxy) request. */ /** Return true if <b>cmd</b> looks like a HTTP (proxy) request. */
int int

18
src/core/proto/proto_socks.c
View File

@ -4,18 +4,18 @@
* Copyright (c) 2007-2018, The Tor Project, Inc. */ * Copyright (c) 2007-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */ /* See LICENSE for licensing information */
#include "or/or.h" #include "core/or/or.h"
#include "or/addressmap.h" #include "feature/client/addressmap.h"
#include "lib/container/buffers.h" #include "lib/container/buffers.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/control.h" #include "feature/control/control.h"
#include "or/config.h" #include "app/config/config.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/ext_orport.h" #include "feature/relay/ext_orport.h"
#include "or/proto_socks.h" #include "core/proto/proto_socks.h"
#include "or/reasons.h" #include "core/or/reasons.h"
#include "or/socks_request_st.h" #include "core/or/socks_request_st.h"
static void socks_request_set_socks5_error(socks_request_t *req, static void socks_request_set_socks5_error(socks_request_t *req,
socks5_reply_status_t reason); socks5_reply_status_t reason);

6
src/core/proto/protover.c
View File

@ -23,9 +23,9 @@
#define PROTOVER_PRIVATE #define PROTOVER_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/protover.h" #include "core/proto/protover.h"
#include "or/routerparse.h" #include "feature/nodelist/routerparse.h"
#ifndef HAVE_RUST #ifndef HAVE_RUST

4
src/core/proto/protover_rust.c
View File

@ -7,8 +7,8 @@
* and safe translation/handling between the Rust/C boundary. * and safe translation/handling between the Rust/C boundary.
*/ */
#include "or/or.h" #include "core/or/or.h"
#include "or/protover.h" #include "core/proto/protover.h"
#ifdef HAVE_RUST #ifdef HAVE_RUST

4
src/feature/api/tor_api.c
View File

@ -8,8 +8,8 @@
* \file tor_api.c * \file tor_api.c
**/ **/
#include "or/tor_api.h" #include "feature/api/tor_api.h"
#include "or/tor_api_internal.h" #include "feature/api/tor_api_internal.h"
// Include this after the above headers, to insure that they don't // Include this after the above headers, to insure that they don't
// depend on anything else. // depend on anything else.

20
src/feature/client/addressmap.c
View File

@ -17,17 +17,17 @@
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "or/or.h" #include "core/or/or.h"
#include "or/addressmap.h" #include "feature/client/addressmap.h"
#include "or/circuituse.h" #include "core/or/circuituse.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/connection_edge.h" #include "core/or/connection_edge.h"
#include "or/control.h" #include "feature/control/control.h"
#include "or/dns.h" #include "feature/relay/dns.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/routerset.h" #include "feature/nodelist/routerset.h"
#include "or/entry_connection_st.h" #include "core/or/entry_connection_st.h"
/** A client-side struct to remember requests to rewrite addresses /** A client-side struct to remember requests to rewrite addresses
* to new addresses. These structs are stored in the hash table * to new addresses. These structs are stored in the hash table

34
src/feature/client/bridges.c
View File

@ -13,24 +13,24 @@
#define TOR_BRIDGES_PRIVATE #define TOR_BRIDGES_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/bridges.h" #include "feature/client/bridges.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/directory.h" #include "feature/dircache/directory.h"
#include "or/entrynodes.h" #include "feature/client/entrynodes.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/routerset.h" #include "feature/nodelist/routerset.h"
#include "or/transports.h" #include "feature/client/transports.h"
#include "or/extend_info_st.h" #include "core/or/extend_info_st.h"
#include "or/node_st.h" #include "feature/nodelist/node_st.h"
#include "or/routerinfo_st.h" #include "feature/nodelist/routerinfo_st.h"
#include "or/routerstatus_st.h" #include "feature/nodelist/routerstatus_st.h"
/** Information about a configured bridge. Currently this just matches the /** Information about a configured bridge. Currently this just matches the
* ones in the torrc file, but one day we may be able to learn about new * ones in the torrc file, but one day we may be able to learn about new

34
src/feature/client/circpathbias.c
View File

@ -21,27 +21,27 @@
* each guard, and stored persistently in the state file. * each guard, and stored persistently in the state file.
*/ */
#include "or/or.h" #include "core/or/or.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/circpathbias.h" #include "feature/client/circpathbias.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/circuituse.h" #include "core/or/circuituse.h"
#include "or/circuitstats.h" #include "core/or/circuitstats.h"
#include "or/connection_edge.h" #include "core/or/connection_edge.h"
#include "or/config.h" #include "app/config/config.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "or/entrynodes.h" #include "feature/client/entrynodes.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "lib/math/fp.h" #include "lib/math/fp.h"
#include "lib/math/laplace.h" #include "lib/math/laplace.h"
#include "or/cell_st.h" #include "core/or/cell_st.h"
#include "or/cpath_build_state_st.h" #include "core/or/cpath_build_state_st.h"
#include "or/crypt_path_st.h" #include "core/or/crypt_path_st.h"
#include "or/extend_info_st.h" #include "core/or/extend_info_st.h"
#include "or/origin_circuit_st.h" #include "core/or/origin_circuit_st.h"
static void pathbias_count_successful_close(origin_circuit_t *circ); static void pathbias_count_successful_close(origin_circuit_t *circ);
static void pathbias_count_collapse(origin_circuit_t *circ); static void pathbias_count_collapse(origin_circuit_t *circ);

24
src/feature/client/dnsserv.c
View File

@ -21,19 +21,19 @@
* DNS client. * DNS client.
**/ **/
#include "or/or.h" #include "core/or/or.h"
#include "or/dnsserv.h" #include "feature/client/dnsserv.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_edge.h" #include "core/or/connection_edge.h"
#include "or/control.h" #include "feature/control/control.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/control_connection_st.h" #include "feature/control/control_connection_st.h"
#include "or/entry_connection_st.h" #include "core/or/entry_connection_st.h"
#include "or/listener_connection_st.h" #include "core/or/listener_connection_st.h"
#include "or/socks_request_st.h" #include "core/or/socks_request_st.h"
#include "lib/evloop/compat_libevent.h" #include "lib/evloop/compat_libevent.h"
#include <event2/dns.h> #include <event2/dns.h>

56
src/feature/client/entrynodes.c
View File

@ -112,38 +112,38 @@
#define ENTRYNODES_PRIVATE #define ENTRYNODES_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/bridges.h" #include "feature/client/bridges.h"
#include "or/circpathbias.h" #include "feature/client/circpathbias.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/circuituse.h" #include "core/or/circuituse.h"
#include "or/circuitstats.h" #include "core/or/circuitstats.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/confparse.h" #include "app/config/confparse.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/control.h" #include "feature/control/control.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "or/directory.h" #include "feature/dircache/directory.h"
#include "or/entrynodes.h" #include "feature/client/entrynodes.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/microdesc.h" #include "feature/nodelist/microdesc.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "or/routerset.h" #include "feature/nodelist/routerset.h"
#include "or/transports.h" #include "feature/client/transports.h"
#include "or/statefile.h" #include "app/config/statefile.h"
#include "lib/math/fp.h" #include "lib/math/fp.h"
#include "lib/encoding/confline.h" #include "lib/encoding/confline.h"
#include "or/node_st.h" #include "feature/nodelist/node_st.h"
#include "or/origin_circuit_st.h" #include "core/or/origin_circuit_st.h"
#include "or/or_state_st.h" #include "app/config/or_state_st.h"
#include "lib/crypt_ops/digestset.h" #include "lib/crypt_ops/digestset.h"

22
src/feature/client/transports.c
View File

@ -90,17 +90,17 @@
**/ **/
#define PT_PRIVATE #define PT_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/bridges.h" #include "feature/client/bridges.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/transports.h" #include "feature/client/transports.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/statefile.h" #include "app/config/statefile.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "or/ext_orport.h" #include "feature/relay/ext_orport.h"
#include "or/control.h" #include "feature/control/control.h"
#include "lib/process/env.h" #include "lib/process/env.h"
#include "lib/process/subprocess.h" #include "lib/process/subprocess.h"

116
src/feature/control/control.c
View File

@ -35,70 +35,70 @@
#define CONTROL_PRIVATE #define CONTROL_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/addressmap.h" #include "feature/client/addressmap.h"
#include "or/bridges.h" #include "feature/client/bridges.h"
#include "lib/container/buffers.h" #include "lib/container/buffers.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/channeltls.h" #include "core/or/channeltls.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/circuitstats.h" #include "core/or/circuitstats.h"
#include "or/circuituse.h" #include "core/or/circuituse.h"
#include "or/command.h" #include "core/or/command.h"
#include "lib/evloop/compat_libevent.h" #include "lib/evloop/compat_libevent.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/confparse.h" #include "app/config/confparse.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_edge.h" #include "core/or/connection_edge.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "or/control.h" #include "feature/control/control.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/directory.h" #include "feature/dircache/directory.h"
#include "or/dirserv.h" #include "feature/dircache/dirserv.h"
#include "or/dnsserv.h" #include "feature/client/dnsserv.h"
#include "or/entrynodes.h" #include "feature/client/entrynodes.h"
#include "or/geoip.h" #include "feature/stats/geoip.h"
#include "or/hibernate.h" #include "feature/hibernate/hibernate.h"
#include "or/hs_cache.h" #include "feature/hs/hs_cache.h"
#include "or/hs_common.h" #include "feature/hs/hs_common.h"
#include "or/hs_control.h" #include "feature/hs/hs_control.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/microdesc.h" #include "feature/nodelist/microdesc.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/proto_control0.h" #include "core/proto/proto_control0.h"
#include "or/proto_http.h" #include "core/proto/proto_http.h"
#include "or/reasons.h" #include "core/or/reasons.h"
#include "or/rendclient.h" #include "feature/rend/rendclient.h"
#include "or/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "or/rendservice.h" #include "feature/rend/rendservice.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "or/shared_random_client.h" #include "feature/hs_common/shared_random_client.h"
#include "lib/encoding/confline.h" #include "lib/encoding/confline.h"
#include "or/cached_dir_st.h" #include "feature/dircache/cached_dir_st.h"
#include "or/control_connection_st.h" #include "feature/control/control_connection_st.h"
#include "or/cpath_build_state_st.h" #include "core/or/cpath_build_state_st.h"
#include "or/entry_connection_st.h" #include "core/or/entry_connection_st.h"
#include "or/extrainfo_st.h" #include "feature/nodelist/extrainfo_st.h"
#include "or/networkstatus_st.h" #include "feature/nodelist/networkstatus_st.h"
#include "or/node_st.h" #include "feature/nodelist/node_st.h"
#include "or/or_connection_st.h" #include "core/or/or_connection_st.h"
#include "or/or_circuit_st.h" #include "core/or/or_circuit_st.h"
#include "or/origin_circuit_st.h" #include "core/or/origin_circuit_st.h"
#include "or/microdesc_st.h" #include "feature/nodelist/microdesc_st.h"
#include "or/rend_authorized_client_st.h" #include "feature/rend/rend_authorized_client_st.h"
#include "or/rend_encoded_v2_service_descriptor_st.h" #include "feature/rend/rend_encoded_v2_service_descriptor_st.h"
#include "or/rend_service_descriptor_st.h" #include "feature/rend/rend_service_descriptor_st.h"
#include "or/routerinfo_st.h" #include "feature/nodelist/routerinfo_st.h"
#include "or/routerlist_st.h" #include "feature/nodelist/routerlist_st.h"
#include "or/socks_request_st.h" #include "core/or/socks_request_st.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>

4
src/feature/control/control_connection_st.h
View File

@ -7,8 +7,8 @@
#ifndef CONTROL_CONNECTION_ST_H #ifndef CONTROL_CONNECTION_ST_H
#define CONTROL_CONNECTION_ST_H #define CONTROL_CONNECTION_ST_H
#include "or/or.h" #include "core/or/or.h"
#include "or/connection_st.h" #include "core/or/connection_st.h"
/** Subtype of connection_t for an connection to a controller. */ /** Subtype of connection_t for an connection to a controller. */
struct control_connection_t { struct control_connection_t {

8
src/feature/dirauth/dircollate.c
View File

@ -22,11 +22,11 @@
*/ */
#define DIRCOLLATE_PRIVATE #define DIRCOLLATE_PRIVATE
#include "or/dirauth/dircollate.h" #include "feature/dirauth/dircollate.h"
#include "or/dirauth/dirvote.h" #include "feature/dirauth/dirvote.h"
#include "or/networkstatus_st.h" #include "feature/nodelist/networkstatus_st.h"
#include "or/vote_routerstatus_st.h" #include "feature/nodelist/vote_routerstatus_st.h"
static void dircollator_collate_by_ed25519(dircollator_t *dc); static void dircollator_collate_by_ed25519(dircollator_t *dc);

2
src/feature/dirauth/dircollate.h
View File

@ -13,7 +13,7 @@
#define TOR_DIRCOLLATE_H #define TOR_DIRCOLLATE_H
#include "lib/testsupport/testsupport.h" #include "lib/testsupport/testsupport.h"
#include "or/or.h" #include "core/or/or.h"
typedef struct dircollator_s dircollator_t; typedef struct dircollator_s dircollator_t;

72
src/feature/dirauth/dirvote.c
View File

@ -4,44 +4,44 @@
/* See LICENSE for licensing information */ /* See LICENSE for licensing information */
#define DIRVOTE_PRIVATE #define DIRVOTE_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/dirauth/dircollate.h" #include "feature/dirauth/dircollate.h"
#include "or/directory.h" #include "feature/dircache/directory.h"
#include "or/dirserv.h" #include "feature/dircache/dirserv.h"
#include "or/microdesc.h" #include "feature/nodelist/microdesc.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/parsecommon.h" #include "feature/nodelist/parsecommon.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/protover.h" #include "core/proto/protover.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerkeys.h" #include "feature/relay/routerkeys.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "or/entrynodes.h" /* needed for guardfraction methods */ #include "feature/client/entrynodes.h" /* needed for guardfraction methods */
#include "or/torcert.h" #include "feature/nodelist/torcert.h"
#include "or/voting_schedule.h" #include "feature/dircommon/voting_schedule.h"
#include "or/dirauth/dirvote.h" #include "feature/dirauth/dirvote.h"
#include "or/dirauth/mode.h" #include "feature/dirauth/mode.h"
#include "or/dirauth/shared_random_state.h" #include "feature/dirauth/shared_random_state.h"
#include "or/authority_cert_st.h" #include "feature/nodelist/authority_cert_st.h"
#include "or/cached_dir_st.h" #include "feature/dircache/cached_dir_st.h"
#include "or/dir_server_st.h" #include "feature/dirclient/dir_server_st.h"
#include "or/document_signature_st.h" #include "feature/nodelist/document_signature_st.h"
#include "or/microdesc_st.h" #include "feature/nodelist/microdesc_st.h"
#include "or/networkstatus_st.h" #include "feature/nodelist/networkstatus_st.h"
#include "or/networkstatus_voter_info_st.h" #include "feature/nodelist/networkstatus_voter_info_st.h"
#include "or/node_st.h" #include "feature/nodelist/node_st.h"
#include "or/ns_detached_signatures_st.h" #include "feature/dirauth/ns_detached_signatures_st.h"
#include "or/routerinfo_st.h" #include "feature/nodelist/routerinfo_st.h"
#include "or/routerlist_st.h" #include "feature/nodelist/routerlist_st.h"
#include "or/vote_microdesc_hash_st.h" #include "feature/dirauth/vote_microdesc_hash_st.h"
#include "or/vote_routerstatus_st.h" #include "feature/nodelist/vote_routerstatus_st.h"
#include "or/vote_timing_st.h" #include "feature/dircommon/vote_timing_st.h"
#include "lib/container/order.h" #include "lib/container/order.h"
#include "lib/encoding/confline.h" #include "lib/encoding/confline.h"

2
src/feature/dirauth/keypin.c
View File

@ -30,7 +30,7 @@
#include "lib/wallclock/approx_time.h" #include "lib/wallclock/approx_time.h"
#include "ht.h" #include "ht.h"
#include "or/keypin.h" #include "feature/dirauth/keypin.h"
#include "siphash.h" #include "siphash.h"

2
src/feature/dirauth/mode.h
View File

@ -11,7 +11,7 @@
#ifdef HAVE_MODULE_DIRAUTH #ifdef HAVE_MODULE_DIRAUTH
#include "or/router.h" #include "feature/relay/router.h"
/* Return true iff we believe ourselves to be a v3 authoritative directory /* Return true iff we believe ourselves to be a v3 authoritative directory
* server. */ * server. */

30
src/feature/dirauth/shared_random.c
View File

@ -87,25 +87,25 @@
#define SHARED_RANDOM_PRIVATE #define SHARED_RANDOM_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/dirauth/shared_random.h" #include "feature/dirauth/shared_random.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/confparse.h" #include "app/config/confparse.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerkeys.h" #include "feature/relay/routerkeys.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/shared_random_client.h" #include "feature/hs_common/shared_random_client.h"
#include "or/dirauth/shared_random_state.h" #include "feature/dirauth/shared_random_state.h"
#include "or/voting_schedule.h" #include "feature/dircommon/voting_schedule.h"
#include "or/dirauth/dirvote.h" #include "feature/dirauth/dirvote.h"
#include "or/dirauth/mode.h" #include "feature/dirauth/mode.h"
#include "or/authority_cert_st.h" #include "feature/nodelist/authority_cert_st.h"
#include "or/networkstatus_st.h" #include "feature/nodelist/networkstatus_st.h"
/* String prefix of shared random values in votes/consensuses. */ /* String prefix of shared random values in votes/consensuses. */
static const char previous_srv_str[] = "shared-rand-previous-value"; static const char previous_srv_str[] = "shared-rand-previous-value";

2
src/feature/dirauth/shared_random.h
View File

@ -10,7 +10,7 @@
* with "sr_" which stands for shared random. * with "sr_" which stands for shared random.
*/ */
#include "or/or.h" #include "core/or/or.h"
/* Protocol version */ /* Protocol version */
#define SR_PROTO_VERSION 1 #define SR_PROTO_VERSION 1

22
src/feature/dirauth/shared_random_state.c
View File

@ -10,20 +10,20 @@
#define SHARED_RANDOM_STATE_PRIVATE #define SHARED_RANDOM_STATE_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/confparse.h" #include "app/config/confparse.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/dirauth/dirvote.h" #include "feature/dirauth/dirvote.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/dirauth/shared_random.h" #include "feature/dirauth/shared_random.h"
#include "or/shared_random_client.h" #include "feature/hs_common/shared_random_client.h"
#include "or/dirauth/shared_random_state.h" #include "feature/dirauth/shared_random_state.h"
#include "or/voting_schedule.h" #include "feature/dircommon/voting_schedule.h"
#include "lib/encoding/confline.h" #include "lib/encoding/confline.h"
#include "or/or_state_st.h" #include "app/config/or_state_st.h"
/* Default filename of the shared random state on disk. */ /* Default filename of the shared random state on disk. */
static const char default_fname[] = "sr-state"; static const char default_fname[] = "sr-state";

2
src/feature/dirauth/shared_random_state.h
View File

@ -4,7 +4,7 @@
#ifndef TOR_SHARED_RANDOM_STATE_H #ifndef TOR_SHARED_RANDOM_STATE_H
#define TOR_SHARED_RANDOM_STATE_H #define TOR_SHARED_RANDOM_STATE_H
#include "or/dirauth/shared_random.h" #include "feature/dirauth/shared_random.h"
/* Action that can be performed on the state for any objects. */ /* Action that can be performed on the state for any objects. */
typedef enum { typedef enum {

6
src/feature/dircache/conscache.c
View File

@ -1,10 +1,10 @@
/* Copyright (c) 2017-2018, The Tor Project, Inc. */ /* Copyright (c) 2017-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */ /* See LICENSE for licensing information */
#include "or/or.h" #include "core/or/or.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/conscache.h" #include "feature/dircache/conscache.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "lib/fs/storagedir.h" #include "lib/fs/storagedir.h"
#include "lib/encoding/confline.h" #include "lib/encoding/confline.h"

20
src/feature/dircache/consdiffmgr.c
View File

@ -13,21 +13,21 @@
#define CONSDIFFMGR_PRIVATE #define CONSDIFFMGR_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/conscache.h" #include "feature/dircache/conscache.h"
#include "or/consdiff.h" #include "feature/dircommon/consdiff.h"
#include "or/consdiffmgr.h" #include "feature/dircache/consdiffmgr.h"
#include "or/cpuworker.h" #include "core/mainloop/cpuworker.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "lib/evloop/compat_libevent.h" #include "lib/evloop/compat_libevent.h"
#include "lib/evloop/workqueue.h" #include "lib/evloop/workqueue.h"
#include "lib/compress/compress.h" #include "lib/compress/compress.h"
#include "lib/encoding/confline.h" #include "lib/encoding/confline.h"
#include "or/networkstatus_st.h" #include "feature/nodelist/networkstatus_st.h"
#include "or/networkstatus_voter_info_st.h" #include "feature/nodelist/networkstatus_voter_info_st.h"
/** /**
* Labels to apply to items in the conscache object. * Labels to apply to items in the conscache object.

90
src/feature/dircache/directory.c
View File

@ -5,44 +5,44 @@
#define DIRECTORY_PRIVATE #define DIRECTORY_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "lib/err/backtrace.h" #include "lib/err/backtrace.h"
#include "or/bridges.h" #include "feature/client/bridges.h"
#include "lib/container/buffers.h" #include "lib/container/buffers.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_edge.h" #include "core/or/connection_edge.h"
#include "or/conscache.h" #include "feature/dircache/conscache.h"
#include "or/consdiff.h" #include "feature/dircommon/consdiff.h"
#include "or/consdiffmgr.h" #include "feature/dircache/consdiffmgr.h"
#include "or/control.h" #include "feature/control/control.h"
#include "lib/compress/compress.h" #include "lib/compress/compress.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/directory.h" #include "feature/dircache/directory.h"
#include "or/dirserv.h" #include "feature/dircache/dirserv.h"
#include "or/entrynodes.h" #include "feature/client/entrynodes.h"
#include "or/fp_pair.h" #include "feature/dircommon/fp_pair.h"
#include "or/geoip.h" #include "feature/stats/geoip.h"
#include "or/hs_cache.h" #include "feature/hs/hs_cache.h"
#include "or/hs_common.h" #include "feature/hs/hs_common.h"
#include "or/hs_control.h" #include "feature/hs/hs_control.h"
#include "or/hs_client.h" #include "feature/hs/hs_client.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/microdesc.h" #include "feature/nodelist/microdesc.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/rendclient.h" #include "feature/rend/rendclient.h"
#include "or/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "or/rendservice.h" #include "feature/rend/rendservice.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "or/routerset.h" #include "feature/nodelist/routerset.h"
#include "lib/encoding/confline.h" #include "lib/encoding/confline.h"
#include "lib/crypt_ops/crypto_format.h" #include "lib/crypt_ops/crypto_format.h"
@ -52,19 +52,19 @@
#endif #endif
#endif #endif
#include "or/dirauth/dirvote.h" #include "feature/dirauth/dirvote.h"
#include "or/dirauth/mode.h" #include "feature/dirauth/mode.h"
#include "or/dirauth/shared_random.h" #include "feature/dirauth/shared_random.h"
#include "or/authority_cert_st.h" #include "feature/nodelist/authority_cert_st.h"
#include "or/cached_dir_st.h" #include "feature/dircache/cached_dir_st.h"
#include "or/dir_connection_st.h" #include "feature/dircommon/dir_connection_st.h"
#include "or/dir_server_st.h" #include "feature/dirclient/dir_server_st.h"
#include "or/entry_connection_st.h" #include "core/or/entry_connection_st.h"
#include "or/networkstatus_st.h" #include "feature/nodelist/networkstatus_st.h"
#include "or/node_st.h" #include "feature/nodelist/node_st.h"
#include "or/rend_service_descriptor_st.h" #include "feature/rend/rend_service_descriptor_st.h"
#include "or/routerinfo_st.h" #include "feature/nodelist/routerinfo_st.h"
/** /**
* \file directory.c * \file directory.c

2
src/feature/dircache/directory.h
View File

@ -12,7 +12,7 @@
#ifndef TOR_DIRECTORY_H #ifndef TOR_DIRECTORY_H
#define TOR_DIRECTORY_H #define TOR_DIRECTORY_H
#include "or/hs_ident.h" #include "feature/hs/hs_ident.h"
enum compress_method_t; enum compress_method_t;
dir_connection_t *TO_DIR_CONN(connection_t *c); dir_connection_t *TO_DIR_CONN(connection_t *c);

76
src/feature/dircache/dirserv.c
View File

@ -4,47 +4,47 @@
/* See LICENSE for licensing information */ /* See LICENSE for licensing information */
#define DIRSERV_PRIVATE #define DIRSERV_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "lib/container/buffers.h" #include "lib/container/buffers.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/confparse.h" #include "app/config/confparse.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/channeltls.h" #include "core/or/channeltls.h"
#include "or/command.h" #include "core/or/command.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "or/conscache.h" #include "feature/dircache/conscache.h"
#include "or/consdiffmgr.h" #include "feature/dircache/consdiffmgr.h"
#include "or/control.h" #include "feature/control/control.h"
#include "or/directory.h" #include "feature/dircache/directory.h"
#include "or/dirserv.h" #include "feature/dircache/dirserv.h"
#include "or/hibernate.h" #include "feature/hibernate/hibernate.h"
#include "or/keypin.h" #include "feature/dirauth/keypin.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/microdesc.h" #include "feature/nodelist/microdesc.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/protover.h" #include "core/proto/protover.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "or/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "or/routerset.h" #include "feature/nodelist/routerset.h"
#include "or/torcert.h" #include "feature/nodelist/torcert.h"
#include "or/voting_schedule.h" #include "feature/dircommon/voting_schedule.h"
#include "or/dirauth/dirvote.h" #include "feature/dirauth/dirvote.h"
#include "or/cached_dir_st.h" #include "feature/dircache/cached_dir_st.h"
#include "or/dir_connection_st.h" #include "feature/dircommon/dir_connection_st.h"
#include "or/extrainfo_st.h" #include "feature/nodelist/extrainfo_st.h"
#include "or/microdesc_st.h" #include "feature/nodelist/microdesc_st.h"
#include "or/node_st.h" #include "feature/nodelist/node_st.h"
#include "or/routerinfo_st.h" #include "feature/nodelist/routerinfo_st.h"
#include "or/routerlist_st.h" #include "feature/nodelist/routerlist_st.h"
#include "or/tor_version_st.h" #include "core/or/tor_version_st.h"
#include "or/vote_routerstatus_st.h" #include "feature/nodelist/vote_routerstatus_st.h"
#include "lib/compress/compress.h" #include "lib/compress/compress.h"
#include "lib/container/order.h" #include "lib/container/order.h"

4
src/feature/dirclient/dir_server_st.h
View File

@ -8,8 +8,8 @@
#define DIR_SERVER_ST_H #define DIR_SERVER_ST_H
#include "lib/cc/torint.h" #include "lib/cc/torint.h"
#include "or/or.h" #include "core/or/or.h"
#include "or/routerstatus_st.h" #include "feature/nodelist/routerstatus_st.h"
/** Represents information about a single trusted or fallback directory /** Represents information about a single trusted or fallback directory
* server. */ * server. */

6
src/feature/dircommon/consdiff.c
View File

@ -38,10 +38,10 @@
#define CONSDIFF_PRIVATE #define CONSDIFF_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/consdiff.h" #include "feature/dircommon/consdiff.h"
#include "lib/memarea/memarea.h" #include "lib/memarea/memarea.h"
#include "or/routerparse.h" #include "feature/nodelist/routerparse.h"
static const char* ns_diff_version = "network-status-diff-version 1"; static const char* ns_diff_version = "network-status-diff-version 1";
static const char* hash_token = "hash"; static const char* hash_token = "hash";

2
src/feature/dircommon/consdiff.h
View File

@ -5,7 +5,7 @@
#ifndef TOR_CONSDIFF_H #ifndef TOR_CONSDIFF_H
#define TOR_CONSDIFF_H #define TOR_CONSDIFF_H
#include "or/or.h" #include "core/or/or.h"
char *consensus_diff_generate(const char *cons1, char *consensus_diff_generate(const char *cons1,
const char *cons2); const char *cons2);

2
src/feature/dircommon/dir_connection_st.h
View File

@ -7,7 +7,7 @@
#ifndef DIR_CONNECTION_ST_H #ifndef DIR_CONNECTION_ST_H
#define DIR_CONNECTION_ST_H #define DIR_CONNECTION_ST_H
#include "or/connection_st.h" #include "core/or/connection_st.h"
struct tor_compress_state_t; struct tor_compress_state_t;

4
src/feature/dircommon/fp_pair.c
View File

@ -17,8 +17,8 @@
* certificate for any (ID key, signing key) pair. * certificate for any (ID key, signing key) pair.
**/ **/
#include "or/or.h" #include "core/or/or.h"
#include "or/fp_pair.h" #include "feature/dircommon/fp_pair.h"
/* Define fp_pair_map_t structures */ /* Define fp_pair_map_t structures */

10
src/feature/dircommon/voting_schedule.c
View File

@ -9,13 +9,13 @@
**/ **/
#define VOTING_SCHEDULE_PRIVATE #define VOTING_SCHEDULE_PRIVATE
#include "or/voting_schedule.h" #include "feature/dircommon/voting_schedule.h"
#include "or/or.h" #include "core/or/or.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/networkstatus_st.h" #include "feature/nodelist/networkstatus_st.h"
/* ===== /* =====
* Vote scheduling * Vote scheduling

2
src/feature/dircommon/voting_schedule.h
View File

@ -9,7 +9,7 @@
#ifndef TOR_VOTING_SCHEDULE_H #ifndef TOR_VOTING_SCHEDULE_H
#define TOR_VOTING_SCHEDULE_H #define TOR_VOTING_SCHEDULE_H
#include "or/or.h" #include "core/or/or.h"
/** Scheduling information for a voting interval. */ /** Scheduling information for a voting interval. */
typedef struct { typedef struct {

28
src/feature/hibernate/hibernate.c
View File

@ -28,23 +28,23 @@ hibernating, phase 2:
*/ */
#define HIBERNATE_PRIVATE #define HIBERNATE_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/channel.h" #include "core/or/channel.h"
#include "or/channeltls.h" #include "core/or/channeltls.h"
#include "or/config.h" #include "app/config/config.h"
#include "or/connection.h" #include "core/mainloop/connection.h"
#include "or/connection_edge.h" #include "core/or/connection_edge.h"
#include "or/connection_or.h" #include "core/or/connection_or.h"
#include "or/control.h" #include "feature/control/control.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "or/hibernate.h" #include "feature/hibernate/hibernate.h"
#include "or/main.h" #include "core/mainloop/main.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/statefile.h" #include "app/config/statefile.h"
#include "lib/evloop/compat_libevent.h" #include "lib/evloop/compat_libevent.h"
#include "or/or_connection_st.h" #include "core/or/or_connection_st.h"
#include "or/or_state_st.h" #include "app/config/or_state_st.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>

20
src/feature/hs/hs_cache.c
View File

@ -9,20 +9,20 @@
/* For unit tests.*/ /* For unit tests.*/
#define HS_CACHE_PRIVATE #define HS_CACHE_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/config.h" #include "app/config/config.h"
#include "lib/crypt_ops/crypto_format.h" #include "lib/crypt_ops/crypto_format.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/hs_ident.h" #include "feature/hs/hs_ident.h"
#include "or/hs_common.h" #include "feature/hs/hs_common.h"
#include "or/hs_client.h" #include "feature/hs/hs_client.h"
#include "or/hs_descriptor.h" #include "feature/hs/hs_descriptor.h"
#include "or/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "or/rendcache.h" #include "feature/rend/rendcache.h"
#include "or/hs_cache.h" #include "feature/hs/hs_cache.h"
#include "or/networkstatus_st.h" #include "feature/nodelist/networkstatus_st.h"
static int cached_client_descriptor_has_expired(time_t now, static int cached_client_descriptor_has_expired(time_t now,
const hs_cache_client_descriptor_t *cached_desc); const hs_cache_client_descriptor_t *cached_desc);

8
src/feature/hs/hs_cache.h
View File

@ -11,10 +11,10 @@
#include <stdint.h> #include <stdint.h>
#include "or/hs_common.h" #include "feature/hs/hs_common.h"
#include "or/hs_descriptor.h" #include "feature/hs/hs_descriptor.h"
#include "or/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "or/torcert.h" #include "feature/nodelist/torcert.h"
struct ed25519_public_key_t; struct ed25519_public_key_t;

14
src/feature/hs/hs_cell.c
View File

@ -6,16 +6,16 @@
* \brief Hidden service API for cell creation and handling. * \brief Hidden service API for cell creation and handling.
**/ **/
#include "or/or.h" #include "core/or/or.h"
#include "or/config.h" #include "app/config/config.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/rendservice.h" #include "feature/rend/rendservice.h"
#include "or/replaycache.h" #include "feature/hs_common/replaycache.h"
#include "or/hs_cell.h" #include "feature/hs/hs_cell.h"
#include "or/hs_ntor.h" #include "core/crypto/hs_ntor.h"
#include "or/origin_circuit_st.h" #include "core/or/origin_circuit_st.h"
/* Trunnel. */ /* Trunnel. */
#include "trunnel/ed25519_cert.h" #include "trunnel/ed25519_cert.h"

4
src/feature/hs/hs_cell.h
View File

@ -9,8 +9,8 @@
#ifndef TOR_HS_CELL_H #ifndef TOR_HS_CELL_H
#define TOR_HS_CELL_H #define TOR_HS_CELL_H
#include "or/or.h" #include "core/or/or.h"
#include "or/hs_service.h" #include "feature/hs/hs_service.h"
/* An INTRODUCE1 cell requires at least this amount of bytes (see section /* An INTRODUCE1 cell requires at least this amount of bytes (see section
* 3.2.2 of the specification). Below this value, the cell must be padded. */ * 3.2.2 of the specification). Below this value, the cell must be padded. */

44
src/feature/hs/hs_circuit.c
View File

@ -7,38 +7,38 @@
#define HS_CIRCUIT_PRIVATE #define HS_CIRCUIT_PRIVATE
#include "or/or.h" #include "core/or/or.h"
#include "or/circpathbias.h" #include "feature/client/circpathbias.h"
#include "or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "or/circuitlist.h" #include "core/or/circuitlist.h"
#include "or/circuituse.h" #include "core/or/circuituse.h"
#include "or/config.h" #include "app/config/config.h"
#include "lib/crypt_ops/crypto_dh.h" #include "lib/crypt_ops/crypto_dh.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "or/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "or/policies.h" #include "core/or/policies.h"
#include "or/relay.h" #include "core/or/relay.h"
#include "or/rendservice.h" #include "feature/rend/rendservice.h"
#include "or/rephist.h" #include "feature/stats/rephist.h"
#include "or/router.h" #include "feature/relay/router.h"
#include "or/hs_cell.h" #include "feature/hs/hs_cell.h"
#include "or/hs_circuitmap.h" #include "feature/hs/hs_circuitmap.h"
#include "or/hs_ident.h" #include "feature/hs/hs_ident.h"
#include "or/hs_ntor.h" #include "core/crypto/hs_ntor.h"
#include "or/hs_service.h" #include "feature/hs/hs_service.h"
#include "or/hs_circuit.h" #include "feature/hs/hs_circuit.h"
/* Trunnel. */ /* Trunnel. */
#include "trunnel/ed25519_cert.h" #include "trunnel/ed25519_cert.h"
#include "trunnel/hs/cell_common.h" #include "trunnel/hs/cell_common.h"
#include "trunnel/hs/cell_establish_intro.h" #include "trunnel/hs/cell_establish_intro.h"
#include "or/cpath_build_state_st.h" #include "core/or/cpath_build_state_st.h"
#include "or/crypt_path_st.h" #include "core/or/crypt_path_st.h"
#include "or/node_st.h" #include "feature/nodelist/node_st.h"
#include "or/origin_circuit_st.h" #include "core/or/origin_circuit_st.h"
/* A circuit is about to become an e2e rendezvous circuit. Check /* A circuit is about to become an e2e rendezvous circuit. Check
* <b>circ_purpose</b> and ensure that it's properly set. Return true iff * <b>circ_purpose</b> and ensure that it's properly set. Return true iff

Some files were not shown because too many files have changed in this diff Show More