Whoops. Protover.[ch] belong in src/core/or

diff --git a/src/core/include.am b/src/core/include.am
index 111a1e013749d6d7f0c00e3683cf3f335a52dd54..23c283d8d1acc854d34aca62d18979108daa7fc8 100644 (file)
--- a/src/core/include.am
+++ b/src/core/include.am
@@ -12,7 +12,6 @@ LIBTOR_APP_A_SOURCES =                                \
        src/app/config/statefile.c              \
        src/core/proto/proto_socks.c            \
        src/core/proto/protover_rust.c          \
-       src/core/proto/protover.c               \
        src/core/proto/proto_ext_or.c           \
        src/core/proto/proto_cell.c             \
        src/core/proto/proto_http.c             \
@@ -44,6 +43,7 @@ LIBTOR_APP_A_SOURCES =                                \
        src/core/or/scheduler_vanilla.c         \
        src/core/or/connection_edge.c           \
        src/core/or/dos.c                       \
+       src/core/or/protover.c                  \
        src/core/or/address_set.c               \
        src/core/or/command.c                   \
        src/core/or/channel.c                   \
@@ -149,7 +149,6 @@ noinst_HEADERS +=                                   \
        src/app/config/or_state_st.h                    \
        src/app/config/confparse.h                      \
        src/app/main/ntmain.h                           \
-       src/core/proto/protover.h                       \
        src/core/proto/proto_ext_or.h                   \
        src/core/proto/proto_http.h                     \
        src/core/proto/proto_cell.h                     \
@@ -190,6 +189,7 @@ noinst_HEADERS +=                                   \
        src/core/or/or_handshake_certs_st.h             \
        src/core/or/dos.h                               \
        src/core/or/or_connection_st.h                  \
+       src/core/or/protover.h                          \
        src/core/or/channel.h                           \
        src/core/or/or_circuit_st.h                     \
        src/core/or/entry_port_cfg_st.h                 \

diff --git a/src/core/mainloop/main.c b/src/core/mainloop/main.c
index bad949097109c4b8e852d8b0b330a85f3d7c3d64..4479367787bb9f22478fd07486961ae206d41745 100644 (file)
--- a/src/core/mainloop/main.c
+++ b/src/core/mainloop/main.c
@@ -92,7 +92,7 @@
 #include "core/crypto/onion.h"
 #include "core/mainloop/periodic.h"
 #include "core/or/policies.h"
-#include "core/proto/protover.h"
+#include "core/or/protover.h"
 #include "feature/client/transports.h"
 #include "core/or/relay.h"
 #include "feature/rend/rendclient.h"

diff --git a/src/core/proto/protover.c b/src/core/or/protover.c
similarity index 99%
rename from src/core/proto/protover.c
rename to src/core/or/protover.c
index 3ae91688d667522ec640bd221fc836898165b164..362a5becac9917a9aee14c600c0eb40ca347f9cc 100644 (file)
--- a/src/core/proto/protover.c
+++ b/src/core/or/protover.c
@@ -24,7 +24,7 @@
 #define PROTOVER_PRIVATE
 
 #include "core/or/or.h"
-#include "core/proto/protover.h"
+#include "core/or/protover.h"
 #include "feature/nodelist/routerparse.h"
 
 #ifndef HAVE_RUST

diff --git a/src/core/proto/protover.h b/src/core/or/protover.h
similarity index 100%
rename from src/core/proto/protover.h
rename to src/core/or/protover.h

diff --git a/src/core/proto/protover_rust.c b/src/core/proto/protover_rust.c
index 55b0ebedf97c3dceb0404ea22180ba4563fa44dc..dbdd5c8237e0dc6cfe105a684e8358b3347c70be 100644 (file)
--- a/src/core/proto/protover_rust.c
+++ b/src/core/proto/protover_rust.c
@@ -8,7 +8,7 @@
  */
 
 #include "core/or/or.h"
-#include "core/proto/protover.h"
+#include "core/or/protover.h"
 
 #ifdef HAVE_RUST
 

diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index 28254656771a3ec8bb25e3b922f0f13ecbf7d599..ce67c1bb9adfe6a6ddd1a72049581364c41a89a0 100644 (file)
--- a/src/feature/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
@@ -14,7 +14,7 @@
 #include "feature/nodelist/nodelist.h"
 #include "feature/nodelist/parsecommon.h"
 #include "core/or/policies.h"
-#include "core/proto/protover.h"
+#include "core/or/protover.h"
 #include "feature/stats/rephist.h"
 #include "feature/relay/router.h"
 #include "feature/relay/routerkeys.h"

diff --git a/src/feature/dircache/dirserv.c b/src/feature/dircache/dirserv.c
index 0e1d0645e3f08949790f3a8a09f909c9382f9e49..c5286b0cbfa1c62593a1ead654fd763d774926bb 100644 (file)
--- a/src/feature/dircache/dirserv.c
+++ b/src/feature/dircache/dirserv.c
@@ -25,7 +25,7 @@
 #include "feature/nodelist/networkstatus.h"
 #include "feature/nodelist/nodelist.h"
 #include "core/or/policies.h"
-#include "core/proto/protover.h"
+#include "core/or/protover.h"
 #include "feature/stats/rephist.h"
 #include "feature/relay/router.h"
 #include "feature/nodelist/routerlist.h"

diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c
index 366410d68eeee7bd35e275d5565cdbf61f2bc184..e9d36cbdcba6392c82d270fb9eb5874ab278d1ea 100644 (file)
--- a/src/feature/nodelist/networkstatus.c
+++ b/src/feature/nodelist/networkstatus.c
@@ -60,7 +60,7 @@
 #include "feature/nodelist/microdesc.h"
 #include "feature/nodelist/networkstatus.h"
 #include "feature/nodelist/nodelist.h"
-#include "core/proto/protover.h"
+#include "core/or/protover.h"
 #include "core/or/relay.h"
 #include "feature/relay/router.h"
 #include "feature/nodelist/routerlist.h"

diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c
index e434dd2d18785a96fc1b257e6759dd52cfac847c..03122ba0f7fe5b6e0805e354c2d8cf6fad1260a0 100644 (file)
--- a/src/feature/nodelist/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@ -56,7 +56,7 @@
 #include "feature/nodelist/networkstatus.h"
 #include "feature/nodelist/nodelist.h"
 #include "core/or/policies.h"
-#include "core/proto/protover.h"
+#include "core/or/protover.h"
 #include "feature/rend/rendservice.h"
 #include "feature/relay/router.h"
 #include "feature/nodelist/routerlist.h"

diff --git a/src/feature/nodelist/routerparse.c b/src/feature/nodelist/routerparse.c
index e1dfe972d3981827625f4bc83777d66473202cfb..166806e9c1af41a8dbaf0553a5da0a0d10776b4f 100644 (file)
--- a/src/feature/nodelist/routerparse.c
+++ b/src/feature/nodelist/routerparse.c
@@ -68,7 +68,7 @@
 #include "feature/nodelist/networkstatus.h"
 #include "feature/nodelist/parsecommon.h"
 #include "core/or/policies.h"
-#include "core/proto/protover.h"
+#include "core/or/protover.h"
 #include "feature/rend/rendcommon.h"
 #include "feature/stats/rephist.h"
 #include "feature/relay/router.h"

diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index c52ac1f9c342c317d7592e47358274071b57f984..25afbe9f34131cff299c28018bb261b23b9ac302 100644 (file)
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -25,7 +25,7 @@
 #include "feature/nodelist/networkstatus.h"
 #include "feature/nodelist/nodelist.h"
 #include "core/or/policies.h"
-#include "core/proto/protover.h"
+#include "core/or/protover.h"
 #include "core/or/relay.h"
 #include "feature/stats/rephist.h"
 #include "feature/relay/router.h"

diff --git a/src/test/test_protover.c b/src/test/test_protover.c
index a90ff5a08c5cd61ac86b0d078bbc2e14fdb889a5..5bbf997fde341383954d5bffddcb5059a2e694f5 100644 (file)
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@ -6,7 +6,7 @@
 #include "orconfig.h"
 #include "test/test.h"
 
-#include "core/proto/protover.h"
+#include "core/or/protover.h"
 
 #include "core/or/or.h"
 #include "core/or/connection_or.h"