Browse Source

Move literally everything out of src/or

This commit won't build yet -- it just puts everything in a slightly
more logical place.

The reasoning here is that "src/core" will hold the stuff that every (or
nearly every) tor instance will need in order to do onion routing.
Other features (including some necessary ones) will live in
"src/feature".  The "src/app" directory will hold the stuff needed
to have Tor be an application you can actually run.

This commit DOES NOT refactor the former contents of src/or into a
logical set of acyclic libraries, or change any code at all.  That
will have to come in the future.

We will continue to move things around and split them in the future,
but I hope this lays a reasonable groundwork for doing so.
Nick Mathewson 5 years ago
parent
commit
63b4ea22af
100 changed files with 3 additions and 3 deletions
  1. 0 0
      src/app/config/auth_dirs.inc
  2. 0 0
      src/app/config/config.c
  3. 0 0
      src/app/config/config.h
  4. 0 0
      src/app/config/confparse.c
  5. 0 0
      src/app/config/confparse.h
  6. 0 0
      src/app/config/fallback_dirs.inc
  7. 0 0
      src/app/config/or_options_st.h
  8. 0 0
      src/app/config/or_state_st.h
  9. 0 0
      src/app/config/statefile.c
  10. 0 0
      src/app/config/statefile.h
  11. 3 3
      src/app/include.am
  12. 0 0
      src/app/main/ntmain.c
  13. 0 0
      src/app/main/ntmain.h
  14. 0 0
      src/app/main/tor_main.c
  15. 0 0
      src/core/crypto/hs_ntor.c
  16. 0 0
      src/core/crypto/hs_ntor.h
  17. 0 0
      src/core/crypto/onion.c
  18. 0 0
      src/core/crypto/onion.h
  19. 0 0
      src/core/crypto/onion_fast.c
  20. 0 0
      src/core/crypto/onion_fast.h
  21. 0 0
      src/core/crypto/onion_ntor.c
  22. 0 0
      src/core/crypto/onion_ntor.h
  23. 0 0
      src/core/crypto/onion_tap.c
  24. 0 0
      src/core/crypto/onion_tap.h
  25. 0 0
      src/core/crypto/relay_crypto.c
  26. 0 0
      src/core/crypto/relay_crypto.h
  27. 0 0
      src/core/mainloop/connection.c
  28. 0 0
      src/core/mainloop/connection.h
  29. 0 0
      src/core/mainloop/cpuworker.c
  30. 0 0
      src/core/mainloop/cpuworker.h
  31. 0 0
      src/core/mainloop/main.c
  32. 0 0
      src/core/mainloop/main.h
  33. 0 0
      src/core/mainloop/periodic.c
  34. 0 0
      src/core/mainloop/periodic.h
  35. 0 0
      src/core/or/addr_policy_st.h
  36. 0 0
      src/core/or/address_set.c
  37. 0 0
      src/core/or/address_set.h
  38. 0 0
      src/core/or/cell_queue_st.h
  39. 0 0
      src/core/or/cell_st.h
  40. 0 0
      src/core/or/channel.c
  41. 0 0
      src/core/or/channel.h
  42. 0 0
      src/core/or/channelpadding.c
  43. 0 0
      src/core/or/channelpadding.h
  44. 0 0
      src/core/or/channeltls.c
  45. 0 0
      src/core/or/channeltls.h
  46. 0 0
      src/core/or/circuit_st.h
  47. 0 0
      src/core/or/circuitbuild.c
  48. 0 0
      src/core/or/circuitbuild.h
  49. 0 0
      src/core/or/circuitlist.c
  50. 0 0
      src/core/or/circuitlist.h
  51. 0 0
      src/core/or/circuitmux.c
  52. 0 0
      src/core/or/circuitmux.h
  53. 0 0
      src/core/or/circuitmux_ewma.c
  54. 0 0
      src/core/or/circuitmux_ewma.h
  55. 0 0
      src/core/or/circuitstats.c
  56. 0 0
      src/core/or/circuitstats.h
  57. 0 0
      src/core/or/circuituse.c
  58. 0 0
      src/core/or/circuituse.h
  59. 0 0
      src/core/or/command.c
  60. 0 0
      src/core/or/command.h
  61. 0 0
      src/core/or/connection_edge.c
  62. 0 0
      src/core/or/connection_edge.h
  63. 0 0
      src/core/or/connection_or.c
  64. 0 0
      src/core/or/connection_or.h
  65. 0 0
      src/core/or/connection_st.h
  66. 0 0
      src/core/or/cpath_build_state_st.h
  67. 0 0
      src/core/or/crypt_path_reference_st.h
  68. 0 0
      src/core/or/crypt_path_st.h
  69. 0 0
      src/core/or/destroy_cell_queue_st.h
  70. 0 0
      src/core/or/dos.c
  71. 0 0
      src/core/or/dos.h
  72. 0 0
      src/core/or/edge_connection_st.h
  73. 0 0
      src/core/or/entry_connection_st.h
  74. 0 0
      src/core/or/entry_port_cfg_st.h
  75. 0 0
      src/core/or/extend_info_st.h
  76. 0 0
      src/core/or/git_revision.c
  77. 0 0
      src/core/or/git_revision.h
  78. 0 0
      src/core/or/listener_connection_st.h
  79. 0 0
      src/core/or/or.h
  80. 0 0
      src/core/or/or_circuit_st.h
  81. 0 0
      src/core/or/or_connection_st.h
  82. 0 0
      src/core/or/or_handshake_certs_st.h
  83. 0 0
      src/core/or/or_handshake_state_st.h
  84. 0 0
      src/core/or/origin_circuit_st.h
  85. 0 0
      src/core/or/policies.c
  86. 0 0
      src/core/or/policies.h
  87. 0 0
      src/core/or/port_cfg_st.h
  88. 0 0
      src/core/or/reasons.c
  89. 0 0
      src/core/or/reasons.h
  90. 0 0
      src/core/or/relay.c
  91. 0 0
      src/core/or/relay.h
  92. 0 0
      src/core/or/relay_crypto_st.h
  93. 0 0
      src/core/or/scheduler.c
  94. 0 0
      src/core/or/scheduler.h
  95. 0 0
      src/core/or/scheduler_kist.c
  96. 0 0
      src/core/or/scheduler_vanilla.c
  97. 0 0
      src/core/or/server_port_cfg_st.h
  98. 0 0
      src/core/or/socks_request_st.h
  99. 0 0
      src/core/or/status.c
  100. 0 0
      src/core/or/status.h

