Clean up include paths for libtor-evloop (automated)

diff --git a/src/lib/evloop/compat_libevent.c b/src/lib/evloop/compat_libevent.c
index 9d21cf20bdeccc50e8e29c841b4b139c37f46c96..5e5faf163c718bb4664f9534a243b464ff7c2aee 100644 (file)
--- a/src/lib/evloop/compat_libevent.c
+++ b/src/lib/evloop/compat_libevent.c
@@ -8,7 +8,7 @@
 
 #include "orconfig.h"
 #define COMPAT_LIBEVENT_PRIVATE
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/log/torlog.h"

diff --git a/src/lib/evloop/procmon.c b/src/lib/evloop/procmon.c
index 6c2b3e71e59a05a4e1c4ac302529c12b639e73b5..a923fbad7472a731001b4fb0b5db22dd243234b8 100644 (file)
--- a/src/lib/evloop/procmon.c
+++ b/src/lib/evloop/procmon.c
@@ -6,7 +6,7 @@
  * \brief Process-termination monitor functions
  **/
 
-#include "common/procmon.h"
+#include "lib/evloop/procmon.h"
 
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"

diff --git a/src/lib/evloop/procmon.h b/src/lib/evloop/procmon.h
index b8daeed0db52dd8e2eabb0eed97bb9d91044c7b2..b596e5cc6de6afc1f3fb1688953634546bcdacea 100644 (file)
--- a/src/lib/evloop/procmon.h
+++ b/src/lib/evloop/procmon.h
@@ -9,7 +9,7 @@
 #ifndef TOR_PROCMON_H
 #define TOR_PROCMON_H
 
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 
 #include "lib/log/torlog.h"
 

diff --git a/src/lib/evloop/timers.c b/src/lib/evloop/timers.c
index ff92a2e4475ee9e931cbe113c3b22f3a1c3e3b38..c07bd2e72681ca953ff57c6744980e5e280d4177 100644 (file)
--- a/src/lib/evloop/timers.c
+++ b/src/lib/evloop/timers.c
@@ -31,8 +31,8 @@
 
 #define TOR_TIMERS_PRIVATE
 
-#include "common/compat_libevent.h"
-#include "common/timers.h"
+#include "lib/evloop/compat_libevent.h"
+#include "lib/evloop/timers.h"
 #include "lib/intmath/muldiv.h"
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"

diff --git a/src/lib/evloop/token_bucket.c b/src/lib/evloop/token_bucket.c
index f7b092f612d6eac78b755e843ab01743ebe24d39..f7cd05c6c56db58811c0f231617dd387543f8ed8 100644 (file)
--- a/src/lib/evloop/token_bucket.c
+++ b/src/lib/evloop/token_bucket.c
@@ -18,7 +18,7 @@
 
 #define TOKEN_BUCKET_PRIVATE
 
-#include "common/token_bucket.h"
+#include "lib/evloop/token_bucket.h"
 #include "lib/log/util_bug.h"
 #include "lib/intmath/cmp.h"
 #include "lib/time/compat_time.h"

diff --git a/src/lib/evloop/workqueue.c b/src/lib/evloop/workqueue.c
index e5254396f912aa552538c629341a2b8b4548720c..4d36f352e3abf84d882ef3e0497c1a087ca8eae6 100644 (file)
--- a/src/lib/evloop/workqueue.c
+++ b/src/lib/evloop/workqueue.c
@@ -24,8 +24,8 @@
  */
 
 #include "orconfig.h"
-#include "common/compat_libevent.h"
-#include "common/workqueue.h"
+#include "lib/evloop/compat_libevent.h"
+#include "lib/evloop/workqueue.h"
 
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/intmath/weakrng.h"

diff --git a/src/or/channel.c b/src/or/channel.c
index 2dbacbde982d4a05346f1fd86d5d4c584e33c88b..e6d717f111dfb9c8ffc5db10a7ec7766364d2475 100644 (file)
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -79,7 +79,7 @@
 #include "lib/time/compat_time.h"
 #include "or/networkstatus.h"
 #include "or/rendservice.h"
-#include "common/timers.h"
+#include "lib/evloop/timers.h"
 
 #include "or/cell_queue_st.h"
 

diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c
index 298fea79a998dfecba109f45f4e0fa65a1d177c4..504f6f8f8382d20ff3bf22bbfc366be7174598cf 100644 (file)
--- a/src/or/channelpadding.c
+++ b/src/or/channelpadding.c
@@ -22,7 +22,7 @@
 #include "or/router.h"
 #include "lib/time/compat_time.h"
 #include "or/rendservice.h"
