Fix paths for buffers.h; automated.

diff --git a/src/or/connection.c b/src/or/connection.c
index 97428133108d2048f2c5a0f5701e5912b0c5faf3..e3e9c313ae54136b6da2d22b0f09ec411f693971 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -57,7 +57,7 @@
 #define CONNECTION_PRIVATE
 #include "or/or.h"
 #include "or/bridges.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "lib/tls/buffers_tls.h"
 /*
  * Define this so we get channel internal functions, since we're implementing

diff --git a/src/or/connection.h b/src/or/connection.h
index 7fcf710215470d4856578edd4c803b662b272642..1bbe17bffddf1d3484257f93dbc89cf49042d7ff 100644 (file)
--- a/src/or/connection.h
+++ b/src/or/connection.h
@@ -15,7 +15,7 @@
 listener_connection_t *TO_LISTENER_CONN(connection_t *);
 
 /* XXXX For buf_datalen in inline function */
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 
 const char *conn_type_to_string(int type);
 const char *conn_state_to_string(int type, int state);

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 5bb85255bb096b37dcd517d083b4d4710c750f2a..e8185a5faa02f51e15a608f6de58b0df3dc01726 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -60,7 +60,7 @@
 #include "lib/err/backtrace.h"
 
 #include "or/addressmap.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/channel.h"
 #include "or/circpathbias.h"
 #include "or/circuitlist.h"

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 7badcd37000a9832f29a71b26c0b051fc0da5fb6..9692e5d676b471b3b2f4ce182bef048c200f8671 100644 (file)
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -22,7 +22,7 @@
  **/
 #include "or/or.h"
 #include "or/bridges.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 /*
  * Define this so we get channel internal functions, since we're implementing
  * part of a subclass (channel_tls_t).

diff --git a/src/or/control.c b/src/or/control.c
index 13814804a4085aa6ba438945e98690a62872db18..7063b4cb3b5cf70d269cbdffa344fe2b8c04b591 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -38,7 +38,7 @@
 #include "or/or.h"
 #include "or/addressmap.h"
 #include "or/bridges.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/channel.h"
 #include "or/channeltls.h"
 #include "or/circuitbuild.h"

diff --git a/src/or/directory.c b/src/or/directory.c
index 2d3f7fe9a0d539b04c2c4901ae4049fb60f99fc3..4e34af3054874dc71f1f76a63d6254e3b1ad1c41 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -8,7 +8,7 @@
 #include "or/or.h"
 #include "lib/err/backtrace.h"
 #include "or/bridges.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/circuitbuild.h"
 #include "or/config.h"
 #include "or/connection.h"

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 693160e80c201c6ebac67521efa7d992cc308b0c..62d4e732237c369e19cb128bb994fc4c45789a77 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -5,7 +5,7 @@
 
 #define DIRSERV_PRIVATE
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/config.h"
 #include "or/confparse.h"
 #include "or/channel.h"

diff --git a/src/or/geoip.c b/src/or/geoip.c
index 4a55e3f8db97fdfdfba85e0abdd26dc545ee0b93..fac35d3983ee165fdd2ea424439f9c0653092ec3 100644 (file)
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -30,7 +30,7 @@
 #define GEOIP_PRIVATE
 #include "or/or.h"
 #include "ht.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/config.h"
 #include "or/control.h"
 #include "or/dnsserv.h"

diff --git a/src/or/main.c b/src/or/main.c
index 67ebc980cab40ebef835c5d59c3ac04985fce43a..856e988cd2b9b18b1e65c9da70697e7e2014c70e 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -51,7 +51,7 @@
 #include "or/addressmap.h"
 #include "lib/err/backtrace.h"
 #include "or/bridges.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "lib/tls/buffers_tls.h"
 #include "or/channel.h"
 #include "or/channeltls.h"

diff --git a/src/or/proto_cell.c b/src/or/proto_cell.c
index af0862a971a5b611828ffd74dc25f2cba15a0948..41554bd1b0b65ab31dad94c0454b9c0fc0629160 100644 (file)
--- a/src/or/proto_cell.c
+++ b/src/or/proto_cell.c
@@ -5,7 +5,7 @@
 /* See LICENSE for licensing information */
 
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/proto_cell.h"
 
 #include "or/connection_or.h"