+ 0 - 0
src/or/auth_dirs.inc → src/app/config/auth_dirs.inc


+ 0 - 0
src/or/config.c → src/app/config/config.c


+ 0 - 0
src/or/config.h → src/app/config/config.h


+ 0 - 0
src/or/confparse.c → src/app/config/confparse.c


+ 0 - 0
src/or/confparse.h → src/app/config/confparse.h


+ 0 - 0
src/or/fallback_dirs.inc → src/app/config/fallback_dirs.inc


+ 0 - 0
src/or/or_options_st.h → src/app/config/or_options_st.h


+ 0 - 0
src/or/or_state_st.h → src/app/config/or_state_st.h


+ 0 - 0
src/or/statefile.c → src/app/config/statefile.c


+ 0 - 0
src/or/statefile.h → src/app/config/statefile.h


+ 3 - 3
src/app/include.am

@@ -6,11 +6,11 @@ noinst_PROGRAMS+= src/app/tor-cov
 endif
 
 noinst_HEADERS += \
-	src/app/ntmain.h
+	src/app/main/ntmain.h
 
-src_app_tor_SOURCES = src/app/tor_main.c
+src_app_tor_SOURCES = src/app/main/tor_main.c
 if BUILD_NT_SERVICES
-src_app_tor_SOURCES += src/app/ntmain.c
+src_app_tor_SOURCES += src/app/main/ntmain.c
 endif
 
 # -L flags need to go in LDFLAGS. -l flags need to go in LDADD.