-#include "common/timers.h"
+#include "lib/evloop/timers.h"
 
 #include "or/cell_st.h"
 #include "or/or_connection_st.h"

diff --git a/src/or/config.c b/src/or/config.c
index 6dc2ad1d5b884134e2583d72736770e4957d6359..9b2706982a8d880f37157cea02c62280ade1523d 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -131,7 +131,7 @@
 
 #include "lib/encoding/keyval.h"
 #include "lib/fs/conffile.h"
-#include "common/procmon.h"
+#include "lib/evloop/procmon.h"
 
 #include "or/dirauth/dirvote.h"
 #include "or/dirauth/mode.h"

diff --git a/src/or/connection.c b/src/or/connection.c
index 9680b08b56c5717bf7896ae8ae51befd0efb78d3..6fd8fbf771abbd866b5c2780bd144230ad93462e 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -105,7 +105,7 @@
 #include "lib/sandbox/sandbox.h"
 #include "lib/net/buffers_net.h"
 #include "lib/tls/tortls.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 #include "lib/compress/compress.h"
 
 #ifdef HAVE_PWD_H

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index f3f77dbc913fcf2754612769bf4a54c6ce34339e..13d957a937a2a6c199ffe8d5581e382dd7d1ccee 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -106,7 +106,7 @@
 #include "or/or_circuit_st.h"
 #include "or/origin_circuit_st.h"
 #include "or/socks_request_st.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 
 #ifdef HAVE_LINUX_TYPES_H
 #include <linux/types.h>

diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c
index c75b59c1f59fa876dfc21d676ab4fbbfd2ade3c4..6d5183f9349e93029c01430adc08a6cc33b91152 100644 (file)
--- a/src/or/consdiffmgr.c
+++ b/src/or/consdiffmgr.c
@@ -21,8 +21,8 @@
 #include "or/cpuworker.h"
 #include "or/networkstatus.h"
 #include "or/routerparse.h"
-#include "common/compat_libevent.h"
-#include "common/workqueue.h"
+#include "lib/evloop/compat_libevent.h"
+#include "lib/evloop/workqueue.h"
 #include "lib/compress/compress.h"
 #include "lib/encoding/confline.h"
 

diff --git a/src/or/control.c b/src/or/control.c
index ea124481267d6cc05766049e740741dd3eefc24b..aa43fccff00a4fb2975c146e8b5118bade190bfc 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -46,7 +46,7 @@
 #include "or/circuitstats.h"
 #include "or/circuituse.h"
 #include "or/command.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 #include "or/config.h"
 #include "or/confparse.h"
 #include "or/connection.h"
@@ -113,8 +113,8 @@
 #endif
 
 #include "lib/crypt_ops/crypto_s2k.h"
-#include "common/procmon.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/procmon.h"
+#include "lib/evloop/compat_libevent.h"
 
 /** Yield true iff <b>s</b> is the state of a control_connection_t that has
  * finished authentication and is accepting commands. */

diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index b37dfd168439882eefd0adc144247440b0dd2ee5..8b58e4c68c38daa26752dcdfc5ddd441db9d109f 100644 (file)
--- a/src/or/cpuworker.c
+++ b/src/or/cpuworker.c
@@ -30,7 +30,7 @@
 #include "or/onion.h"
 #include "or/rephist.h"
 #include "or/router.h"
-#include "common/workqueue.h"
+#include "lib/evloop/workqueue.h"
 
 #include "or/or_circuit_st.h"
 #include "lib/intmath/weakrng.h"

diff --git a/src/or/dns.c b/src/or/dns.c
index 45c4384eb1eef7cfd68a5830e3fe26e46b45bbb4..4ac58552f4242870f5e1909dd80273941068ceac 100644 (file)
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -64,7 +64,7 @@
 #include "or/router.h"
 #include "ht.h"
 #include "lib/sandbox/sandbox.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 
 #include "or/edge_connection_st.h"
 #include "or/or_circuit_st.h"

diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index d2ef4a496e2b4472d84fdb951ccb0f36fd44770a..6e752542391d14a7dc366f6af9d2ca9ffd309baf 100644 (file)
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -34,7 +34,7 @@
 #include "or/entry_connection_st.h"
 #include "or/listener_connection_st.h"
 #include "or/socks_request_st.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 
 #include <event2/dns.h>
 #include <event2/dns_compat.h>

diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index 1024c03546837fb8db4367fe3aca399de5e210b5..55de64c13e2c2982a097b15717abaf852332b71e 100644 (file)
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -41,7 +41,7 @@ hibernating, phase 2:
 #include "or/main.h"
 #include "or/router.h"
 #include "or/statefile.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 
 #include "or/or_connection_st.h"
 #include "or/or_state_st.h"

diff --git a/src/or/main.c b/src/or/main.c
index 408d9cf77c8c2f99b297dcf409d4f4b315bfae59..7e3eb2b595bfc2f4e76d2acdb9ac420ef9651ea6 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -117,9 +117,9 @@
 #include "lib/fs/lockfile.h"
 #include "lib/net/buffers_net.h"
 #include "lib/tls/tortls.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 #include "lib/encoding/confline.h"
-#include "common/timers.h"
+#include "lib/evloop/timers.h"
 
 #include <event2/event.h>
 

diff --git a/src/or/ntmain.c b/src/or/ntmain.c
index 99e77a285eb7a6f075cf68bd891d64398a9a39b3..f6b57753d3bbe8e7d946e025e9e0cae3689eb727 100644 (file)
--- a/src/or/ntmain.c
+++ b/src/or/ntmain.c
@@ -25,7 +25,7 @@
 #include "or/ntmain.h"
 #include "lib/log/win32err.h"
 #include "lib/fs/winlib.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 
 #include <windows.h>
 #define GENSRV_SERVICENAME  "tor"

diff --git a/src/or/or_connection_st.h b/src/or/or_connection_st.h
index dbfe7528b0e8dbcbd459d6d34436a3b998491ccb..8c2c1f89c647bb9f9d8f9efbc68b2eb835ed5072 100644 (file)
--- a/src/or/or_connection_st.h
+++ b/src/or/or_connection_st.h
@@ -8,7 +8,7 @@
 #define OR_CONNECTION_ST_H
 
 #include "or/connection_st.h"
-#include "common/token_bucket.h"
+#include "lib/evloop/token_bucket.h"
 
 struct tor_tls_t;
 