diff --git a/src/or/proto_control0.c b/src/or/proto_control0.c
index 5d83b11cb9903e555fbbddcbdb24071ad79faf24..34e7ddb8d990f242f0a7bcc48ff645d4b32b71d1 100644 (file)
--- a/src/or/proto_control0.c
+++ b/src/or/proto_control0.c
@@ -5,7 +5,7 @@
 /* See LICENSE for licensing information */
 
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/proto_control0.h"
 
 /** Return 1 iff buf looks more like it has an (obsolete) v0 controller

diff --git a/src/or/proto_ext_or.c b/src/or/proto_ext_or.c
index 495b489bc42ecd37342351e2524c447dbcfd5ac8..f30d876231fbbff06eb75d904fc37083c3f61bd7 100644 (file)
--- a/src/or/proto_ext_or.c
+++ b/src/or/proto_ext_or.c
@@ -5,7 +5,7 @@
 /* See LICENSE for licensing information */
 
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/ext_orport.h"
 #include "or/proto_ext_or.h"
 

diff --git a/src/or/proto_http.c b/src/or/proto_http.c
index 45f763b2afd7652ef4188c14726aae21fd2c97a4..ecc669e3a41c82143c152735ea45e03e29a96cfa 100644 (file)
--- a/src/or/proto_http.c
+++ b/src/or/proto_http.c
@@ -6,7 +6,7 @@
 
 #define PROTO_HTTP_PRIVATE
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/proto_http.h"
 
 /** Return true if <b>cmd</b> looks like a HTTP (proxy) request. */

diff --git a/src/or/proto_socks.c b/src/or/proto_socks.c
index 46439d66b199cf7f49cfed67203a8893ca4bb69b..94603c2609cf5a73c77bf168859cef02eaee2b7c 100644 (file)
--- a/src/or/proto_socks.c
+++ b/src/or/proto_socks.c
@@ -6,7 +6,7 @@
 
 #include "or/or.h"
 #include "or/addressmap.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/control.h"
 #include "or/config.h"
 #include "lib/crypt_ops/crypto_util.h"

diff --git a/src/or/relay.c b/src/or/relay.c
index 9ff3d96c11adc24a72a2b114b13b68ab7e5c2e8f..e8e1762b40038be4a7698bb8481ca0a2c19ced2f 100644 (file)
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -49,7 +49,7 @@
 #include "or/or.h"
 #include "or/addressmap.h"
 #include "lib/err/backtrace.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/channel.h"
 #include "or/circpathbias.h"
 #include "or/circuitbuild.h"

diff --git a/src/or/scheduler.c b/src/or/scheduler.c
index 519010026185a47ffab1cedc3fb06b46da6105e0..960972de862f945a16f1a99596631207535c2e6e 100644 (file)
--- a/src/or/scheduler.c
+++ b/src/or/scheduler.c
@@ -9,7 +9,7 @@
 #define SCHEDULER_KIST_PRIVATE
 #include "or/scheduler.h"
 #include "or/main.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #define TOR_CHANNEL_INTERNAL_
 #include "or/channeltls.h"
 

diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c
index b62281d58695a12b8a9e25448e5a1578465edd07..3059952b92a2acfd95c068a4a2543d5f0138bf13 100644 (file)
--- a/src/or/scheduler_kist.c
+++ b/src/or/scheduler_kist.c
@@ -4,7 +4,7 @@
 #define SCHEDULER_KIST_PRIVATE
 
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/config.h"
 #include "or/connection.h"
 #include "or/networkstatus.h"

diff --git a/src/test/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c
index c82c658d97f248f83b42ae6c3abe9f850953fb67..772f2099b66b6ff3def66414daa830a71862a3d1 100644 (file)
--- a/src/test/fuzz/fuzz_http.c
+++ b/src/test/fuzz/fuzz_http.c
@@ -8,7 +8,7 @@
 
 #include "or/or.h"
 #include "lib/err/backtrace.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/config.h"
 #include "or/connection.h"
 #include "or/directory.h"

diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c
index 32bd2613501d45310b92dbb8de14796ff3b30366..bf0a9deba6cf10ab6d8effe1acd2503a65aa76f9 100644 (file)
--- a/src/test/fuzz/fuzz_http_connect.c
+++ b/src/test/fuzz/fuzz_http_connect.c
@@ -8,7 +8,7 @@
 
 #include "or/or.h"
 #include "lib/err/backtrace.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/config.h"
 #include "or/connection.h"
 #include "or/connection_edge.h"

diff --git a/src/test/test.c b/src/test/test.c
index 8ce756492d0bcd92957b14d46f8d2224925e3abc..e3121293c32d5ae8cc103c18b12e0f81e71c7895 100644 (file)
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -41,7 +41,7 @@ double fabs(double x);
 
 #include "or/or.h"
 #include "lib/err/backtrace.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/circuitlist.h"
 #include "or/circuitstats.h"
 #include "lib/compress/compress.h"

diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c
index 080325538fdfd5e151ba5f9010bf60e07c0cff0f..66ee99722583ed8010b72b3177e9c4dfc57cc819 100644 (file)
--- a/src/test/test_buffers.c
+++ b/src/test/test_buffers.c
@@ -6,7 +6,7 @@
 #define BUFFERS_PRIVATE
 #define PROTO_HTTP_PRIVATE
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "lib/tls/buffers_tls.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "or/proto_http.h"

diff --git a/src/test/test_channeltls.c b/src/test/test_channeltls.c
index bd11826778f536d438d0d2123d29b2d860090ab6..aed766fc0041ad10f39999e908b6f53bcc704112 100644 (file)
--- a/src/test/test_channeltls.c
+++ b/src/test/test_channeltls.c
@@ -8,7 +8,7 @@
 #define TOR_CHANNEL_INTERNAL_
 #include "or/or.h"
 #include "lib/net/address.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/channel.h"
 #include "or/channeltls.h"
 #include "or/connection_or.h"

diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c
index 3e99961ce56c616fbc9669b5f4a964234bfd8e9c..0032ef5b78effdbd5d6d1919c918b028b021d8b3 100644 (file)
--- a/src/test/test_extorport.c
+++ b/src/test/test_extorport.c
@@ -5,7 +5,7 @@
 #define EXT_ORPORT_PRIVATE
 #define MAIN_PRIVATE
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/connection.h"
 #include "or/connection_or.h"
 #include "or/config.h"

diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c
index 2b1c33aa62e38b3693f752afb849ea4b5829b3f7..ba279c790b4e5554859d777d38292234240b24b2 100644 (file)
--- a/src/test/test_helpers.c
+++ b/src/test/test_helpers.c
@@ -14,7 +14,7 @@
 #include "orconfig.h"
 #include "or/or.h"
 
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/config.h"
 #include "or/confparse.h"
 #include "or/connection.h"

diff --git a/src/test/test_oom.c b/src/test/test_oom.c
index c78ec4099f949922aaea7df5dba90b2fa4096886..2e5989c0d09a49668838d74c1063b7bb0f8ccc53 100644 (file)
--- a/src/test/test_oom.c
+++ b/src/test/test_oom.c
@@ -8,7 +8,7 @@
 #define CIRCUITLIST_PRIVATE
 #define CONNECTION_PRIVATE
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/circuitlist.h"
 #include "common/compat_libevent.h"
 #include "or/connection.h"

diff --git a/src/test/test_proto_http.c b/src/test/test_proto_http.c
index b98ee83aea7df33ade1ea3d2b104255ea45c72b2..57bfe246332fcf926d1e6b3d6cfb2fa805f49610 100644 (file)
--- a/src/test/test_proto_http.c
+++ b/src/test/test_proto_http.c
@@ -8,7 +8,7 @@
 
 #include "or/or.h"
 #include "test/test.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/proto_http.h"
 #include "test/log_test_helpers.h"
 

diff --git a/src/test/test_proto_misc.c b/src/test/test_proto_misc.c
index 979fc72f1848babd348040251294df54c1e22230..7f066e14adec3f75b06a76e2d14f6dc1cf1f6a09 100644 (file)
--- a/src/test/test_proto_misc.c
+++ b/src/test/test_proto_misc.c
@@ -8,7 +8,7 @@
 
 #include "or/or.h"
 #include "test/test.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/connection_or.h"
 #include "or/ext_orport.h"
 #include "or/proto_cell.h"

diff --git a/src/test/test_socks.c b/src/test/test_socks.c
index 04c028058459145164e538e6aa30670f995cde54..1d2c0cf2b5c8b7ca64d053f3d107ec747ac9769f 100644 (file)
--- a/src/test/test_socks.c
+++ b/src/test/test_socks.c
@@ -4,7 +4,7 @@
 /* See LICENSE for licensing information */
 
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/config.h"
 #include "or/proto_socks.h"
 #include "test/test.h"

diff --git a/src/test/test_util.c b/src/test/test_util.c
index 77196028da616835ef0cf2d9bb323cddca798524..539782e93bdbfcbc811e906a9d267604a2b21d5f 100644 (file)
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -13,7 +13,7 @@
 #define SUBPROCESS_PRIVATE
 #include "lib/testsupport/testsupport.h"
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/config.h"
 #include "or/control.h"
 #include "or/transports.h"