July 2018 - tor-commits - lists.torproject.org

[tor/master] Document compat_getdelim_.
by nickm＠torproject.org 11 Jul '18

11 Jul '18

commit c90961a9233e7287605886585503ee94d13a4592 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 10 20:18:20 2018 -0400 Document compat_getdelim_. --- src/lib/fs/files.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lib/fs/files.h b/src/lib/fs/files.h index d219e3cf0..2ee1b2014 100644 --- a/src/lib/fs/files.h +++ b/src/lib/fs/files.h @@ -104,6 +104,9 @@ char *read_file_to_str_until_eof(int fd, size_t max_bytes_to_read, ATTR_MALLOC; #if !defined(HAVE_GETDELIM) || defined(TOR_UNIT_TESTS) +/** Internal back-end function to implement getdelim(): only exists when + * Tor is built for unit tests, or when Tor is built on an operating system + * without its own getdelim(). */ ssize_t compat_getdelim_(char **lineptr, size_t *n, int delim, FILE *stream); #endif @@ -112,6 +115,8 @@ ssize_t compat_getdelim_(char **lineptr, size_t *n, int delim, FILE *stream); * Cross-platform wrapper for getdelim(): behaves as the POSIX-standard * getdelim() function. * + * See `getdelim(3)` for more information. + * * Note that this function will use the libc memory allocator -- so any memory * passed to this function must come from raw_malloc(), and must be freed by * raw_free() -- don't use tor_malloc() and tor_free() with this.

1 0

[tor/master] Merge branch 'ticket26223'
by nickm＠torproject.org 11 Jul '18

11 Jul '18

commit 537092cdbb7f4be0e6d68f4e5d65ca2a403375f9 Merge: c08b7b10c c90961a92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 10 20:18:28 2018 -0400 Merge branch 'ticket26223' LICENSE | 30 ++++++ changes/bug26223 | 3 + configure.ac | 202 +++++++++++++++++++++-------------------- src/ext/getdelim.c | 78 ++++++++++++++++ src/ext/include.am | 2 +- src/feature/dircache/dirserv.c | 35 ++++--- src/lib/fs/.may_include | 3 + src/lib/fs/files.c | 4 + src/lib/fs/files.h | 39 ++++++++ 9 files changed, 280 insertions(+), 116 deletions(-)

1 0

[tor/master] Explain why we use raw_free with getdelim result.
by nickm＠torproject.org 11 Jul '18

11 Jul '18

commit 391ef5e42cc79982a28aaaf22e9f9b255f6910d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 10 20:16:37 2018 -0400 Explain why we use raw_free with getdelim result. --- src/feature/dircache/dirserv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/feature/dircache/dirserv.c b/src/feature/dircache/dirserv.c index 57de6ab8e..1500467ec 100644 --- a/src/feature/dircache/dirserv.c +++ b/src/feature/dircache/dirserv.c @@ -2682,8 +2682,10 @@ dirserv_read_measured_bandwidths(const char *from_file, rv = 0; err: - if (line) + if (line) { + // we need to raw_free this buffer because we got it from tor_getdelim() raw_free(line); + } if (fp) fclose(fp); return rv;

1 0

[torspec/master] Correct a point in proposal 288.
by nickm＠torproject.org 11 Jul '18

11 Jul '18

commit c590145e6d3212a1c8802360e5a1d3e777306eb6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 10 19:58:34 2018 -0400 Correct a point in proposal 288. Previously our design had called for considering a SHAKE output B bits at a time, but bitwise slicing is a pain. Instead, consider the output 64 bits at a time, mask off the high bits, and discard values that lie outside the prime field. Since P is very close to 2^B, nearly all values should be okay. --- proposals/288-privcount-with-shamir.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/proposals/288-privcount-with-shamir.txt b/proposals/288-privcount-with-shamir.txt index 76a065d..62faa1d 100644 --- a/proposals/288-privcount-with-shamir.txt +++ b/proposals/288-privcount-with-shamir.txt @@ -118,13 +118,16 @@ Status: Accepted 1. For every Tally Reporter with index i, the client constructs a random 32-byte random value SEED_i. The client then generates - a pseudorandom bitstream of C*B bits using the SHAKE-256 + a pseudorandom bitstream of using the SHAKE-256 XOF with SEED_i as its input, and divides this stream into C values, with the c'th value denoted by MASK(i, c). - [Because P is very close to a power of 2, nearly all seeds will - produce MASK values in range 0...(P-1). If any does not, the - client picks a new seed.] + [To divide the stream into values, consider the stream 8 bytes at a + time as unsigned integers in network (big-endian) order. For each + such integer, clear the top (64-B) bits. If the result is less than + P, then include the integer as one of the MASK(i, .) values. + Otherwise, discard this 8-byte segment and proceed to the next + value.] 2. The client encrypts SEED_i using the public key of Tally Reporter i, and remembers this encrypted value. It discards

1 0

[depictor/master] Manipulate the query object directly to avoid it removing the .z suffix (when we update stem)
by tom＠torproject.org 10 Jul '18

10 Jul '18

commit 862a966e8f346c8a25016a141b81339cecd84ae3 Author: Tom Ritter <tom(a)ritter.vg> Date: Tue Jul 10 14:57:42 2018 -0500 Manipulate the query object directly to avoid it removing the .z suffix (when we update stem) Closes #25782 --- utility.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utility.py b/utility.py index d4f9a68..6b2ee54 100755 --- a/utility.py +++ b/utility.py @@ -57,7 +57,10 @@ def _get_documents(label, resource): resource, endpoints = [(authority.address, authority.dir_port)], default_params = False, + start = False ) + # Re-add the .z suffix per #25782 + query.resource = query.resource + ".z" try: start_time = time.time()

1 0

[tor/master] Rename tm_cvt to time_to_tm
by nickm＠torproject.org 10 Jul '18

10 Jul '18

commit b6d0e7caa4d11a0142a82aee065e8672b489ca51 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 10 15:25:53 2018 -0400 Rename tm_cvt to time_to_tm --- src/lib/encoding/time_fmt.c | 2 +- src/lib/log/log.c | 2 +- src/lib/wallclock/include.am | 4 ++-- src/lib/wallclock/{tm_cvt.c => time_to_tm.c} | 6 +++--- src/lib/wallclock/{tm_cvt.h => time_to_tm.h} | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib/encoding/time_fmt.c b/src/lib/encoding/time_fmt.c index 42b1cc646..a921fc681 100644 --- a/src/lib/encoding/time_fmt.c +++ b/src/lib/encoding/time_fmt.c @@ -21,7 +21,7 @@ #include "lib/malloc/malloc.h" #include "lib/string/printf.h" #include "lib/string/scanf.h" -#include "lib/wallclock/tm_cvt.h" +#include "lib/wallclock/time_to_tm.h" #include <string.h> #include <time.h> diff --git a/src/lib/log/log.c b/src/lib/log/log.c index b89747d84..8349041ab 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -45,7 +45,7 @@ #include "lib/string/util_string.h" #include "lib/wallclock/tor_gettimeofday.h" #include "lib/wallclock/approx_time.h" -#include "lib/wallclock/tm_cvt.h" +#include "lib/wallclock/time_to_tm.h" #include "lib/fdio/fdio.h" #ifdef HAVE_ANDROID_LOG_H diff --git a/src/lib/wallclock/include.am b/src/lib/wallclock/include.am index 7864c21e1..1961639bd 100644 --- a/src/lib/wallclock/include.am +++ b/src/lib/wallclock/include.am @@ -7,7 +7,7 @@ endif src_lib_libtor_wallclock_a_SOURCES = \ src/lib/wallclock/approx_time.c \ - src/lib/wallclock/tm_cvt.c \ + src/lib/wallclock/time_to_tm.c \ src/lib/wallclock/tor_gettimeofday.c src_lib_libtor_wallclock_testing_a_SOURCES = \ @@ -18,5 +18,5 @@ src_lib_libtor_wallclock_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) noinst_HEADERS += \ src/lib/wallclock/approx_time.h \ src/lib/wallclock/timeval.h \ - src/lib/wallclock/tm_cvt.h \ + src/lib/wallclock/time_to_tm.h \ src/lib/wallclock/tor_gettimeofday.h diff --git a/src/lib/wallclock/tm_cvt.c b/src/lib/wallclock/time_to_tm.c similarity index 98% rename from src/lib/wallclock/tm_cvt.c rename to src/lib/wallclock/time_to_tm.c index 4a51a4ab3..6543b97e3 100644 --- a/src/lib/wallclock/tm_cvt.c +++ b/src/lib/wallclock/time_to_tm.c @@ -4,14 +4,14 @@ /* See LICENSE for licensing information */ /** - * \file tm_cvt.c - * \brief Convert to and from struct tm, portably. + * \file time_to_tm.c + * \brief Convert to struct tm, portably. **/ #include "orconfig.h" #include "lib/cc/torint.h" #include "lib/cc/compat_compiler.h" -#include "lib/wallclock/tm_cvt.h" +#include "lib/wallclock/time_to_tm.h" #include "lib/string/printf.h" #include "lib/err/torerr.h" diff --git a/src/lib/wallclock/tm_cvt.h b/src/lib/wallclock/time_to_tm.h similarity index 79% rename from src/lib/wallclock/tm_cvt.h rename to src/lib/wallclock/time_to_tm.h index a1cdc80ef..0527a97b3 100644 --- a/src/lib/wallclock/tm_cvt.h +++ b/src/lib/wallclock/time_to_tm.h @@ -4,12 +4,12 @@ /* See LICENSE for licensing information */ /** - * \file tm_cvt.h - * \brief Header for tm_cvt.c + * \file time_to_tm.h + * \brief Header for time_to_tm.c **/ -#ifndef TOR_WALLCLOCK_TM_CVT_H -#define TOR_WALLCLOCK_TM_CVT_H +#ifndef TOR_WALLCLOCK_TIME_TO_TM_H +#define TOR_WALLCLOCK_TIME_TO_TM_H #include <sys/types.h>

1 0

[tor/master] Merge branch 'post-refactor-renaming'
by nickm＠torproject.org 10 Jul '18

10 Jul '18

commit c08b7b10c520db08e20e6ac5630f0a668d5ecf3a Merge: 9ec80909e b6d0e7caa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 10 15:35:49 2018 -0400 Merge branch 'post-refactor-renaming' src/core/crypto/onion_ntor.c | 2 +- src/core/or/or.h | 2 +- src/feature/dirauth/keypin.c | 2 +- src/feature/nodelist/parsecommon.c | 2 +- src/feature/nodelist/torcert.c | 2 +- src/lib/compress/compress.c | 4 ++-- src/lib/compress/compress_lzma.c | 4 ++-- src/lib/compress/compress_none.c | 2 +- src/lib/compress/compress_zlib.c | 2 +- src/lib/compress/compress_zstd.c | 2 +- src/lib/container/bitarray.h | 2 +- src/lib/container/bloomfilt.c | 2 +- src/lib/container/buffers.c | 4 ++-- src/lib/container/handles.h | 2 +- src/lib/container/map.c | 2 +- src/lib/container/smartlist.c | 2 +- src/lib/crypt_ops/aes.c | 2 +- src/lib/crypt_ops/aes.h | 2 +- src/lib/crypt_ops/crypto.c | 2 +- src/lib/crypt_ops/crypto_curve25519.c | 2 +- src/lib/crypt_ops/crypto_dh.c | 2 +- src/lib/crypt_ops/crypto_digest.c | 2 +- src/lib/crypt_ops/crypto_digest.h | 2 +- src/lib/crypt_ops/crypto_ed25519.c | 2 +- src/lib/crypt_ops/crypto_format.c | 2 +- src/lib/crypt_ops/crypto_rand.c | 4 ++-- src/lib/crypt_ops/crypto_rsa.c | 2 +- src/lib/crypt_ops/crypto_rsa.h | 2 +- src/lib/crypt_ops/crypto_util.c | 2 +- src/lib/ctime/di_ops.c | 2 +- src/lib/encoding/binascii.c | 4 ++-- src/lib/encoding/confline.c | 4 ++-- src/lib/encoding/cstring.c | 4 ++-- src/lib/encoding/keyval.c | 2 +- src/lib/encoding/time_fmt.c | 6 +++--- src/lib/evloop/compat_libevent.c | 2 +- src/lib/evloop/compat_libevent.h | 2 +- src/lib/evloop/procmon.c | 4 ++-- src/lib/evloop/procmon.h | 2 +- src/lib/evloop/timers.c | 4 ++-- src/lib/evloop/workqueue.c | 2 +- src/lib/fs/conffile.c | 4 ++-- src/lib/fs/dir.c | 4 ++-- src/lib/fs/files.c | 4 ++-- src/lib/fs/lockfile.c | 4 ++-- src/lib/fs/mmap.c | 4 ++-- src/lib/fs/path.c | 4 ++-- src/lib/fs/storagedir.c | 4 ++-- src/lib/fs/userdb.c | 4 ++-- src/lib/lock/compat_mutex.c | 2 +- src/lib/lock/compat_mutex.h | 2 +- src/lib/log/escape.c | 2 +- src/lib/log/include.am | 4 ++-- src/lib/log/{torlog.c => log.c} | 8 ++++---- src/lib/log/{torlog.h => log.h} | 2 +- src/lib/log/ratelim.c | 2 +- src/lib/log/util_bug.c | 4 ++-- src/lib/log/util_bug.h | 2 +- src/lib/log/win32err.c | 2 +- src/lib/malloc/include.am | 4 ++-- src/lib/malloc/{util_malloc.c => malloc.c} | 4 ++-- src/lib/malloc/{util_malloc.h => malloc.h} | 2 +- src/lib/memarea/memarea.c | 4 ++-- src/lib/meminfo/meminfo.c | 4 ++-- src/lib/net/address.c | 4 ++-- src/lib/net/buffers_net.c | 2 +- src/lib/net/resolve.c | 2 +- src/lib/net/socket.c | 2 +- src/lib/process/daemon.c | 2 +- src/lib/process/env.c | 6 +++--- src/lib/process/pidfile.c | 2 +- src/lib/process/restrict.c | 2 +- src/lib/process/setuid.c | 4 ++-- src/lib/process/subprocess.c | 4 ++-- src/lib/process/waitpid.c | 4 ++-- src/lib/sandbox/sandbox.c | 4 ++-- src/lib/smartlist_core/smartlist_core.c | 2 +- src/lib/smartlist_core/smartlist_split.c | 2 +- src/lib/string/printf.c | 2 +- src/lib/term/getpass.c | 2 +- src/lib/thread/compat_pthreads.c | 2 +- src/lib/thread/compat_threads.c | 2 +- src/lib/thread/compat_winthreads.c | 2 +- src/lib/thread/numcpus.c | 2 +- src/lib/time/compat_time.c | 2 +- src/lib/time/tvdiff.c | 2 +- src/lib/tls/buffers_tls.c | 2 +- src/lib/tls/tortls.c | 2 +- src/lib/trace/debug.h | 2 +- src/lib/wallclock/include.am | 4 ++-- src/lib/wallclock/{tm_cvt.c => time_to_tm.c} | 6 +++--- src/lib/wallclock/{tm_cvt.h => time_to_tm.h} | 8 ++++---- src/test/fuzz/fuzz_http.c | 2 +- src/test/fuzz/fuzz_http_connect.c | 2 +- src/test/log_test_helpers.c | 2 +- src/test/test-memwipe.c | 2 +- src/test/test_bt_cl.c | 2 +- src/test/test_crypto_openssl.c | 2 +- src/test/test_logging.c | 2 +- src/test/test_status.c | 2 +- src/test/test_tortls.c | 2 +- src/test/test_util_slow.c | 2 +- src/tools/tor-gencert.c | 4 ++-- src/tools/tor-resolve.c | 4 ++-- src/trunnel/trunnel-local.h | 2 +- 105 files changed, 148 insertions(+), 148 deletions(-)

1 0

[tor/master] Rename util_malloc to malloc.
by nickm＠torproject.org 10 Jul '18

10 Jul '18

commit 41640b65735ec6214aa5080c2143b0982a59bb93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 10 15:16:57 2018 -0400 Rename util_malloc to malloc. --- src/core/or/or.h | 2 +- src/lib/compress/compress.c | 2 +- src/lib/compress/compress_lzma.c | 2 +- src/lib/container/bitarray.h | 2 +- src/lib/container/bloomfilt.c | 2 +- src/lib/container/buffers.c | 2 +- src/lib/container/handles.h | 2 +- src/lib/container/map.c | 2 +- src/lib/container/smartlist.c | 2 +- src/lib/crypt_ops/aes.h | 2 +- src/lib/crypt_ops/crypto_digest.h | 2 +- src/lib/crypt_ops/crypto_rand.c | 2 +- src/lib/ctime/di_ops.c | 2 +- src/lib/encoding/binascii.c | 2 +- src/lib/encoding/confline.c | 2 +- src/lib/encoding/cstring.c | 2 +- src/lib/encoding/time_fmt.c | 2 +- src/lib/evloop/compat_libevent.h | 2 +- src/lib/evloop/procmon.c | 2 +- src/lib/evloop/timers.c | 2 +- src/lib/fs/conffile.c | 2 +- src/lib/fs/dir.c | 2 +- src/lib/fs/files.c | 2 +- src/lib/fs/lockfile.c | 2 +- src/lib/fs/mmap.c | 2 +- src/lib/fs/path.c | 2 +- src/lib/fs/storagedir.c | 2 +- src/lib/fs/userdb.c | 2 +- src/lib/lock/compat_mutex.c | 2 +- src/lib/lock/compat_mutex.h | 2 +- src/lib/log/escape.c | 2 +- src/lib/log/ratelim.c | 2 +- src/lib/log/torlog.c | 2 +- src/lib/log/util_bug.c | 2 +- src/lib/log/win32err.c | 2 +- src/lib/malloc/include.am | 4 ++-- src/lib/malloc/{util_malloc.c => malloc.c} | 4 ++-- src/lib/malloc/{util_malloc.h => malloc.h} | 2 +- src/lib/memarea/memarea.c | 2 +- src/lib/meminfo/meminfo.c | 2 +- src/lib/net/address.c | 2 +- src/lib/net/resolve.c | 2 +- src/lib/process/env.c | 4 ++-- src/lib/process/setuid.c | 2 +- src/lib/process/subprocess.c | 2 +- src/lib/process/waitpid.c | 2 +- src/lib/sandbox/sandbox.c | 2 +- src/lib/smartlist_core/smartlist_core.c | 2 +- src/lib/smartlist_core/smartlist_split.c | 2 +- src/lib/string/printf.c | 2 +- src/lib/term/getpass.c | 2 +- src/test/test-memwipe.c | 2 +- src/test/test_crypto_openssl.c | 2 +- src/tools/tor-gencert.c | 2 +- src/tools/tor-resolve.c | 2 +- src/trunnel/trunnel-local.h | 2 +- 56 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/core/or/or.h b/src/core/or/or.h index 2e419eefd..9aca030c7 100644 --- a/src/core/or/or.h +++ b/src/core/or/or.h @@ -47,7 +47,7 @@ #include "lib/log/escape.h" #include "lib/log/ratelim.h" #include "lib/log/util_bug.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/net/address.h" #include "lib/net/inaddr.h" #include "lib/net/socket.h" diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c index e87e788f1..ff1aea47a 100644 --- a/src/lib/compress/compress.c +++ b/src/lib/compress/compress.c @@ -32,7 +32,7 @@ #include "lib/compress/compress_zlib.h" #include "lib/compress/compress_zstd.h" #include "lib/intmath/cmp.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/thread/threads.h" /** Total number of bytes allocated for compression state overhead. */ diff --git a/src/lib/compress/compress_lzma.c b/src/lib/compress/compress_lzma.c index 3b6f91b84..9091832ed 100644 --- a/src/lib/compress/compress_lzma.c +++ b/src/lib/compress/compress_lzma.c @@ -17,7 +17,7 @@ #include "lib/compress/compress_lzma.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/thread/threads.h" #ifdef HAVE_LZMA diff --git a/src/lib/container/bitarray.h b/src/lib/container/bitarray.h index 172d56cc0..ae82a4ab4 100644 --- a/src/lib/container/bitarray.h +++ b/src/lib/container/bitarray.h @@ -15,7 +15,7 @@ #include "orconfig.h" #include <string.h> #include "lib/cc/torint.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #if SIZEOF_INT == 4 #define BITARRAY_SHIFT 5 diff --git a/src/lib/container/bloomfilt.c b/src/lib/container/bloomfilt.c index 1cab817e1..ea2d2917c 100644 --- a/src/lib/container/bloomfilt.c +++ b/src/lib/container/bloomfilt.c @@ -10,7 +10,7 @@ #include <stdlib.h> -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/container/bloomfilt.h" #include "lib/intmath/bits.h" #include "lib/log/util_bug.h" diff --git a/src/lib/container/buffers.c b/src/lib/container/buffers.c index 5849704e3..525747a4c 100644 --- a/src/lib/container/buffers.c +++ b/src/lib/container/buffers.c @@ -30,7 +30,7 @@ #include "lib/log/torlog.h" #include "lib/log/util_bug.h" #include "lib/ctime/di_ops.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/string/printf.h" #include "lib/time/compat_time.h" diff --git a/src/lib/container/handles.h b/src/lib/container/handles.h index 21ec0dfee..7144e1720 100644 --- a/src/lib/container/handles.h +++ b/src/lib/container/handles.h @@ -52,7 +52,7 @@ #include "orconfig.h" #include "lib/log/util_bug.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #define HANDLE_ENTRY(name, structname) \ struct name ## _handle_head_t *handle_head diff --git a/src/lib/container/map.c b/src/lib/container/map.c index 0602eac89..85e074e10 100644 --- a/src/lib/container/map.c +++ b/src/lib/container/map.c @@ -14,7 +14,7 @@ #include "lib/ctime/di_ops.h" #include "lib/defs/digest_sizes.h" #include "lib/string/util_string.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/log/util_bug.h" diff --git a/src/lib/container/smartlist.c b/src/lib/container/smartlist.c index c3abbff51..dc283e5f5 100644 --- a/src/lib/container/smartlist.c +++ b/src/lib/container/smartlist.c @@ -17,7 +17,7 @@ #include "lib/container/smartlist.h" #include "lib/err/torerr.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/defs/digest_sizes.h" #include "lib/ctime/di_ops.h" #include "lib/string/compat_ctype.h" diff --git a/src/lib/crypt_ops/aes.h b/src/lib/crypt_ops/aes.h index a57654159..578a1a65a 100644 --- a/src/lib/crypt_ops/aes.h +++ b/src/lib/crypt_ops/aes.h @@ -14,7 +14,7 @@ */ #include "lib/cc/torint.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" typedef struct aes_cnt_cipher aes_cnt_cipher_t; diff --git a/src/lib/crypt_ops/crypto_digest.h b/src/lib/crypt_ops/crypto_digest.h index 15bc5ad5b..9facf3b98 100644 --- a/src/lib/crypt_ops/crypto_digest.h +++ b/src/lib/crypt_ops/crypto_digest.h @@ -15,7 +15,7 @@ #include "lib/cc/torint.h" #include "lib/defs/digest_sizes.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" /** Length of a sha1 message digest when encoded in base32 with trailing = * signs removed. */ diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index 6f479b013..e2d72a77c 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -28,7 +28,7 @@ #include "lib/intmath/weakrng.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/sandbox/sandbox.h" #include "lib/string/compat_string.h" #include "lib/string/util_string.h" diff --git a/src/lib/ctime/di_ops.c b/src/lib/ctime/di_ops.c index 287ff6080..011baf265 100644 --- a/src/lib/ctime/di_ops.c +++ b/src/lib/ctime/di_ops.c @@ -9,7 +9,7 @@ #include "orconfig.h" #include "lib/ctime/di_ops.h" #include "lib/err/torerr.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include <string.h> diff --git a/src/lib/encoding/binascii.c b/src/lib/encoding/binascii.c index df9bb4a81..7499d6472 100644 --- a/src/lib/encoding/binascii.c +++ b/src/lib/encoding/binascii.c @@ -19,7 +19,7 @@ #include "lib/cc/torint.h" #include "lib/string/compat_ctype.h" #include "lib/intmath/muldiv.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include <stddef.h> #include <string.h> diff --git a/src/lib/encoding/confline.c b/src/lib/encoding/confline.c index 3486b6a82..9b1762953 100644 --- a/src/lib/encoding/confline.c +++ b/src/lib/encoding/confline.c @@ -19,7 +19,7 @@ #include "lib/encoding/cstring.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/string/compat_ctype.h" #include "lib/string/compat_string.h" #include "lib/string/util_string.h" diff --git a/src/lib/encoding/cstring.c b/src/lib/encoding/cstring.c index 994a52e70..3e0db712f 100644 --- a/src/lib/encoding/cstring.c +++ b/src/lib/encoding/cstring.c @@ -13,7 +13,7 @@ #include "lib/encoding/cstring.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/string/compat_ctype.h" #include <string.h> diff --git a/src/lib/encoding/time_fmt.c b/src/lib/encoding/time_fmt.c index c2ff34a91..8ce15e747 100644 --- a/src/lib/encoding/time_fmt.c +++ b/src/lib/encoding/time_fmt.c @@ -18,7 +18,7 @@ #include "lib/log/torlog.h" #include "lib/log/escape.h" #include "lib/log/util_bug.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/string/printf.h" #include "lib/string/scanf.h" #include "lib/wallclock/tm_cvt.h" diff --git a/src/lib/evloop/compat_libevent.h b/src/lib/evloop/compat_libevent.h index 7a5469047..5fda49f74 100644 --- a/src/lib/evloop/compat_libevent.h +++ b/src/lib/evloop/compat_libevent.h @@ -11,7 +11,7 @@ #include "orconfig.h" #include "lib/testsupport/testsupport.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" void configure_libevent_logging(void); void suppress_libevent_log_msg(const char *msg); diff --git a/src/lib/evloop/procmon.c b/src/lib/evloop/procmon.c index a923fbad7..53c458f15 100644 --- a/src/lib/evloop/procmon.c +++ b/src/lib/evloop/procmon.c @@ -11,7 +11,7 @@ #include "lib/log/torlog.h" #include "lib/log/util_bug.h" #include "lib/log/win32err.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/string/parse_int.h" #ifdef HAVE_SIGNAL_H diff --git a/src/lib/evloop/timers.c b/src/lib/evloop/timers.c index c07bd2e72..4580b89e3 100644 --- a/src/lib/evloop/timers.c +++ b/src/lib/evloop/timers.c @@ -36,7 +36,7 @@ #include "lib/intmath/muldiv.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/time/compat_time.h" #ifdef _WIN32 diff --git a/src/lib/fs/conffile.c b/src/lib/fs/conffile.c index 600c7f6b7..3a4d95f45 100644 --- a/src/lib/fs/conffile.c +++ b/src/lib/fs/conffile.c @@ -18,7 +18,7 @@ #include "lib/fs/files.h" #include "lib/fs/path.h" #include "lib/log/torlog.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/string/printf.h" static smartlist_t *config_get_file_list(const char *path, diff --git a/src/lib/fs/dir.c b/src/lib/fs/dir.c index cc339f747..0f2a5e235 100644 --- a/src/lib/fs/dir.c +++ b/src/lib/fs/dir.c @@ -19,7 +19,7 @@ #include "lib/log/win32err.h" #include "lib/container/smartlist.h" #include "lib/sandbox/sandbox.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/string/printf.h" #include "lib/string/compat_string.h" diff --git a/src/lib/fs/files.c b/src/lib/fs/files.c index 4e0a398ba..9012fd64f 100644 --- a/src/lib/fs/files.c +++ b/src/lib/fs/files.c @@ -20,7 +20,7 @@ #include "lib/log/util_bug.h" #include "lib/log/escape.h" #include "lib/err/torerr.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/sandbox/sandbox.h" #include "lib/string/printf.h" #include "lib/string/util_string.h" diff --git a/src/lib/fs/lockfile.c b/src/lib/fs/lockfile.c index 972fd5658..a4e3c427d 100644 --- a/src/lib/fs/lockfile.c +++ b/src/lib/fs/lockfile.c @@ -15,7 +15,7 @@ #include "lib/fs/lockfile.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #ifdef HAVE_SYS_FILE_H #include <sys/file.h> diff --git a/src/lib/fs/mmap.c b/src/lib/fs/mmap.c index 2d758c1b5..7d91945bb 100644 --- a/src/lib/fs/mmap.c +++ b/src/lib/fs/mmap.c @@ -15,7 +15,7 @@ #include "lib/log/util_bug.h" #include "lib/log/win32err.h" #include "lib/string/compat_string.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #ifdef HAVE_MMAP #include <sys/mman.h> diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c index 708ff0505..9b32b2ebd 100644 --- a/src/lib/fs/path.c +++ b/src/lib/fs/path.c @@ -10,7 +10,7 @@ **/ #include "lib/fs/path.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" #include "lib/string/printf.h" diff --git a/src/lib/fs/storagedir.c b/src/lib/fs/storagedir.c index 1cda2374d..4db56b02f 100644 --- a/src/lib/fs/storagedir.c +++ b/src/lib/fs/storagedir.c @@ -22,7 +22,7 @@ #include "lib/log/escape.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/memarea/memarea.h" #include "lib/sandbox/sandbox.h" #include "lib/string/printf.h" diff --git a/src/lib/fs/userdb.c b/src/lib/fs/userdb.c index 3d7a9da59..1e772b8fb 100644 --- a/src/lib/fs/userdb.c +++ b/src/lib/fs/userdb.c @@ -12,7 +12,7 @@ #include "lib/fs/userdb.h" #ifndef _WIN32 -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" diff --git a/src/lib/lock/compat_mutex.c b/src/lib/lock/compat_mutex.c index bfab6dd29..b53676cf4 100644 --- a/src/lib/lock/compat_mutex.c +++ b/src/lib/lock/compat_mutex.c @@ -10,7 +10,7 @@ **/ #include "lib/lock/compat_mutex.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" /** Return a newly allocated, ready-for-use mutex. */ tor_mutex_t * diff --git a/src/lib/lock/compat_mutex.h b/src/lib/lock/compat_mutex.h index f467aa5db..f8689422b 100644 --- a/src/lib/lock/compat_mutex.h +++ b/src/lib/lock/compat_mutex.h @@ -14,7 +14,7 @@ #include "orconfig.h" #include "lib/cc/torint.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #if defined(HAVE_PTHREAD_H) && !defined(_WIN32) #include <pthread.h> diff --git a/src/lib/log/escape.c b/src/lib/log/escape.c index b6b20183b..37d7e0fdc 100644 --- a/src/lib/log/escape.c +++ b/src/lib/log/escape.c @@ -12,7 +12,7 @@ #include "lib/log/util_bug.h" #include "lib/string/compat_ctype.h" #include "lib/string/printf.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" /** Allocate and return a new string representing the contents of s, * surrounded by quotes and using standard C escapes. diff --git a/src/lib/log/ratelim.c b/src/lib/log/ratelim.c index fba702d7f..2d0e8b17c 100644 --- a/src/lib/log/ratelim.c +++ b/src/lib/log/ratelim.c @@ -9,7 +9,7 @@ **/ #include "lib/log/ratelim.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/string/printf.h" /** If the rate-limiter lim is ready at now, return the number diff --git a/src/lib/log/torlog.c b/src/lib/log/torlog.c index 1c9f33790..46d121755 100644 --- a/src/lib/log/torlog.c +++ b/src/lib/log/torlog.c @@ -41,7 +41,7 @@ #include "lib/intmath/bits.h" #include "lib/string/compat_string.h" #include "lib/string/printf.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/string/util_string.h" #include "lib/wallclock/tor_gettimeofday.h" #include "lib/wallclock/approx_time.h" diff --git a/src/lib/log/util_bug.c b/src/lib/log/util_bug.c index 78af08f02..e3c8df0d6 100644 --- a/src/lib/log/util_bug.c +++ b/src/lib/log/util_bug.c @@ -15,7 +15,7 @@ #include "lib/smartlist_core/smartlist_core.h" #include "lib/smartlist_core/smartlist_foreach.h" #endif -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/string/printf.h" #include <string.h> diff --git a/src/lib/log/win32err.c b/src/lib/log/win32err.c index 6603ed464..41f563bfa 100644 --- a/src/lib/log/win32err.c +++ b/src/lib/log/win32err.c @@ -11,7 +11,7 @@ #ifdef _WIN32 #include "orconfig.h" #include "lib/log/win32err.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include <tchar.h> #include <windows.h> diff --git a/src/lib/malloc/include.am b/src/lib/malloc/include.am index 50de9cb73..502cc1c6b 100644 --- a/src/lib/malloc/include.am +++ b/src/lib/malloc/include.am @@ -6,7 +6,7 @@ noinst_LIBRARIES += src/lib/libtor-malloc-testing.a endif src_lib_libtor_malloc_a_SOURCES = \ - src/lib/malloc/util_malloc.c + src/lib/malloc/malloc.c if USE_OPENBSD_MALLOC src_lib_libtor_malloc_a_SOURCES += src/ext/OpenBSD_malloc_Linux.c @@ -18,4 +18,4 @@ src_lib_libtor_malloc_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_lib_libtor_malloc_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) noinst_HEADERS += \ - src/lib/malloc/util_malloc.h + src/lib/malloc/malloc.h diff --git a/src/lib/malloc/util_malloc.c b/src/lib/malloc/malloc.c similarity index 99% rename from src/lib/malloc/util_malloc.c rename to src/lib/malloc/malloc.c index f3b0e50c7..271e84071 100644 --- a/src/lib/malloc/util_malloc.c +++ b/src/lib/malloc/malloc.c @@ -4,7 +4,7 @@ /* See LICENSE for licensing information */ /** - * \file util_malloc.c + * \file malloc.c * \brief Wrappers for C malloc code, and replacements for items that * may be missing. **/ @@ -16,7 +16,7 @@ #include "lib/testsupport/testsupport.h" #define UTIL_MALLOC_PRIVATE -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/cc/torint.h" #include "lib/err/torerr.h" diff --git a/src/lib/malloc/util_malloc.h b/src/lib/malloc/malloc.h similarity index 99% rename from src/lib/malloc/util_malloc.h rename to src/lib/malloc/malloc.h index a1e953117..26ee30742 100644 --- a/src/lib/malloc/util_malloc.h +++ b/src/lib/malloc/malloc.h @@ -4,7 +4,7 @@ /* See LICENSE for licensing information */ /** - * \file util_malloc.h + * \file malloc.h * \brief Headers for util_malloc.c **/ diff --git a/src/lib/memarea/memarea.c b/src/lib/memarea/memarea.c index 9d494ab2d..3a93d89ee 100644 --- a/src/lib/memarea/memarea.c +++ b/src/lib/memarea/memarea.c @@ -19,7 +19,7 @@ #include "lib/container/smartlist.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #ifndef DISABLE_MEMORY_SENTINELS diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c index b5a74ce62..01080367f 100644 --- a/src/lib/meminfo/meminfo.c +++ b/src/lib/meminfo/meminfo.c @@ -16,7 +16,7 @@ #include "lib/cc/torint.h" #include "lib/fs/files.h" #include "lib/log/torlog.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #ifdef HAVE_SYS_SYSCTL_H #include <sys/sysctl.h> diff --git a/src/lib/net/address.c b/src/lib/net/address.c index 3b624da09..ca0c2a46c 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -44,7 +44,7 @@ #include "lib/ctime/di_ops.h" #include "lib/log/torlog.h" #include "lib/log/escape.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/net/inaddr.h" #include "lib/string/compat_ctype.h" #include "lib/string/compat_string.h" diff --git a/src/lib/net/resolve.c b/src/lib/net/resolve.c index ff9c93989..7c8df3e30 100644 --- a/src/lib/net/resolve.c +++ b/src/lib/net/resolve.c @@ -12,7 +12,7 @@ #include "lib/net/address.h" #include "lib/net/inaddr.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/string/parse_int.h" #include "lib/string/util_string.h" diff --git a/src/lib/process/env.c b/src/lib/process/env.c index 244cd4a4e..5b959d05f 100644 --- a/src/lib/process/env.c +++ b/src/lib/process/env.c @@ -11,12 +11,12 @@ #include "orconfig.h" #include "lib/process/env.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/ctime/di_ops.h" #include "lib/container/smartlist.h" #include "lib/log/util_bug.h" #include "lib/log/torlog.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/src/lib/process/setuid.c b/src/lib/process/setuid.c index 5423259a6..13b352dad 100644 --- a/src/lib/process/setuid.c +++ b/src/lib/process/setuid.c @@ -19,7 +19,7 @@ #include "lib/fs/userdb.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/src/lib/process/subprocess.c b/src/lib/process/subprocess.c index 9a12f5e76..d2bbb61c3 100644 --- a/src/lib/process/subprocess.c +++ b/src/lib/process/subprocess.c @@ -16,7 +16,7 @@ #include "lib/log/torlog.h" #include "lib/log/util_bug.h" #include "lib/log/win32err.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/process/env.h" #include "lib/process/waitpid.h" #include "lib/string/compat_ctype.h" diff --git a/src/lib/process/waitpid.c b/src/lib/process/waitpid.c index 27f69b08f..b829cb1b0 100644 --- a/src/lib/process/waitpid.c +++ b/src/lib/process/waitpid.c @@ -15,7 +15,7 @@ #include "lib/process/waitpid.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "ht.h" #ifdef HAVE_SYS_WAIT_H diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index 25dd6d1c2..7768bee06 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -39,7 +39,7 @@ #include "lib/log/torlog.h" #include "lib/cc/torint.h" #include "lib/net/resolve.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/string/scanf.h" #include "tor_queue.h" diff --git a/src/lib/smartlist_core/smartlist_core.c b/src/lib/smartlist_core/smartlist_core.c index b9c5f728c..8364a8180 100644 --- a/src/lib/smartlist_core/smartlist_core.c +++ b/src/lib/smartlist_core/smartlist_core.c @@ -11,7 +11,7 @@ **/ #include "lib/err/torerr.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/smartlist_core/smartlist_core.h" #include <stdlib.h> diff --git a/src/lib/smartlist_core/smartlist_split.c b/src/lib/smartlist_core/smartlist_split.c index 9c8368f66..f63894869 100644 --- a/src/lib/smartlist_core/smartlist_split.c +++ b/src/lib/smartlist_core/smartlist_split.c @@ -14,7 +14,7 @@ #include "lib/err/torerr.h" #include "lib/string/util_string.h" #include "lib/string/compat_ctype.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include <string.h> diff --git a/src/lib/string/printf.c b/src/lib/string/printf.c index f8be3b470..82d38242d 100644 --- a/src/lib/string/printf.c +++ b/src/lib/string/printf.c @@ -11,7 +11,7 @@ #include "lib/string/printf.h" #include "lib/err/torerr.h" #include "lib/cc/torint.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include <stdlib.h> #include <stdio.h> diff --git a/src/lib/term/getpass.c b/src/lib/term/getpass.c index 590411b71..27a27179b 100644 --- a/src/lib/term/getpass.c +++ b/src/lib/term/getpass.c @@ -11,7 +11,7 @@ #include "lib/term/getpass.h" #include "lib/log/util_bug.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #ifdef _WIN32 #include <windows.h> diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index 8a4610e90..c879013ed 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -5,7 +5,7 @@ #include "lib/crypt_ops/crypto_util.h" #include "lib/intmath/cmp.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include <string.h> #include <stdio.h> diff --git a/src/test/test_crypto_openssl.c b/src/test/test_crypto_openssl.c index b1a5613ea..92f9cbab2 100644 --- a/src/test/test_crypto_openssl.c +++ b/src/test/test_crypto_openssl.c @@ -10,7 +10,7 @@ #include "lib/crypt_ops/compat_openssl.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/encoding/binascii.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "test/test.h" #include <openssl/evp.h> diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index efae621d0..0e3ab2408 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -39,7 +39,7 @@ ENABLE_GCC_WARNING(redundant-decls) #include "lib/encoding/time_fmt.h" #include "lib/fs/files.h" #include "lib/log/torlog.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/net/address.h" #include "lib/net/inaddr.h" #include "lib/net/resolve.h" diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 9358cc8a6..a4d5184b4 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -7,7 +7,7 @@ #include "lib/arch/bytes.h" #include "lib/log/torlog.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/net/address.h" #include "lib/net/resolve.h" #include "lib/net/socket.h" diff --git a/src/trunnel/trunnel-local.h b/src/trunnel/trunnel-local.h index e81396aee..c4118fce4 100644 --- a/src/trunnel/trunnel-local.h +++ b/src/trunnel/trunnel-local.h @@ -3,7 +3,7 @@ #define TRUNNEL_LOCAL_H_INCLUDED #include "lib/crypt_ops/crypto_util.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" #include "lib/log/util_bug.h" #define trunnel_malloc tor_malloc

1 0

[tor/master] Rename torlog.[ch] to log.[ch]
by nickm＠torproject.org 10 Jul '18

10 Jul '18

commit e7f5f48d68553206b95cbb4f610702c887500124 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 10 15:20:28 2018 -0400 Rename torlog.[ch] to log.[ch] Fun fact: these files used to be called log.[ch] until we ran into conflicts with systems having a log.h file. But now that we always include "lib/log/log.h", we should be fine. --- src/core/crypto/onion_ntor.c | 2 +- src/feature/dirauth/keypin.c | 2 +- src/feature/nodelist/parsecommon.c | 2 +- src/feature/nodelist/torcert.c | 2 +- src/lib/compress/compress.c | 2 +- src/lib/compress/compress_lzma.c | 2 +- src/lib/compress/compress_none.c | 2 +- src/lib/compress/compress_zlib.c | 2 +- src/lib/compress/compress_zstd.c | 2 +- src/lib/container/buffers.c | 2 +- src/lib/crypt_ops/aes.c | 2 +- src/lib/crypt_ops/crypto.c | 2 +- src/lib/crypt_ops/crypto_curve25519.c | 2 +- src/lib/crypt_ops/crypto_dh.c | 2 +- src/lib/crypt_ops/crypto_digest.c | 2 +- src/lib/crypt_ops/crypto_ed25519.c | 2 +- src/lib/crypt_ops/crypto_format.c | 2 +- src/lib/crypt_ops/crypto_rand.c | 2 +- src/lib/crypt_ops/crypto_rsa.c | 2 +- src/lib/crypt_ops/crypto_rsa.h | 2 +- src/lib/crypt_ops/crypto_util.c | 2 +- src/lib/encoding/binascii.c | 2 +- src/lib/encoding/confline.c | 2 +- src/lib/encoding/cstring.c | 2 +- src/lib/encoding/keyval.c | 2 +- src/lib/encoding/time_fmt.c | 2 +- src/lib/evloop/compat_libevent.c | 2 +- src/lib/evloop/procmon.c | 2 +- src/lib/evloop/procmon.h | 2 +- src/lib/evloop/timers.c | 2 +- src/lib/evloop/workqueue.c | 2 +- src/lib/fs/conffile.c | 2 +- src/lib/fs/dir.c | 2 +- src/lib/fs/files.c | 2 +- src/lib/fs/lockfile.c | 2 +- src/lib/fs/mmap.c | 2 +- src/lib/fs/path.c | 2 +- src/lib/fs/storagedir.c | 2 +- src/lib/fs/userdb.c | 2 +- src/lib/log/include.am | 4 ++-- src/lib/log/{torlog.c => log.c} | 4 ++-- src/lib/log/{torlog.h => log.h} | 2 +- src/lib/log/util_bug.c | 2 +- src/lib/log/util_bug.h | 2 +- src/lib/memarea/memarea.c | 2 +- src/lib/meminfo/meminfo.c | 2 +- src/lib/net/address.c | 2 +- src/lib/net/buffers_net.c | 2 +- src/lib/net/socket.c | 2 +- src/lib/process/daemon.c | 2 +- src/lib/process/env.c | 2 +- src/lib/process/pidfile.c | 2 +- src/lib/process/restrict.c | 2 +- src/lib/process/setuid.c | 2 +- src/lib/process/subprocess.c | 2 +- src/lib/process/waitpid.c | 2 +- src/lib/sandbox/sandbox.c | 2 +- src/lib/thread/compat_pthreads.c | 2 +- src/lib/thread/compat_threads.c | 2 +- src/lib/thread/compat_winthreads.c | 2 +- src/lib/thread/numcpus.c | 2 +- src/lib/time/compat_time.c | 2 +- src/lib/time/tvdiff.c | 2 +- src/lib/tls/buffers_tls.c | 2 +- src/lib/tls/tortls.c | 2 +- src/lib/trace/debug.h | 2 +- src/test/fuzz/fuzz_http.c | 2 +- src/test/fuzz/fuzz_http_connect.c | 2 +- src/test/log_test_helpers.c | 2 +- src/test/test_bt_cl.c | 2 +- src/test/test_logging.c | 2 +- src/test/test_status.c | 2 +- src/test/test_tortls.c | 2 +- src/test/test_util_slow.c | 2 +- src/tools/tor-gencert.c | 2 +- src/tools/tor-resolve.c | 2 +- 76 files changed, 78 insertions(+), 78 deletions(-) diff --git a/src/core/crypto/onion_ntor.c b/src/core/crypto/onion_ntor.c index 9e1e273ef..ea7261cb5 100644 --- a/src/core/crypto/onion_ntor.c +++ b/src/core/crypto/onion_ntor.c @@ -27,7 +27,7 @@ #include "lib/crypt_ops/crypto_hkdf.h" #include "lib/crypt_ops/crypto_util.h" #include "lib/ctime/di_ops.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "core/crypto/onion_ntor.h" diff --git a/src/feature/dirauth/keypin.c b/src/feature/dirauth/keypin.c index 44e19985f..fd281377d 100644 --- a/src/feature/dirauth/keypin.c +++ b/src/feature/dirauth/keypin.c @@ -23,7 +23,7 @@ #include "lib/fdio/fdio.h" #include "lib/fs/files.h" #include "lib/fs/mmap.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/string/compat_ctype.h" #include "lib/string/printf.h" diff --git a/src/feature/nodelist/parsecommon.c b/src/feature/nodelist/parsecommon.c index 4f1c3fd42..3aaf8ac50 100644 --- a/src/feature/nodelist/parsecommon.c +++ b/src/feature/nodelist/parsecommon.c @@ -7,7 +7,7 @@ **/ #include "feature/nodelist/parsecommon.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/encoding/binascii.h" #include "lib/container/smartlist.h" diff --git a/src/feature/nodelist/torcert.c b/src/feature/nodelist/torcert.c index 172d4f9de..a27608202 100644 --- a/src/feature/nodelist/torcert.c +++ b/src/feature/nodelist/torcert.c @@ -30,7 +30,7 @@ #include "lib/crypt_ops/crypto_util.h" #include "feature/nodelist/torcert.h" #include "trunnel/ed25519_cert.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "trunnel/link_handshake.h" #include "lib/tls/tortls.h" diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c index ff1aea47a..2ad9b15b2 100644 --- a/src/lib/compress/compress.c +++ b/src/lib/compress/compress.c @@ -22,7 +22,7 @@ #include <netinet/in.h> #endif -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/arch/bytes.h" #include "lib/ctime/di_ops.h" diff --git a/src/lib/compress/compress_lzma.c b/src/lib/compress/compress_lzma.c index 9091832ed..e6c8368f6 100644 --- a/src/lib/compress/compress_lzma.c +++ b/src/lib/compress/compress_lzma.c @@ -15,7 +15,7 @@ #include "lib/compress/compress.h" #include "lib/compress/compress_lzma.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/malloc/malloc.h" #include "lib/thread/threads.h" diff --git a/src/lib/compress/compress_none.c b/src/lib/compress/compress_none.c index 9574c47a7..a0e82d5a9 100644 --- a/src/lib/compress/compress_none.c +++ b/src/lib/compress/compress_none.c @@ -16,7 +16,7 @@ #include "orconfig.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/compress/compress.h" #include "lib/compress/compress_none.h" #include "lib/intmath/cmp.h" diff --git a/src/lib/compress/compress_zlib.c b/src/lib/compress/compress_zlib.c index 12e6727de..64be1d425 100644 --- a/src/lib/compress/compress_zlib.c +++ b/src/lib/compress/compress_zlib.c @@ -13,7 +13,7 @@ #include "orconfig.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/compress/compress.h" #include "lib/compress/compress_zlib.h" diff --git a/src/lib/compress/compress_zstd.c b/src/lib/compress/compress_zstd.c index 0a553db55..0a71fed4b 100644 --- a/src/lib/compress/compress_zstd.c +++ b/src/lib/compress/compress_zstd.c @@ -13,7 +13,7 @@ #include "orconfig.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/compress/compress.h" #include "lib/compress/compress_zstd.h" diff --git a/src/lib/container/buffers.c b/src/lib/container/buffers.c index 525747a4c..87d782d7e 100644 --- a/src/lib/container/buffers.c +++ b/src/lib/container/buffers.c @@ -27,7 +27,7 @@ #include <stddef.h> #include "lib/container/buffers.h" #include "lib/cc/torint.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/ctime/di_ops.h" #include "lib/malloc/malloc.h" diff --git a/src/lib/crypt_ops/aes.c b/src/lib/crypt_ops/aes.c index a01b1e16b..ff9d4d855 100644 --- a/src/lib/crypt_ops/aes.c +++ b/src/lib/crypt_ops/aes.c @@ -38,7 +38,7 @@ DISABLE_GCC_WARNING(redundant-decls) ENABLE_GCC_WARNING(redundant-decls) #include "lib/crypt_ops/aes.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/ctime/di_ops.h" #ifdef ANDROID diff --git a/src/lib/crypt_ops/crypto.c b/src/lib/crypt_ops/crypto.c index 48574016b..5bc2da76a 100644 --- a/src/lib/crypt_ops/crypto.c +++ b/src/lib/crypt_ops/crypto.c @@ -62,7 +62,7 @@ ENABLE_GCC_WARNING(redundant-decls) #include <unistd.h> #endif -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/cc/torint.h" #include "lib/crypt_ops/aes.h" diff --git a/src/lib/crypt_ops/crypto_curve25519.c b/src/lib/crypt_ops/crypto_curve25519.c index 09f492e54..6ad2587f4 100644 --- a/src/lib/crypt_ops/crypto_curve25519.c +++ b/src/lib/crypt_ops/crypto_curve25519.c @@ -26,7 +26,7 @@ #include "lib/crypt_ops/crypto_format.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "ed25519/donna/ed25519_donna_tor.h" diff --git a/src/lib/crypt_ops/crypto_dh.c b/src/lib/crypt_ops/crypto_dh.c index c37e286da..3e8299693 100644 --- a/src/lib/crypt_ops/crypto_dh.c +++ b/src/lib/crypt_ops/crypto_dh.c @@ -14,7 +14,7 @@ #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_hkdf.h" #include "lib/crypt_ops/crypto_util.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" DISABLE_GCC_WARNING(redundant-decls) diff --git a/src/lib/crypt_ops/crypto_digest.c b/src/lib/crypt_ops/crypto_digest.c index 949e69405..ee5c362e3 100644 --- a/src/lib/crypt_ops/crypto_digest.c +++ b/src/lib/crypt_ops/crypto_digest.c @@ -14,7 +14,7 @@ #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_openssl_mgt.h" #include "lib/crypt_ops/crypto_util.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "keccak-tiny/keccak-tiny.h" diff --git a/src/lib/crypt_ops/crypto_ed25519.c b/src/lib/crypt_ops/crypto_ed25519.c index 985652ecb..9d2c9e9fa 100644 --- a/src/lib/crypt_ops/crypto_ed25519.c +++ b/src/lib/crypt_ops/crypto_ed25519.c @@ -28,7 +28,7 @@ #include "lib/crypt_ops/crypto_format.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/encoding/binascii.h" #include "lib/string/util_string.h" diff --git a/src/lib/crypt_ops/crypto_format.c b/src/lib/crypt_ops/crypto_format.c index 8c71b265b..50916a8d6 100644 --- a/src/lib/crypt_ops/crypto_format.c +++ b/src/lib/crypt_ops/crypto_format.c @@ -24,7 +24,7 @@ #include "lib/string/util_string.h" #include "lib/string/printf.h" #include "lib/encoding/binascii.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/fs/files.h" diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index e2d72a77c..fb9d0c2c6 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -26,7 +26,7 @@ #include "lib/crypt_ops/crypto_util.h" #include "lib/encoding/binascii.h" #include "lib/intmath/weakrng.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/malloc/malloc.h" #include "lib/sandbox/sandbox.h" diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c index 9290414de..5ec69d731 100644 --- a/src/lib/crypt_ops/crypto_rsa.c +++ b/src/lib/crypt_ops/crypto_rsa.c @@ -36,7 +36,7 @@ DISABLE_GCC_WARNING(redundant-decls) ENABLE_GCC_WARNING(redundant-decls) -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/encoding/binascii.h" #include <string.h> diff --git a/src/lib/crypt_ops/crypto_rsa.h b/src/lib/crypt_ops/crypto_rsa.h index 093f2cec6..51fc97482 100644 --- a/src/lib/crypt_ops/crypto_rsa.h +++ b/src/lib/crypt_ops/crypto_rsa.h @@ -18,7 +18,7 @@ #include "lib/crypt_ops/crypto_digest.h" #include "lib/cc/torint.h" #include "lib/testsupport/testsupport.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" /** Length of our public keys. */ #define PK_BYTES (1024/8) diff --git a/src/lib/crypt_ops/crypto_util.c b/src/lib/crypt_ops/crypto_util.c index 19b088525..79988c6a9 100644 --- a/src/lib/crypt_ops/crypto_util.c +++ b/src/lib/crypt_ops/crypto_util.c @@ -31,7 +31,7 @@ DISABLE_GCC_WARNING(redundant-decls) ENABLE_GCC_WARNING(redundant-decls) -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" /** diff --git a/src/lib/encoding/binascii.c b/src/lib/encoding/binascii.c index 7499d6472..e9140d943 100644 --- a/src/lib/encoding/binascii.c +++ b/src/lib/encoding/binascii.c @@ -14,7 +14,7 @@ #include "orconfig.h" #include "lib/encoding/binascii.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/cc/torint.h" #include "lib/string/compat_ctype.h" diff --git a/src/lib/encoding/confline.c b/src/lib/encoding/confline.c index 9b1762953..dd5193d3a 100644 --- a/src/lib/encoding/confline.c +++ b/src/lib/encoding/confline.c @@ -17,7 +17,7 @@ #include "lib/encoding/confline.h" #include "lib/encoding/cstring.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/malloc/malloc.h" #include "lib/string/compat_ctype.h" diff --git a/src/lib/encoding/cstring.c b/src/lib/encoding/cstring.c index 3e0db712f..69aa7f3da 100644 --- a/src/lib/encoding/cstring.c +++ b/src/lib/encoding/cstring.c @@ -11,7 +11,7 @@ **/ #include "lib/encoding/cstring.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/malloc/malloc.h" #include "lib/string/compat_ctype.h" diff --git a/src/lib/encoding/keyval.c b/src/lib/encoding/keyval.c index 53ee776fe..d5e4e4e43 100644 --- a/src/lib/encoding/keyval.c +++ b/src/lib/encoding/keyval.c @@ -12,7 +12,7 @@ #include "orconfig.h" #include "lib/encoding/keyval.h" #include "lib/log/escape.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include <stdlib.h> diff --git a/src/lib/encoding/time_fmt.c b/src/lib/encoding/time_fmt.c index 8ce15e747..42b1cc646 100644 --- a/src/lib/encoding/time_fmt.c +++ b/src/lib/encoding/time_fmt.c @@ -15,7 +15,7 @@ **/ #include "lib/encoding/time_fmt.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/escape.h" #include "lib/log/util_bug.h" #include "lib/malloc/malloc.h" diff --git a/src/lib/evloop/compat_libevent.c b/src/lib/evloop/compat_libevent.c index 5e5faf163..2ee71c559 100644 --- a/src/lib/evloop/compat_libevent.c +++ b/src/lib/evloop/compat_libevent.c @@ -11,7 +11,7 @@ #include "lib/evloop/compat_libevent.h" #include "lib/crypt_ops/crypto_rand.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/string/compat_string.h" diff --git a/src/lib/evloop/procmon.c b/src/lib/evloop/procmon.c index 53c458f15..e0c26caab 100644 --- a/src/lib/evloop/procmon.c +++ b/src/lib/evloop/procmon.c @@ -8,7 +8,7 @@ #include "lib/evloop/procmon.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/log/win32err.h" #include "lib/malloc/malloc.h" diff --git a/src/lib/evloop/procmon.h b/src/lib/evloop/procmon.h index b596e5cc6..42c378869 100644 --- a/src/lib/evloop/procmon.h +++ b/src/lib/evloop/procmon.h @@ -11,7 +11,7 @@ #include "lib/evloop/compat_libevent.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" typedef struct tor_process_monitor_t tor_process_monitor_t; diff --git a/src/lib/evloop/timers.c b/src/lib/evloop/timers.c index 4580b89e3..c4e85c7c9 100644 --- a/src/lib/evloop/timers.c +++ b/src/lib/evloop/timers.c @@ -34,7 +34,7 @@ #include "lib/evloop/compat_libevent.h" #include "lib/evloop/timers.h" #include "lib/intmath/muldiv.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/malloc/malloc.h" #include "lib/time/compat_time.h" diff --git a/src/lib/evloop/workqueue.c b/src/lib/evloop/workqueue.c index 4d36f352e..931f65e71 100644 --- a/src/lib/evloop/workqueue.c +++ b/src/lib/evloop/workqueue.c @@ -30,7 +30,7 @@ #include "lib/crypt_ops/crypto_rand.h" #include "lib/intmath/weakrng.h" #include "lib/log/ratelim.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/net/alertsock.h" #include "lib/net/socket.h" diff --git a/src/lib/fs/conffile.c b/src/lib/fs/conffile.c index 3a4d95f45..d8622bff6 100644 --- a/src/lib/fs/conffile.c +++ b/src/lib/fs/conffile.c @@ -17,7 +17,7 @@ #include "lib/fs/dir.h" #include "lib/fs/files.h" #include "lib/fs/path.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/malloc/malloc.h" #include "lib/string/printf.h" diff --git a/src/lib/fs/dir.c b/src/lib/fs/dir.c index 0f2a5e235..6c2446000 100644 --- a/src/lib/fs/dir.c +++ b/src/lib/fs/dir.c @@ -14,7 +14,7 @@ #include "lib/fs/path.h" #include "lib/fs/userdb.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/log/win32err.h" #include "lib/container/smartlist.h" diff --git a/src/lib/fs/files.c b/src/lib/fs/files.c index 9012fd64f..c71e4d2a3 100644 --- a/src/lib/fs/files.c +++ b/src/lib/fs/files.c @@ -16,7 +16,7 @@ #include "lib/fs/files.h" #include "lib/fs/path.h" #include "lib/container/smartlist.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/log/escape.h" #include "lib/err/torerr.h" diff --git a/src/lib/fs/lockfile.c b/src/lib/fs/lockfile.c index a4e3c427d..ca1711c34 100644 --- a/src/lib/fs/lockfile.c +++ b/src/lib/fs/lockfile.c @@ -13,7 +13,7 @@ #include "orconfig.h" #include "lib/fs/files.h" #include "lib/fs/lockfile.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/malloc/malloc.h" diff --git a/src/lib/fs/mmap.c b/src/lib/fs/mmap.c index 7d91945bb..e7da6fc63 100644 --- a/src/lib/fs/mmap.c +++ b/src/lib/fs/mmap.c @@ -11,7 +11,7 @@ #include "lib/fs/mmap.h" #include "lib/fs/files.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/log/win32err.h" #include "lib/string/compat_string.h" diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c index 9b32b2ebd..eb5170920 100644 --- a/src/lib/fs/path.c +++ b/src/lib/fs/path.c @@ -11,7 +11,7 @@ #include "lib/fs/path.h" #include "lib/malloc/malloc.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/string/printf.h" #include "lib/string/util_string.h" diff --git a/src/lib/fs/storagedir.c b/src/lib/fs/storagedir.c index 4db56b02f..014eb4d9e 100644 --- a/src/lib/fs/storagedir.c +++ b/src/lib/fs/storagedir.c @@ -20,7 +20,7 @@ #include "lib/fs/files.h" #include "lib/fs/mmap.h" #include "lib/log/escape.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/malloc/malloc.h" #include "lib/memarea/memarea.h" diff --git a/src/lib/fs/userdb.c b/src/lib/fs/userdb.c index 1e772b8fb..df2935baa 100644 --- a/src/lib/fs/userdb.c +++ b/src/lib/fs/userdb.c @@ -13,7 +13,7 @@ #ifndef _WIN32 #include "lib/malloc/malloc.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include <pwd.h> diff --git a/src/lib/log/include.am b/src/lib/log/include.am index f0491b386..b5a1c5ca2 100644 --- a/src/lib/log/include.am +++ b/src/lib/log/include.am @@ -8,7 +8,7 @@ endif src_lib_libtor_log_a_SOURCES = \ src/lib/log/escape.c \ src/lib/log/ratelim.c \ - src/lib/log/torlog.c \ + src/lib/log/log.c \ src/lib/log/util_bug.c if WIN32 @@ -26,6 +26,6 @@ src/lib/log/torlog.$(OBJEXT) \ noinst_HEADERS += \ src/lib/log/escape.h \ src/lib/log/ratelim.h \ - src/lib/log/torlog.h \ + src/lib/log/log.h \ src/lib/log/util_bug.h \ src/lib/log/win32err.h diff --git a/src/lib/log/torlog.c b/src/lib/log/log.c similarity index 99% rename from src/lib/log/torlog.c rename to src/lib/log/log.c index 46d121755..b89747d84 100644 --- a/src/lib/log/torlog.c +++ b/src/lib/log/log.c @@ -5,7 +5,7 @@ /* See LICENSE for licensing information */ /** - * \file torlog.c + * \file log.c * \brief Functions to send messages to log files or the console. **/ @@ -31,7 +31,7 @@ #endif #define LOG_PRIVATE -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/ratelim.h" #include "lib/lock/compat_mutex.h" #include "lib/smartlist_core/smartlist_core.h" diff --git a/src/lib/log/torlog.h b/src/lib/log/log.h similarity index 99% rename from src/lib/log/torlog.h rename to src/lib/log/log.h index c24b63819..493409756 100644 --- a/src/lib/log/torlog.h +++ b/src/lib/log/log.h @@ -5,7 +5,7 @@ /* See LICENSE for licensing information */ /** - * \file torlog.h + * \file log.h * * \brief Headers for log.c **/ diff --git a/src/lib/log/util_bug.c b/src/lib/log/util_bug.c index e3c8df0d6..42b3670a7 100644 --- a/src/lib/log/util_bug.c +++ b/src/lib/log/util_bug.c @@ -9,7 +9,7 @@ #include "orconfig.h" #include "lib/log/util_bug.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/err/backtrace.h" #ifdef TOR_UNIT_TESTS #include "lib/smartlist_core/smartlist_core.h" diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h index a0753c807..61ee60f72 100644 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@ -38,7 +38,7 @@ #include "orconfig.h" #include "lib/cc/compat_compiler.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/testsupport/testsupport.h" /* Replace assert() with a variant that sends failures to the log before diff --git a/src/lib/memarea/memarea.c b/src/lib/memarea/memarea.c index 3a93d89ee..dd7c48c07 100644 --- a/src/lib/memarea/memarea.c +++ b/src/lib/memarea/memarea.c @@ -17,7 +17,7 @@ #include "lib/arch/bytes.h" #include "lib/cc/torint.h" #include "lib/container/smartlist.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/malloc/malloc.h" diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c index 01080367f..648f54e0c 100644 --- a/src/lib/meminfo/meminfo.c +++ b/src/lib/meminfo/meminfo.c @@ -15,7 +15,7 @@ #include "lib/cc/compat_compiler.h" #include "lib/cc/torint.h" #include "lib/fs/files.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/malloc/malloc.h" #ifdef HAVE_SYS_SYSCTL_H diff --git a/src/lib/net/address.c b/src/lib/net/address.c index ca0c2a46c..619fa13e9 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -42,7 +42,7 @@ #include "lib/net/socket.h" #include "lib/container/smartlist.h" #include "lib/ctime/di_ops.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/escape.h" #include "lib/malloc/malloc.h" #include "lib/net/inaddr.h" diff --git a/src/lib/net/buffers_net.c b/src/lib/net/buffers_net.c index 2e6a096a0..c52ea2784 100644 --- a/src/lib/net/buffers_net.c +++ b/src/lib/net/buffers_net.c @@ -12,7 +12,7 @@ #define BUFFERS_PRIVATE #include "lib/net/buffers_net.h" #include "lib/container/buffers.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/net/nettypes.h" diff --git a/src/lib/net/socket.c b/src/lib/net/socket.c index 1b3238d99..5847bb873 100644 --- a/src/lib/net/socket.c +++ b/src/lib/net/socket.c @@ -15,7 +15,7 @@ #include "lib/cc/compat_compiler.h" #include "lib/err/torerr.h" #include "lib/lock/compat_mutex.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #ifdef _WIN32 diff --git a/src/lib/process/daemon.c b/src/lib/process/daemon.c index 6863d05d7..671579838 100644 --- a/src/lib/process/daemon.c +++ b/src/lib/process/daemon.c @@ -14,7 +14,7 @@ #ifndef _WIN32 #include "lib/fs/files.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/thread/threads.h" #ifdef HAVE_SYS_TYPES_H diff --git a/src/lib/process/env.c b/src/lib/process/env.c index 5b959d05f..dc0b63b49 100644 --- a/src/lib/process/env.c +++ b/src/lib/process/env.c @@ -15,7 +15,7 @@ #include "lib/ctime/di_ops.h" #include "lib/container/smartlist.h" #include "lib/log/util_bug.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/malloc/malloc.h" #ifdef HAVE_UNISTD_H diff --git a/src/lib/process/pidfile.c b/src/lib/process/pidfile.c index 17ff8be60..ea008168a 100644 --- a/src/lib/process/pidfile.c +++ b/src/lib/process/pidfile.c @@ -11,7 +11,7 @@ #include "orconfig.h" #include "lib/process/pidfile.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/src/lib/process/restrict.c b/src/lib/process/restrict.c index fc1a30880..bca325e5b 100644 --- a/src/lib/process/restrict.c +++ b/src/lib/process/restrict.c @@ -11,7 +11,7 @@ #include "orconfig.h" #include "lib/process/restrict.h" #include "lib/intmath/cmp.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/net/socket.h" diff --git a/src/lib/process/setuid.c b/src/lib/process/setuid.c index 13b352dad..d038039ff 100644 --- a/src/lib/process/setuid.c +++ b/src/lib/process/setuid.c @@ -17,7 +17,7 @@ #include "lib/container/smartlist.h" #include "lib/fs/userdb.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/malloc/malloc.h" diff --git a/src/lib/process/subprocess.c b/src/lib/process/subprocess.c index d2bbb61c3..70851c15e 100644 --- a/src/lib/process/subprocess.c +++ b/src/lib/process/subprocess.c @@ -13,7 +13,7 @@ #include "lib/container/smartlist.h" #include "lib/err/torerr.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/log/win32err.h" #include "lib/malloc/malloc.h" diff --git a/src/lib/process/waitpid.c b/src/lib/process/waitpid.c index b829cb1b0..32ba4530d 100644 --- a/src/lib/process/waitpid.c +++ b/src/lib/process/waitpid.c @@ -13,7 +13,7 @@ #ifndef _WIN32 #include "lib/process/waitpid.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/malloc/malloc.h" #include "ht.h" diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index 7768bee06..551075432 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -36,7 +36,7 @@ #include "lib/sandbox/sandbox.h" #include "lib/container/map.h" #include "lib/err/torerr.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/cc/torint.h" #include "lib/net/resolve.h" #include "lib/malloc/malloc.h" diff --git a/src/lib/thread/compat_pthreads.c b/src/lib/thread/compat_pthreads.c index 246c6254b..934067e4c 100644 --- a/src/lib/thread/compat_pthreads.c +++ b/src/lib/thread/compat_pthreads.c @@ -12,7 +12,7 @@ #include "orconfig.h" #include "lib/thread/threads.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include <sys/time.h> diff --git a/src/lib/thread/compat_threads.c b/src/lib/thread/compat_threads.c index 972960e24..24129946b 100644 --- a/src/lib/thread/compat_threads.c +++ b/src/lib/thread/compat_threads.c @@ -15,7 +15,7 @@ #include <stdlib.h> #include "lib/thread/threads.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include <string.h> diff --git a/src/lib/thread/compat_winthreads.c b/src/lib/thread/compat_winthreads.c index 7f9877d21..799eeda1b 100644 --- a/src/lib/thread/compat_winthreads.c +++ b/src/lib/thread/compat_winthreads.c @@ -15,7 +15,7 @@ #include <windows.h> #include <process.h> #include "lib/thread/threads.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/log/win32err.h" diff --git a/src/lib/thread/numcpus.c b/src/lib/thread/numcpus.c index b8763f118..cca15eb7a 100644 --- a/src/lib/thread/numcpus.c +++ b/src/lib/thread/numcpus.c @@ -10,7 +10,7 @@ #include "orconfig.h" #include "lib/thread/numcpus.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #ifdef HAVE_UNISTD_H diff --git a/src/lib/time/compat_time.c b/src/lib/time/compat_time.c index 2ea6eca98..d26cb6880 100644 --- a/src/lib/time/compat_time.c +++ b/src/lib/time/compat_time.c @@ -13,7 +13,7 @@ #include "lib/time/compat_time.h" #include "lib/err/torerr.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/intmath/muldiv.h" #include "lib/intmath/bits.h" diff --git a/src/lib/time/tvdiff.c b/src/lib/time/tvdiff.c index 6af12501c..8617110e5 100644 --- a/src/lib/time/tvdiff.c +++ b/src/lib/time/tvdiff.c @@ -11,7 +11,7 @@ #include "lib/time/tvdiff.h" #include "lib/cc/compat_compiler.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #ifdef _WIN32 #include <winsock2.h> diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c index 0e112b59c..69ae4f7fc 100644 --- a/src/lib/tls/buffers_tls.c +++ b/src/lib/tls/buffers_tls.c @@ -15,7 +15,7 @@ #include "lib/container/buffers.h" #include "lib/tls/buffers_tls.h" #include "lib/cc/torint.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/tls/tortls.h" diff --git a/src/lib/tls/tortls.c b/src/lib/tls/tortls.c index 1cd22a7eb..073cae02b 100644 --- a/src/lib/tls/tortls.c +++ b/src/lib/tls/tortls.c @@ -52,7 +52,7 @@ ENABLE_GCC_WARNING(redundant-decls) #define TORTLS_PRIVATE #include "lib/tls/tortls.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/container/smartlist.h" #include "lib/string/compat_string.h" diff --git a/src/lib/trace/debug.h b/src/lib/trace/debug.h index a764f552e..191d94226 100644 --- a/src/lib/trace/debug.h +++ b/src/lib/trace/debug.h @@ -9,7 +9,7 @@ #ifndef TOR_TRACE_LOG_DEBUG_H #define TOR_TRACE_LOG_DEBUG_H -#include "lib/log/torlog.h" +#include "lib/log/log.h" /* Stringify pre-processor trick. */ #define XSTR(d) STR(d) diff --git a/src/test/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c index 61dc2144b..2fbb27561 100644 --- a/src/test/fuzz/fuzz_http.c +++ b/src/test/fuzz/fuzz_http.c @@ -12,7 +12,7 @@ #include "app/config/config.h" #include "core/mainloop/connection.h" #include "feature/dircache/directory.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "feature/dircommon/dir_connection_st.h" diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c index 184bb52ee..ca007a2c7 100644 --- a/src/test/fuzz/fuzz_http_connect.c +++ b/src/test/fuzz/fuzz_http_connect.c @@ -13,7 +13,7 @@ #include "core/mainloop/connection.h" #include "core/or/connection_edge.h" #include "core/proto/proto_socks.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "core/or/entry_connection_st.h" #include "core/or/socks_request_st.h" diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c index e814555ba..0d0f7574c 100644 --- a/src/test/log_test_helpers.c +++ b/src/test/log_test_helpers.c @@ -1,7 +1,7 @@ /* Copyright (c) 2015-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ #define LOG_PRIVATE -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "test/log_test_helpers.h" /** diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c index 716cff36e..89cbca206 100644 --- a/src/test/test_bt_cl.c +++ b/src/test/test_bt_cl.c @@ -9,7 +9,7 @@ #undef TOR_COVERAGE #include "core/or/or.h" #include "lib/err/backtrace.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/src/test/test_logging.c b/src/test/test_logging.c index 2e3b8800a..cd685a4af 100644 --- a/src/test/test_logging.c +++ b/src/test/test_logging.c @@ -7,7 +7,7 @@ #include "core/or/or.h" #include "app/config/config.h" #include "lib/err/torerr.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "test/test.h" #include "lib/process/subprocess.h" diff --git a/src/test/test_status.c b/src/test/test_status.c index 3cc23955a..15c406d2f 100644 --- a/src/test/test_status.c +++ b/src/test/test_status.c @@ -12,7 +12,7 @@ #include <math.h> #include "core/or/or.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "tor_queue.h" #include "core/or/status.h" #include "core/or/circuitlist.h" diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 2b40ed72d..54e5eca4f 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -31,7 +31,7 @@ DISABLE_GCC_WARNING(redundant-decls) ENABLE_GCC_WARNING(redundant-decls) #include "core/or/or.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "app/config/config.h" #include "lib/tls/tortls.h" #include "app/config/or_state_st.h" diff --git a/src/test/test_util_slow.c b/src/test/test_util_slow.c index 5021e89df..c5b24487b 100644 --- a/src/test/test_util_slow.c +++ b/src/test/test_util_slow.c @@ -7,7 +7,7 @@ #define UTIL_PRIVATE #define SUBPROCESS_PRIVATE #include "lib/crypt_ops/crypto.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/process/subprocess.h" #include "lib/process/waitpid.h" #include "lib/string/printf.h" diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index 0e3ab2408..ff924152a 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -38,7 +38,7 @@ ENABLE_GCC_WARNING(redundant-decls) #include "lib/encoding/binascii.h" #include "lib/encoding/time_fmt.h" #include "lib/fs/files.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/malloc/malloc.h" #include "lib/net/address.h" #include "lib/net/inaddr.h" diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index a4d5184b4..d5b498783 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -6,7 +6,7 @@ #include "orconfig.h" #include "lib/arch/bytes.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/malloc/malloc.h" #include "lib/net/address.h" #include "lib/net/resolve.h"

1 0

[tor/master] Add a changes file for 26481 (the big code movement)
by nickm＠torproject.org 10 Jul '18

10 Jul '18

commit 9ec80909ec7be3d9eea863dfc3f320bfe9072ae8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 10 15:07:04 2018 -0400 Add a changes file for 26481 (the big code movement) --- changes/ticket26481 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/changes/ticket26481 b/changes/ticket26481 new file mode 100644 index 000000000..84d219ed8 --- /dev/null +++ b/changes/ticket26481 @@ -0,0 +1,12 @@ + o Major features (new code layout): + - Nearly all of Tor's source code has been moved around into more logical + places. The "common" directory is now divided into a set of libraries + in "lib", and files in the "or" directory have been split into "core" + (logic absolutely needed for onion routing), "feature" (independent + modules in Tor), and "app" (to configure and invoke the rest of Tor). + See doc/HACKING/CodeStructure.md for more information. Closes ticket + 26481. + + This refactoring is not complete: although the libraries have been + refactored to be acyclic, the main body of Tor is still too + interconnected. We will attempt to improve this in the future.

1 0