diff --git a/src/or/periodic.c b/src/or/periodic.c
index 0cbf359b2e31adf76f8e3da9f0530faeb41be6aa..041b2d287b9114daeecce1e590d3df2ef6b573ad 100644 (file)
--- a/src/or/periodic.c
+++ b/src/or/periodic.c
@@ -12,11 +12,11 @@
  */
 
 #include "or/or.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 #include "or/config.h"
 #include "or/main.h"
 #include "or/periodic.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 
 /** We disable any interval greater than this number of seconds, on the
  * grounds that it is probably an absolute time mistakenly passed in as a

diff --git a/src/or/scheduler.c b/src/or/scheduler.c
index 7c423064c7fae3a1be0fa8e0ccb536c8c3fe4cf1..b8eaca3dca8a6f728c4fb5e4cd45a44ea6fa24df 100644 (file)
--- a/src/or/scheduler.c
+++ b/src/or/scheduler.c
@@ -4,7 +4,7 @@
 #include "or/or.h"
 #include "or/config.h"
 
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 #define SCHEDULER_PRIVATE_
 #define SCHEDULER_KIST_PRIVATE
 #include "or/scheduler.h"
@@ -12,7 +12,7 @@
 #include "lib/container/buffers.h"
 #define TOR_CHANNEL_INTERNAL_
 #include "or/channeltls.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 
 #include "or/or_connection_st.h"
 

diff --git a/src/test/test-timers.c b/src/test/test-timers.c
index a2365a2e3815d61a2f8ef3d8a6d464e060bba539..f9276c25d6b8d76a1ef4eb16c7044e1e0f5c565b 100644 (file)
--- a/src/test/test-timers.c
+++ b/src/test/test-timers.c
@@ -7,8 +7,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "common/compat_libevent.h"
-#include "common/timers.h"
+#include "lib/evloop/compat_libevent.h"
+#include "lib/evloop/timers.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/log/util_bug.h"
 #include "lib/time/compat_time.h"

diff --git a/src/test/test_bwmgt.c b/src/test/test_bwmgt.c
index 604987e0704a763a217fca946c329cc2fdf7bd30..4cfca6c776c456fba2a1da17553a1d8fb8b44120 100644 (file)
--- a/src/test/test_bwmgt.c
+++ b/src/test/test_bwmgt.c
@@ -11,7 +11,7 @@
 #include "or/or.h"
 #include "test/test.h"
 
-#include "common/token_bucket.h"
+#include "lib/evloop/token_bucket.h"
 
 // an imaginary time, in timestamp units. Chosen so it will roll over.
 static const uint32_t START_TS = UINT32_MAX-10;

diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c
index 7e0c33f63b661cd51cc080e95a1de41fc8b001d6..ff2ab8daab76892dfce9b8370ec8a06e49ce8256 100644 (file)
--- a/src/test/test_channelpadding.c
+++ b/src/test/test_channelpadding.c
@@ -13,14 +13,14 @@
 #include "or/channel.h"
 #include "or/channeltls.h"
 #include "or/channelpadding.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 #include "or/config.h"
 #include "lib/time/compat_time.h"
 #include "or/main.h"
 #include "or/networkstatus.h"
 #include "test/log_test_helpers.h"
 #include "lib/tls/tortls.h"
-#include "common/timers.h"
+#include "lib/evloop/timers.h"
 #include "lib/container/buffers.h"
 
 #include "or/cell_st.h"

diff --git a/src/test/test_compat_libevent.c b/src/test/test_compat_libevent.c
index 8e591378563b8711c48f39961550bf8a8da61edd..1262a3140e9c67948b5ff747a73343b8e1a5e427 100644 (file)
--- a/src/test/test_compat_libevent.c
+++ b/src/test/test_compat_libevent.c
@@ -7,7 +7,7 @@
 
 #include "test/test.h"
 
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 
 #include <event2/event.h>
 

diff --git a/src/test/test_consdiffmgr.c b/src/test/test_consdiffmgr.c
index a0dfe95d354e4a3ed93785f7a01a9665026885b0..959075903f63b3c3e03a34d0e75327de2ee79b02 100644 (file)
--- a/src/test/test_consdiffmgr.c
+++ b/src/test/test_consdiffmgr.c
@@ -12,7 +12,7 @@
 #include "lib/crypt_ops/crypto_rand.h"
 #include "or/networkstatus.h"
 #include "or/routerparse.h"
-#include "common/workqueue.h"
+#include "lib/evloop/workqueue.h"
 #include "lib/compress/compress.h"
 #include "lib/encoding/confline.h"
 

diff --git a/src/test/test_oom.c b/src/test/test_oom.c
index 2e5989c0d09a49668838d74c1063b7bb0f8ccc53..6c3ee1a27bf4768c20f911e448252430f322550b 100644 (file)
--- a/src/test/test_oom.c
+++ b/src/test/test_oom.c
@@ -10,7 +10,7 @@
 #include "or/or.h"
 #include "lib/container/buffers.h"
 #include "or/circuitlist.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 #include "or/connection.h"
 #include "or/config.h"
 #include "lib/crypt_ops/crypto_rand.h"

diff --git a/src/test/test_procmon.c b/src/test/test_procmon.c
index ae30bd00b6f05f0551b42b438694471d5e8584e5..e2915d0fb4e7f282841d208de145bc66484e5dea 100644 (file)
--- a/src/test/test_procmon.c
+++ b/src/test/test_procmon.c
@@ -6,7 +6,7 @@
 #include "or/or.h"
 #include "test/test.h"
 
-#include "common/procmon.h"
+#include "lib/evloop/procmon.h"
 
 #include "test/log_test_helpers.h"
 

diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c
index 1087befa683532fa315054cbdb988a5db4fc6f61..555a2a6bfd9ea7803ca0cd7e77d3859ffc71671a 100644 (file)
--- a/src/test/test_scheduler.c
+++ b/src/test/test_scheduler.c
@@ -10,7 +10,7 @@
 #define CHANNEL_PRIVATE_
 #include "or/or.h"
 #include "or/config.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 #include "or/channel.h"
 #include "or/channeltls.h"
 #include "or/connection.h"

diff --git a/src/test/test_workqueue.c b/src/test/test_workqueue.c
index dda724b78b9232dac36b01968652c6442c87c8d6..2cb42734c482cc2dc9f978a1b2667083801c54a7 100644 (file)
--- a/src/test/test_workqueue.c
+++ b/src/test/test_workqueue.c
@@ -6,11 +6,11 @@
 #include "or/or.h"
 #include "lib/thread/threads.h"
 #include "or/onion.h"
-#include "common/workqueue.h"
+#include "lib/evloop/workqueue.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/net/alertsock.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 #include "lib/intmath/weakrng.h"
 
 #include <stdio.h>

diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index ace564d0fec5aeb2c4b134bc2bd6a3bb082c1ecd..b0514f85ec243986a40e836f89127d6fbf52e7d3 100644 (file)
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@ -22,7 +22,7 @@
 #include "or/channelpadding.h"
 #include "or/main.h"
 #include "lib/compress/compress.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 
 #include <stdio.h>
 #ifdef HAVE_FCNTL_H