+ 0 - 0
src/app/ntmain.c → src/app/main/ntmain.c


+ 0 - 0
src/app/ntmain.h → src/app/main/ntmain.h


+ 0 - 0
src/app/tor_main.c → src/app/main/tor_main.c


+ 0 - 0
src/or/hs_ntor.c → src/core/crypto/hs_ntor.c


+ 0 - 0
src/or/hs_ntor.h → src/core/crypto/hs_ntor.h


+ 0 - 0
src/or/onion.c → src/core/crypto/onion.c


+ 0 - 0
src/or/onion.h → src/core/crypto/onion.h


+ 0 - 0
src/or/onion_fast.c → src/core/crypto/onion_fast.c


+ 0 - 0
src/or/onion_fast.h → src/core/crypto/onion_fast.h


+ 0 - 0
src/or/onion_ntor.c → src/core/crypto/onion_ntor.c


+ 0 - 0
src/or/onion_ntor.h → src/core/crypto/onion_ntor.h


+ 0 - 0
src/or/onion_tap.c → src/core/crypto/onion_tap.c


+ 0 - 0
src/or/onion_tap.h → src/core/crypto/onion_tap.h


+ 0 - 0
src/or/relay_crypto.c → src/core/crypto/relay_crypto.c


+ 0 - 0
src/or/relay_crypto.h → src/core/crypto/relay_crypto.h


+ 0 - 0
src/or/connection.c → src/core/mainloop/connection.c


+ 0 - 0
src/or/connection.h → src/core/mainloop/connection.h


+ 0 - 0
src/or/cpuworker.c → src/core/mainloop/cpuworker.c


+ 0 - 0
src/or/cpuworker.h → src/core/mainloop/cpuworker.h


+ 0 - 0
src/or/main.c → src/core/mainloop/main.c


+ 0 - 0
src/or/main.h → src/core/mainloop/main.h


+ 0 - 0
src/or/periodic.c → src/core/mainloop/periodic.c


+ 0 - 0
src/or/periodic.h → src/core/mainloop/periodic.h


+ 0 - 0
src/or/addr_policy_st.h → src/core/or/addr_policy_st.h


+ 0 - 0
src/or/address_set.c → src/core/or/address_set.c


+ 0 - 0
src/or/address_set.h → src/core/or/address_set.h


+ 0 - 0
src/or/cell_queue_st.h → src/core/or/cell_queue_st.h


+ 0 - 0
src/or/cell_st.h → src/core/or/cell_st.h


+ 0 - 0
src/or/channel.c → src/core/or/channel.c


+ 0 - 0
src/or/channel.h → src/core/or/channel.h


+ 0 - 0
src/or/channelpadding.c → src/core/or/channelpadding.c


+ 0 - 0
src/or/channelpadding.h → src/core/or/channelpadding.h


+ 0 - 0
src/or/channeltls.c → src/core/or/channeltls.c


+ 0 - 0
src/or/channeltls.h → src/core/or/channeltls.h


+ 0 - 0
src/or/circuit_st.h → src/core/or/circuit_st.h


+ 0 - 0
src/or/circuitbuild.c → src/core/or/circuitbuild.c


+ 0 - 0
src/or/circuitbuild.h → src/core/or/circuitbuild.h


+ 0 - 0
src/or/circuitlist.c → src/core/or/circuitlist.c


+ 0 - 0
src/or/circuitlist.h → src/core/or/circuitlist.h


+ 0 - 0
src/or/circuitmux.c → src/core/or/circuitmux.c


+ 0 - 0
src/or/circuitmux.h → src/core/or/circuitmux.h


+ 0 - 0
src/or/circuitmux_ewma.c → src/core/or/circuitmux_ewma.c


+ 0 - 0
src/or/circuitmux_ewma.h → src/core/or/circuitmux_ewma.h


+ 0 - 0
src/or/circuitstats.c → src/core/or/circuitstats.c


