From 667a6e8fe9b8169e86f3ab889c4ea8af845d6939 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 5 Jul 2018 17:08:26 -0400
Subject: [PATCH] Whoops. Protover.[ch] belong in src/core/or
---
src/core/include.am | 4 ++--
src/core/mainloop/main.c | 2 +-
src/core/{proto => or}/protover.c | 2 +-
src/core/{proto => or}/protover.h | 0
src/core/proto/protover_rust.c | 2 +-
src/feature/dirauth/dirvote.c | 2 +-
src/feature/dircache/dirserv.c | 2 +-
src/feature/nodelist/networkstatus.c | 2 +-
src/feature/nodelist/nodelist.c | 2 +-
src/feature/nodelist/routerparse.c | 2 +-
src/feature/relay/router.c | 2 +-
src/test/test_protover.c | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
rename src/core/{proto => or}/protover.c (99%)
rename src/core/{proto => or}/protover.h (100%)
diff --git a/src/core/include.am b/src/core/include.am
index 111a1e0137..23c283d8d1 100644
--- 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 bad9490971..4479367787 100644
--- 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 3ae91688d6..362a5becac 100644
--- 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 55b0ebedf9..dbdd5c8237 100644
--- 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 2825465677..ce67c1bb9a 100644
--- 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 0e1d0645e3..c5286b0cbf 100644
--- 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 366410d68e..e9d36cbdcb 100644
--- 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 e434dd2d18..03122ba0f7 100644
--- 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 e1dfe972d3..166806e9c1 100644
--- 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 c52ac1f9c3..25afbe9f34 100644
--- 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 a90ff5a08c..5bbf997fde 100644
--- 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"
--
GitLab