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