+ 0 - 0
src/or/circuitstats.h → src/core/or/circuitstats.h


+ 0 - 0
src/or/circuituse.c → src/core/or/circuituse.c


+ 0 - 0
src/or/circuituse.h → src/core/or/circuituse.h


+ 0 - 0
src/or/command.c → src/core/or/command.c


+ 0 - 0
src/or/command.h → src/core/or/command.h


+ 0 - 0
src/or/connection_edge.c → src/core/or/connection_edge.c


+ 0 - 0
src/or/connection_edge.h → src/core/or/connection_edge.h


+ 0 - 0
src/or/connection_or.c → src/core/or/connection_or.c


+ 0 - 0
src/or/connection_or.h → src/core/or/connection_or.h


+ 0 - 0
src/or/connection_st.h → src/core/or/connection_st.h


+ 0 - 0
src/or/cpath_build_state_st.h → src/core/or/cpath_build_state_st.h


+ 0 - 0
src/or/crypt_path_reference_st.h → src/core/or/crypt_path_reference_st.h


+ 0 - 0
src/or/crypt_path_st.h → src/core/or/crypt_path_st.h


+ 0 - 0
src/or/destroy_cell_queue_st.h → src/core/or/destroy_cell_queue_st.h


+ 0 - 0
src/or/dos.c → src/core/or/dos.c


+ 0 - 0
src/or/dos.h → src/core/or/dos.h


+ 0 - 0
src/or/edge_connection_st.h → src/core/or/edge_connection_st.h


+ 0 - 0
src/or/entry_connection_st.h → src/core/or/entry_connection_st.h


+ 0 - 0
src/or/entry_port_cfg_st.h → src/core/or/entry_port_cfg_st.h


+ 0 - 0
src/or/extend_info_st.h → src/core/or/extend_info_st.h


+ 0 - 0
src/or/git_revision.c → src/core/or/git_revision.c


+ 0 - 0
src/or/git_revision.h → src/core/or/git_revision.h


+ 0 - 0
src/or/listener_connection_st.h → src/core/or/listener_connection_st.h


+ 0 - 0
src/or/or.h → src/core/or/or.h


+ 0 - 0
src/or/or_circuit_st.h → src/core/or/or_circuit_st.h


+ 0 - 0
src/or/or_connection_st.h → src/core/or/or_connection_st.h


+ 0 - 0
src/or/or_handshake_certs_st.h → src/core/or/or_handshake_certs_st.h


+ 0 - 0
src/or/or_handshake_state_st.h → src/core/or/or_handshake_state_st.h


+ 0 - 0
src/or/origin_circuit_st.h → src/core/or/origin_circuit_st.h


+ 0 - 0
src/or/policies.c → src/core/or/policies.c


+ 0 - 0
src/or/policies.h → src/core/or/policies.h


+ 0 - 0
src/or/port_cfg_st.h → src/core/or/port_cfg_st.h


+ 0 - 0
src/or/reasons.c → src/core/or/reasons.c


+ 0 - 0
src/or/reasons.h → src/core/or/reasons.h


+ 0 - 0
src/or/relay.c → src/core/or/relay.c


+ 0 - 0
src/or/relay.h → src/core/or/relay.h


+ 0 - 0
src/or/relay_crypto_st.h → src/core/or/relay_crypto_st.h


+ 0 - 0
src/or/scheduler.c → src/core/or/scheduler.c


+ 0 - 0
src/or/scheduler.h → src/core/or/scheduler.h


+ 0 - 0
src/or/scheduler_kist.c → src/core/or/scheduler_kist.c


+ 0 - 0
src/or/scheduler_vanilla.c → src/core/or/scheduler_vanilla.c


+ 0 - 0
src/or/server_port_cfg_st.h → src/core/or/server_port_cfg_st.h


+ 0 - 0
src/or/socks_request_st.h → src/core/or/socks_request_st.h


+ 0 - 0
src/or/status.c → src/core/or/status.c


+ 0 - 0
src/or/status.h → src/core/or/status.h


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