commit 2d69c32bb6dfc9f336cb897ffc6ab06931d2840b Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 5 15:14:04 2018 -0400

Clean up include paths for libtor-evloop (automated) --- src/lib/evloop/compat_libevent.c | 2 +- src/lib/evloop/procmon.c | 2 +- src/lib/evloop/procmon.h | 2 +- src/lib/evloop/timers.c | 4 ++-- src/lib/evloop/token_bucket.c | 2 +- src/lib/evloop/workqueue.c | 4 ++-- src/or/channel.c | 2 +- src/or/channelpadding.c | 2 +- src/or/config.c | 2 +- src/or/connection.c | 2 +- src/or/connection_edge.c | 2 +- src/or/consdiffmgr.c | 4 ++-- src/or/control.c | 6 +++--- src/or/cpuworker.c | 2 +- src/or/dns.c | 2 +- src/or/dnsserv.c | 2 +- src/or/hibernate.c | 2 +- src/or/main.c | 4 ++-- src/or/ntmain.c | 2 +- src/or/or_connection_st.h | 2 +- src/or/periodic.c | 4 ++-- src/or/scheduler.c | 4 ++-- src/test/test-timers.c | 4 ++-- src/test/test_bwmgt.c | 2 +- src/test/test_channelpadding.c | 4 ++-- src/test/test_compat_libevent.c | 2 +- src/test/test_consdiffmgr.c | 2 +- src/test/test_oom.c | 2 +- src/test/test_procmon.c | 2 +- src/test/test_scheduler.c | 2 +- src/test/test_workqueue.c | 4 ++-- src/test/testing_common.c | 2 +- 32 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/lib/evloop/compat_libevent.c b/src/lib/evloop/compat_libevent.c index 9d21cf20b..5e5faf163 100644 --- 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 6c2b3e71e..a923fbad7 100644 --- 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 b8daeed0d..b596e5cc6 100644 --- 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 ff92a2e44..c07bd2e72 100644 --- 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 f7b092f61..f7cd05c6c 100644 --- 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 e5254396f..4d36f352e 100644 --- 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 2dbacbde9..e6d717f11 100644 --- 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 298fea79a..504f6f8f8 100644 --- 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 6dc2ad1d5..9b2706982 100644 --- 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 9680b08b5..6fd8fbf77 100644 --- 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 f3f77dbc9..13d957a93 100644 --- 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 c75b59c1f..6d5183f93 100644 --- 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 ea1244812..aa43fccff 100644 --- 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 b37dfd168..8b58e4c68 100644 --- 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 45c4384eb..4ac58552f 100644 --- 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 d2ef4a496..6e7525423 100644 --- 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 1024c0354..55de64c13 100644 --- 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 408d9cf77..7e3eb2b59 100644 --- 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 99e77a285..f6b57753d 100644 --- 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 dbfe7528b..8c2c1f89c 100644 --- 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 0cbf359b2..041b2d287 100644 --- 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 7c423064c..b8eaca3dc 100644 --- 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 a2365a2e3..f9276c25d 100644 --- 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 604987e07..4cfca6c77 100644 --- 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 7e0c33f63..ff2ab8daa 100644 --- 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 8e5913785..1262a3140 100644 --- 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 a0dfe95d3..959075903 100644 --- 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 2e5989c0d..6c3ee1a27 100644 --- 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 ae30bd00b..e2915d0fb 100644 --- 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 1087befa6..555a2a6bf 100644 --- 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 dda724b78..2cb42734c 100644 --- 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 ace564d0f..b0514f85e 100644 --- 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