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

[tor/master] Move handles.h to src/lib/container
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 0e4b1781f4f0135c925cd728a09cca7d7959b961 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 14:45:34 2018 -0400 Move handles.h to src/lib/container There might be a better place for it in the long run, but this is the best we can think of for now. --- src/common/include.am | 1 - src/{common => lib/container}/handles.h | 0 src/lib/container/include.am | 1 + src/or/channel.h | 2 +- src/or/conscache.h | 2 +- src/or/entrynodes.h | 2 +- src/test/test_handles.c | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/include.am b/src/common/include.am index 7427c6944..d352a46de 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -51,7 +51,6 @@ src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) COMMONHEADERS = \ src/common/address_set.h \ src/common/compat_libevent.h \ - src/common/handles.h \ src/common/procmon.h \ src/common/socks5_status.h \ src/common/timers.h \ diff --git a/src/common/handles.h b/src/lib/container/handles.h similarity index 100% rename from src/common/handles.h rename to src/lib/container/handles.h diff --git a/src/lib/container/include.am b/src/lib/container/include.am index e91ad7d1c..e6492098b 100644 --- a/src/lib/container/include.am +++ b/src/lib/container/include.am @@ -21,6 +21,7 @@ noinst_HEADERS += \ src/lib/container/bitarray.h \ src/lib/container/bloomfilt.h \ src/lib/container/buffers.h \ + src/lib/container/handles.h \ src/lib/container/map.h \ src/lib/container/order.h \ src/lib/container/smartlist.h diff --git a/src/or/channel.h b/src/or/channel.h index 010a8aa5b..7f2505676 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -11,7 +11,7 @@ #include "or/or.h" #include "or/circuitmux.h" -#include "common/handles.h" +#include "lib/container/handles.h" #include "lib/crypt_ops/crypto_ed25519.h" #include "tor_queue.h" diff --git a/src/or/conscache.h b/src/or/conscache.h index c46b82423..c274a6039 100644 --- a/src/or/conscache.h +++ b/src/or/conscache.h @@ -4,7 +4,7 @@ #ifndef TOR_CONSCACHE_H #define TOR_CONSCACHE_H -#include "common/handles.h" +#include "lib/container/handles.h" typedef struct consensus_cache_entry_t consensus_cache_entry_t; typedef struct consensus_cache_t consensus_cache_t; diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 56b961e9a..5f9b5bdcb 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -12,7 +12,7 @@ #ifndef TOR_ENTRYNODES_H #define TOR_ENTRYNODES_H -#include "common/handles.h" +#include "lib/container/handles.h" /* Forward declare for guard_selection_t; entrynodes.c has the real struct */ typedef struct guard_selection_s guard_selection_t; diff --git a/src/test/test_handles.c b/src/test/test_handles.c index 153ac5787..26c68aa8a 100644 --- a/src/test/test_handles.c +++ b/src/test/test_handles.c @@ -5,7 +5,7 @@ #include "test/test.h" #include "common/util.h" -#include "common/handles.h" +#include "lib/container/handles.h" typedef struct demo_t { HANDLE_ENTRY(demo, demo_t);

1 0

[tor/master] Move address_set to src/or
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 0adcfbc7c8b579ebfe4c16c86700e8b466fc9a56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 14:51:07 2018 -0400 Move address_set to src/or This is temporary, until src/or is split. Putting this in containers would be another logical alternative, except that addresses depend on containers, and we don't like cycles. --- src/common/include.am | 2 -- src/{common => or}/address_set.c | 2 +- src/{common => or}/address_set.h | 0 src/or/include.am | 2 ++ src/or/nodelist.c | 2 +- src/test/test_address_set.c | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/include.am b/src/common/include.am index 565482bcf..de4ecbaee 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -18,7 +18,6 @@ libor_extra_source= endif LIBOR_A_SRC = \ - src/common/address_set.c \ src/common/token_bucket.c \ src/common/workqueue.c \ $(libor_extra_source) @@ -49,7 +48,6 @@ src_common_libor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) COMMONHEADERS = \ - src/common/address_set.h \ src/common/compat_libevent.h \ src/common/procmon.h \ src/common/timers.h \ diff --git a/src/common/address_set.c b/src/or/address_set.c similarity index 98% rename from src/common/address_set.c rename to src/or/address_set.c index 1bd146238..927a5597c 100644 --- a/src/common/address_set.c +++ b/src/or/address_set.c @@ -11,7 +11,7 @@ **/ #include "orconfig.h" -#include "common/address_set.h" +#include "or/address_set.h" #include "lib/net/address.h" #include "lib/container/bloomfilt.h" #include "lib/crypt_ops/crypto_rand.h" diff --git a/src/common/address_set.h b/src/or/address_set.h similarity index 100% rename from src/common/address_set.h rename to src/or/address_set.h diff --git a/src/or/include.am b/src/or/include.am index 9b5f7c1f6..ad7ee69bf 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -19,6 +19,7 @@ EXTRA_DIST+= src/or/ntmain.c src/or/Makefile.nmake LIBTOR_APP_A_SOURCES = \ src/or/addressmap.c \ + src/or/address_set.c \ src/or/bridges.c \ src/or/channel.c \ src/or/channelpadding.c \ @@ -180,6 +181,7 @@ endif ORHEADERS = \ src/or/addressmap.h \ + src/or/address_set.h \ src/or/addr_policy_st.h \ src/or/authority_cert_st.h \ src/or/auth_dirs.inc \ diff --git a/src/or/nodelist.c b/src/or/nodelist.c index bc04ab952..51fd0015d 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -42,7 +42,7 @@ #include "or/or.h" #include "lib/net/address.h" -#include "common/address_set.h" +#include "or/address_set.h" #include "or/bridges.h" #include "or/config.h" #include "or/control.h" diff --git a/src/test/test_address_set.c b/src/test/test_address_set.c index 369968584..ec4e6b7e8 100644 --- a/src/test/test_address_set.c +++ b/src/test/test_address_set.c @@ -3,7 +3,7 @@ #include "or/or.h" #include "lib/crypt_ops/crypto_rand.h" -#include "common/address_set.h" +#include "or/address_set.h" #include "or/microdesc.h" #include "or/networkstatus.h" #include "or/nodelist.h"

1 0

[tor/master] Move socks5_status.h to src/lib/net
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 24c0f83185a9c5dff080b250d9a8e15bbf8e1a88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 14:48:29 2018 -0400 Move socks5_status.h to src/lib/net There might be a better place for it in the long run, but this is the best I can think of for now. --- src/common/include.am | 1 - src/lib/net/include.am | 3 ++- src/{common => lib/net}/socks5_status.h | 0 src/or/reasons.h | 2 +- src/test/test_socks.c | 2 +- src/tools/tor-resolve.c | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/include.am b/src/common/include.am index d352a46de..565482bcf 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -52,7 +52,6 @@ COMMONHEADERS = \ src/common/address_set.h \ src/common/compat_libevent.h \ src/common/procmon.h \ - src/common/socks5_status.h \ src/common/timers.h \ src/common/token_bucket.h \ src/common/util.h \ diff --git a/src/lib/net/include.am b/src/lib/net/include.am index a375ac8ad..6fda17361 100644 --- a/src/lib/net/include.am +++ b/src/lib/net/include.am @@ -29,4 +29,5 @@ noinst_HEADERS += \ src/lib/net/ipv6.h \ src/lib/net/nettypes.h \ src/lib/net/resolve.h \ - src/lib/net/socket.h + src/lib/net/socket.h \ + src/lib/net/socks5_status.h diff --git a/src/common/socks5_status.h b/src/lib/net/socks5_status.h similarity index 100% rename from src/common/socks5_status.h rename to src/lib/net/socks5_status.h diff --git a/src/or/reasons.h b/src/or/reasons.h index b815463b7..837b4a0f1 100644 --- a/src/or/reasons.h +++ b/src/or/reasons.h @@ -12,7 +12,7 @@ #ifndef TOR_REASONS_H #define TOR_REASONS_H -#include "common/socks5_status.h" +#include "lib/net/socks5_status.h" enum bandwidth_weight_rule_t; const char *stream_end_reason_to_control_string(int reason); diff --git a/src/test/test_socks.c b/src/test/test_socks.c index 046ed3597..0a01bf643 100644 --- a/src/test/test_socks.c +++ b/src/test/test_socks.c @@ -11,7 +11,7 @@ #include "test/test.h" #include "test/log_test_helpers.h" #include "or/socks_request_st.h" -#include "common/socks5_status.h" +#include "lib/net/socks5_status.h" typedef struct socks_test_data_t { socks_request_t *req; diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 303c7af3e..1532d5f20 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -14,7 +14,7 @@ #include "lib/sandbox/sandbox.h" #include "lib/string/util_string.h" -#include "common/socks5_status.h" +#include "lib/net/socks5_status.h" #include <stdio.h> #include <stdlib.h>

1 0

[tor/master] Clean up include paths for libtor-evloop (automated)
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 2d69c32bb6dfc9f336cb897ffc6ab06931d2840b Author: Nick Mathewson <nickm(a)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

1 0

[tor/master] All remaining files in src/common belong to the event loop.
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 1e417b7275028a50227f57fb71d04c1837ec4b2c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 15:13:44 2018 -0400 All remaining files in src/common belong to the event loop. --- .gitignore | 15 ++------ Makefile.am | 6 ++-- src/common/Makefile.nmake | 28 --------------- src/common/include.am | 51 ---------------------------- src/include.am | 2 +- src/lib/evloop/.may_include | 15 ++++++++ src/{common => lib/evloop}/compat_libevent.c | 0 src/{common => lib/evloop}/compat_libevent.h | 0 src/lib/evloop/include.am | 26 ++++++++++++++ src/{common => lib/evloop}/procmon.c | 0 src/{common => lib/evloop}/procmon.h | 0 src/{common => lib/evloop}/timers.c | 0 src/{common => lib/evloop}/timers.h | 0 src/{common => lib/evloop}/token_bucket.c | 0 src/{common => lib/evloop}/token_bucket.h | 0 src/{common => lib/evloop}/workqueue.c | 0 src/{common => lib/evloop}/workqueue.h | 0 src/test/include.am | 2 +- 18 files changed, 47 insertions(+), 98 deletions(-) diff --git a/.gitignore b/.gitignore index b1de1d79d..711974450 100644 --- a/.gitignore +++ b/.gitignore @@ -132,19 +132,6 @@ uptime-*.json # /src/trace /src/trace/libor-trace.a -# /src/common/ -/src/common/Makefile -/src/common/Makefile.in -/src/common/libor.a -/src/common/libor-testing.a -/src/common/libor.lib -/src/common/libor-ctime.a -/src/common/libor-ctime-testing.a -/src/common/libor-ctime.lib -/src/common/libor-event.a -/src/common/libor-event-testing.a -/src/common/libor-event.lib - # /src/config/ /src/config/Makefile /src/config/Makefile.in @@ -173,6 +160,8 @@ uptime-*.json /src/lib/libtor-ctime-testing.a /src/lib/libtor-encoding.a /src/lib/libtor-encoding-testing.a +/src/lib/libtor-evloop.a +/src/lib/libtor-evloop-testing.a /src/lib/libtor-err.a /src/lib/libtor-err-testing.a /src/lib/libtor-fdio.a diff --git a/Makefile.am b/Makefile.am index fe2479a64..b2da55cda 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,7 +40,6 @@ endif # "Common" libraries used to link tor's utility code. TOR_UTIL_LIBS = \ - src/common/libor.a \ src/lib/libtor-process.a \ src/lib/libtor-time.a \ src/lib/libtor-fs.a \ @@ -68,7 +67,6 @@ TOR_UTIL_LIBS = \ # Variants of the above for linking the testing variant of tor (for coverage # and tests) TOR_UTIL_TESTING_LIBS = \ - src/common/libor-testing.a \ src/lib/libtor-process-testing.a \ src/lib/libtor-time-testing.a \ src/lib/libtor-fs-testing.a \ @@ -112,9 +110,9 @@ TOR_CRYPTO_TESTING_LIBS = \ TOR_INTERNAL_LIBS = \ src/or/libtor-app.a \ src/lib/libtor-compress.a \ + src/lib/libtor-evloop.a \ $(TOR_CRYPTO_LIBS) \ $(TOR_UTIL_LIBS) \ - src/common/libor-event.a \ src/trunnel/libor-trunnel.a \ src/lib/libtor-trace.a @@ -123,9 +121,9 @@ TOR_INTERNAL_LIBS = \ TOR_INTERNAL_TESTING_LIBS = \ src/or/libtor-app-testing.a \ src/lib/libtor-compress-testing.a \ + src/lib/libtor-evloop-testing.a \ $(TOR_CRYPTO_TESTING_LIBS) \ $(TOR_UTIL_TESTING_LIBS) \ - src/common/libor-event-testing.a \ src/trunnel/libor-trunnel-testing.a \ src/lib/libtor-trace.a diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake deleted file mode 100644 index a1c819fff..000000000 --- a/src/common/Makefile.nmake +++ /dev/null @@ -1,28 +0,0 @@ -all: libor.lib libor-crypto.lib libor-event.lib - -CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \ - /I ..\ext - -LIBOR_OBJECTS = address.obj backtrace.obj compat.obj container.obj di_ops.obj \ - log.obj memarea.obj mempool.obj procmon.obj sandbox.obj util.obj \ - util_codedigest.obj - -LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj crypto_format.obj compress.obj compress_zlib.obj \ - tortls.obj crypto_curve25519.obj curve25519-donna.obj - -LIBOR_EVENT_OBJECTS = compat_libevent.obj - -curve25519-donna.obj: ..\ext\curve25519_donna\curve25519-donna.c - $(CC) $(CFLAGS) /D inline=_inline /c ..\ext\curve25519_donna\curve25519-donna.c - -libor.lib: $(LIBOR_OBJECTS) - lib $(LIBOR_OBJECTS) /out:libor.lib - -libor-crypto.lib: $(LIBOR_CRYPTO_OBJECTS) - lib $(LIBOR_CRYPTO_OBJECTS) /out:libor-crypto.lib - -libor-event.lib: $(LIBOR_EVENT_OBJECTS) - lib $(LIBOR_EVENT_OBJECTS) /out:libor-event.lib - -clean: - del *.obj *.lib libor*.lib diff --git a/src/common/include.am b/src/common/include.am deleted file mode 100644 index 8a2d2e114..000000000 --- a/src/common/include.am +++ /dev/null @@ -1,51 +0,0 @@ - -noinst_LIBRARIES += \ - src/common/libor.a \ - src/common/libor-event.a - -if UNITTESTS_ENABLED -noinst_LIBRARIES += \ - src/common/libor-testing.a \ - src/common/libor-event-testing.a -endif - -EXTRA_DIST += src/common/Makefile.nmake - -LIBOR_A_SRC = \ - src/common/token_bucket.c \ - src/common/workqueue.c \ - $(libor_extra_source) - -src/common/src_common_libor_testing_a-log.$(OBJEXT) \ - src/common/log.$(OBJEXT): micro-revision.i - -LIBOR_EVENT_A_SRC = \ - src/common/compat_libevent.c \ - src/common/procmon.c \ - src/common/timers.c \ - src/ext/timeouts/timeout.c - -src_common_libor_a_SOURCES = $(LIBOR_A_SRC) -src_common_libor_event_a_SOURCES = $(LIBOR_EVENT_A_SRC) - -if UNITTESTS_ENABLED -src_common_libor_testing_a_SOURCES = $(LIBOR_A_SRC) -src_common_libor_event_testing_a_SOURCES = $(LIBOR_EVENT_A_SRC) -else -src_common_libor_testing_a_SOURCES = -src_common_libor_event_testing_a_SOURCES = -endif - -src_common_libor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) -src_common_libor_event_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) -src_common_libor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) -src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) - -COMMONHEADERS = \ - src/common/compat_libevent.h \ - src/common/procmon.h \ - src/common/timers.h \ - src/common/token_bucket.h \ - src/common/workqueue.h - -noinst_HEADERS+= $(COMMONHEADERS) diff --git a/src/include.am b/src/include.am index 1ed07425a..950f9cc0f 100644 --- a/src/include.am +++ b/src/include.am @@ -8,6 +8,7 @@ include src/lib/container/include.am include src/lib/crypt_ops/include.am include src/lib/defs/include.am include src/lib/encoding/include.am +include src/lib/evloop/include.am include src/lib/fdio/include.am include src/lib/fs/include.am include src/lib/include.libdonna.am @@ -31,7 +32,6 @@ include src/lib/time/include.am include src/lib/tls/include.am include src/lib/trace/include.am include src/lib/wallclock/include.am -include src/common/include.am include src/trunnel/include.am include src/or/include.am include src/rust/include.am diff --git a/src/lib/evloop/.may_include b/src/lib/evloop/.may_include new file mode 100644 index 000000000..205f41b38 --- /dev/null +++ b/src/lib/evloop/.may_include @@ -0,0 +1,15 @@ +orconfig.h + +lib/cc/*.h +lib/crypt_ops/*.h +lib/evloop/*.h +lib/intmath/*.h +lib/log/*.h +lib/malloc/*.h +lib/net/*.h +lib/string/*.h +lib/testsupport/*.h +lib/thread/*.h +lib/time/*.h + +src/ext/timeouts/timeout.c diff --git a/src/common/compat_libevent.c b/src/lib/evloop/compat_libevent.c similarity index 100% rename from src/common/compat_libevent.c rename to src/lib/evloop/compat_libevent.c diff --git a/src/common/compat_libevent.h b/src/lib/evloop/compat_libevent.h similarity index 100% rename from src/common/compat_libevent.h rename to src/lib/evloop/compat_libevent.h diff --git a/src/lib/evloop/include.am b/src/lib/evloop/include.am new file mode 100644 index 000000000..6b0076272 --- /dev/null +++ b/src/lib/evloop/include.am @@ -0,0 +1,26 @@ + +noinst_LIBRARIES += src/lib/libtor-evloop.a + +if UNITTESTS_ENABLED +noinst_LIBRARIES += src/lib/libtor-evloop-testing.a +endif + +src_lib_libtor_evloop_a_SOURCES = \ + src/lib/evloop/compat_libevent.c \ + src/lib/evloop/procmon.c \ + src/lib/evloop/timers.c \ + src/lib/evloop/token_bucket.c \ + src/lib/evloop/workqueue.c + + +src_lib_libtor_evloop_testing_a_SOURCES = \ + $(src_lib_libtor_evloop_a_SOURCES) +src_lib_libtor_evloop_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) +src_lib_libtor_evloop_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) + +noinst_HEADERS += \ + src/lib/evloop/compat_libevent.h \ + src/lib/evloop/procmon.h \ + src/lib/evloop/timers.h \ + src/lib/evloop/token_bucket.h \ + src/lib/evloop/workqueue.h diff --git a/src/common/procmon.c b/src/lib/evloop/procmon.c similarity index 100% rename from src/common/procmon.c rename to src/lib/evloop/procmon.c diff --git a/src/common/procmon.h b/src/lib/evloop/procmon.h similarity index 100% rename from src/common/procmon.h rename to src/lib/evloop/procmon.h diff --git a/src/common/timers.c b/src/lib/evloop/timers.c similarity index 100% rename from src/common/timers.c rename to src/lib/evloop/timers.c diff --git a/src/common/timers.h b/src/lib/evloop/timers.h similarity index 100% rename from src/common/timers.h rename to src/lib/evloop/timers.h diff --git a/src/common/token_bucket.c b/src/lib/evloop/token_bucket.c similarity index 100% rename from src/common/token_bucket.c rename to src/lib/evloop/token_bucket.c diff --git a/src/common/token_bucket.h b/src/lib/evloop/token_bucket.h similarity index 100% rename from src/common/token_bucket.h rename to src/lib/evloop/token_bucket.h diff --git a/src/common/workqueue.c b/src/lib/evloop/workqueue.c similarity index 100% rename from src/common/workqueue.c rename to src/lib/evloop/workqueue.c diff --git a/src/common/workqueue.h b/src/lib/evloop/workqueue.h similarity index 100% rename from src/common/workqueue.h rename to src/lib/evloop/workqueue.h diff --git a/src/test/include.am b/src/test/include.am index 827b780ce..a749ff143 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -271,7 +271,7 @@ src_test_test_workqueue_LDADD = \ src_test_test_timers_CPPFLAGS = $(src_test_test_CPPFLAGS) src_test_test_timers_CFLAGS = $(src_test_test_CFLAGS) src_test_test_timers_LDADD = \ - src/common/libor-event-testing.a \ + src/lib/libtor-evloop-testing.a \ $(TOR_CRYPTO_TESTING_LIBS) \ $(TOR_UTIL_TESTING_LIBS) \ $(rust_ldadd) \

1 0

[tor/master] Fix fuzzing_include_am.py
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit f7eff3008d33fb0c35986cbc14799b0127e8ab73 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 15:21:30 2018 -0400 Fix fuzzing_include_am.py --- scripts/codegen/fuzzing_include_am.py | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/scripts/codegen/fuzzing_include_am.py b/scripts/codegen/fuzzing_include_am.py index fda57d2ae..42a61876e 100755 --- a/scripts/codegen/fuzzing_include_am.py +++ b/scripts/codegen/fuzzing_include_am.py @@ -24,32 +24,17 @@ FUZZING_CFLAGS = \ FUZZING_LDFLAG = \ @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ FUZZING_LIBS = \ - src/or/libtor-testing.a \ - src/common/libor-crypto-testing.a \ - $(LIBKECCAK_TINY) \ - $(LIBDONNA) \ - src/common/libor-testing.a \ - src/common/libor-ctime-testing.a \ - src/common/libor-event-testing.a \ - src/trunnel/libor-trunnel-testing.a \ + $(TOR_INTERNAL_TESTING_LIBS) \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ - @TOR_LIBEVENT_LIBS@ \ - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ - @CURVE25519_LIBS@ \ + @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ \ @TOR_SYSTEMD_LIBS@ \ @TOR_LZMA_LIBS@ \ @TOR_ZSTD_LIBS@ oss-fuzz-prereqs: \ - src/or/libtor-testing.a \ - src/common/libor-crypto-testing.a \ - $(LIBKECCAK_TINY) \ - $(LIBDONNA) \ - src/common/libor-testing.a \ - src/common/libor-ctime-testing.a \ - src/common/libor-event-testing.a \ - src/trunnel/libor-trunnel-testing.a + $(TOR_INTERNAL_TESTING_LIBS) noinst_HEADERS += \ src/test/fuzz/fuzzing.h

1 0

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

05 Jul '18

commit 02ba0a2dbbe1032b56d0ba17468f2ee0d95e4f1b Merge: 3d610363e f7eff3008 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 15:42:55 2018 -0400 Merge branch 'destroy_common' .gitignore | 15 +------ Makefile.am | 6 +-- scripts/codegen/fuzzing_include_am.py | 23 ++--------- src/common/Makefile.nmake | 28 ------------- src/common/include.am | 62 ---------------------------- src/common/util.h | 52 ----------------------- src/include.am | 2 +- src/{common => lib/container}/handles.h | 0 src/lib/container/include.am | 1 + src/lib/evloop/.may_include | 15 +++++++ src/{common => lib/evloop}/compat_libevent.c | 2 +- src/{common => lib/evloop}/compat_libevent.h | 0 src/lib/evloop/include.am | 26 ++++++++++++ src/{common => lib/evloop}/procmon.c | 2 +- src/{common => lib/evloop}/procmon.h | 2 +- src/{common => lib/evloop}/timers.c | 4 +- src/{common => lib/evloop}/timers.h | 0 src/{common => lib/evloop}/token_bucket.c | 2 +- src/{common => lib/evloop}/token_bucket.h | 0 src/{common => lib/evloop}/workqueue.c | 4 +- src/{common => lib/evloop}/workqueue.h | 0 src/lib/malloc/include.am | 4 ++ src/lib/net/include.am | 3 +- src/{common => lib/net}/socks5_status.h | 0 src/{common => or}/address_set.c | 2 +- src/{common => or}/address_set.h | 0 src/or/channel.c | 2 +- src/or/channel.h | 2 +- src/or/channelpadding.c | 2 +- src/or/config.c | 3 +- src/or/connection.c | 2 +- src/or/connection_edge.c | 2 +- src/or/conscache.h | 2 +- src/or/consdiffmgr.c | 4 +- src/or/control.c | 6 +-- src/or/cpuworker.c | 2 +- src/or/dirauth/shared_random.c | 1 - src/or/dns.c | 2 +- src/or/dnsserv.c | 2 +- src/or/entrynodes.h | 2 +- src/or/ext_orport.c | 1 - src/or/hibernate.c | 2 +- src/or/hs_cell.c | 1 - src/or/include.am | 2 + src/or/keypin.c | 25 ++++++++--- src/or/main.c | 4 +- src/or/nodelist.c | 2 +- src/or/ntmain.c | 2 +- src/or/onion_ntor.c | 11 +++-- src/or/or.h | 38 ++++++++++++++++- src/or/or_connection_st.h | 2 +- src/or/periodic.c | 4 +- src/or/reasons.h | 2 +- src/or/scheduler.c | 4 +- src/or/shared_random_client.c | 1 - src/or/torcert.c | 1 - src/or/transports.c | 1 - src/test/fuzz/fuzz_hsdescv3.c | 1 - src/test/include.am | 2 +- src/test/test-memwipe.c | 9 ++-- src/test/test-timers.c | 9 ++-- src/test/test_address_set.c | 2 +- src/test/test_bridges.c | 1 - src/test/test_bt_cl.c | 1 - src/test/test_bwmgt.c | 2 +- src/test/test_channelpadding.c | 4 +- src/test/test_checkdir.c | 1 - src/test/test_compat_libevent.c | 2 +- src/test/test_config.c | 1 - src/test/test_consdiffmgr.c | 2 +- src/test/test_crypto.c | 1 - src/test/test_crypto_openssl.c | 5 +-- src/test/test_entrynodes.c | 1 - src/test/test_guardfraction.c | 1 - src/test/test_handles.c | 7 ++-- src/test/test_hs_common.c | 1 - src/test/test_hs_ntor_cl.c | 1 - src/test/test_keypin.c | 1 - src/test/test_ntor_cl.c | 1 - src/test/test_oom.c | 2 +- src/test/test_procmon.c | 2 +- src/test/test_pt.c | 1 - src/test/test_routerkeys.c | 1 - src/test/test_scheduler.c | 2 +- src/test/test_socks.c | 2 +- src/test/test_util_slow.c | 8 +++- src/test/test_workqueue.c | 4 +- src/test/testing_common.c | 2 +- src/tools/tor-resolve.c | 2 +- 89 files changed, 195 insertions(+), 279 deletions(-)

1 0

[tor/master] Include compat_string.h in smartlist.c
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 3d610363eff2fe70d3775a66a97f844956480141 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 13:53:17 2018 -0400 Include compat_string.h in smartlist.c We need this for strcasecmp on (some) Windows build environments. Fix from Gisle Vanem. --- src/lib/container/smartlist.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/container/smartlist.c b/src/lib/container/smartlist.c index 63c50e045..c3abbff51 100644 --- a/src/lib/container/smartlist.c +++ b/src/lib/container/smartlist.c @@ -21,6 +21,7 @@ #include "lib/defs/digest_sizes.h" #include "lib/ctime/di_ops.h" #include "lib/string/compat_ctype.h" +#include "lib/string/compat_string.h" #include "lib/string/util_string.h" #include "lib/string/printf.h"

1 0

[tor/master] Try to use stricmp variants that MSDN actually recommends
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit fecb8214d5e95ad605e8b0d431bc332e07f2ad3f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 13:51:48 2018 -0400 Try to use stricmp variants that MSDN actually recommends Per recommendation by Gisle Vanem --- src/lib/string/compat_string.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/string/compat_string.h b/src/lib/string/compat_string.h index 34490bce0..5879c28fc 100644 --- a/src/lib/string/compat_string.h +++ b/src/lib/string/compat_string.h @@ -18,13 +18,13 @@ #ifndef HAVE_STRNCASECMP static inline int strncasecmp(const char *a, const char *b, size_t n); static inline int strncasecmp(const char *a, const char *b, size_t n) { - return strncmpi(a,b); + return _strnicmp(a,b,n); } #endif #ifndef HAVE_STRCASECMP static inline int strcasecmp(const char *a, const char *b, size_t n); static inline int strcasecmp(const char *a, const char *b, size_t n) { - return strcmpi(a,b); + return _stricmp(a,b); } #endif #endif

1 0

[metrics-lib/master] Replace JAXB with Apache Commons Codec dependency.
by karsten＠torproject.org 05 Jul '18

05 Jul '18

commit d1f9a329a2e03662691b96d58dd209e145fe4835 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 4 17:29:19 2018 +0200 Replace JAXB with Apache Commons Codec dependency. The reason is that JAXB won't be part of standard Java 9 anymore, and the only reason why we used it was to get rid of Apache Commons Codec as dependency, three years ago. Now it makes sense to just go back to Apache Commons Codec in preparation of upgrading to Java 9. Partially reverts 1734d16. Fixes #25444. --- CHANGELOG.md | 9 +++++++++ build.xml | 1 + .../org/torproject/descriptor/impl/DescriptorImpl.java | 9 +++++---- .../org/torproject/descriptor/impl/ParseHelper.java | 18 ++++++++---------- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39257fe..0e9ad5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Changes in version 2.5.0 - 2018-??-?? + + * Medium changes + - Go back to using Apache Commons Codec as base64 and hexadecimal + codec rather than using JAXB which won't be available anymore + after upgrading from Java 8 to 9. Applications must provide + Apache Commons Codec 1.10 as dependency. + + # Changes in version 2.4.0 - 2018-05-23 * Medium changes diff --git a/build.xml b/build.xml index 3c4bf28..f84c507 100644 --- a/build.xml +++ b/build.xml @@ -14,6 +14,7 @@ <property name="jarpatternprop" value="empty" /> <patternset id="runtime" > + <include name="commons-codec-1.10.jar"/> <include name="commons-compress-1.13.jar"/> <include name="jackson-annotations-2.8.6.jar"/> <include name="jackson-core-2.8.6.jar"/> diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java index 918fef8..a6acee7 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java @@ -6,6 +6,9 @@ package org.torproject.descriptor.impl; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorParseException; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.codec.binary.Hex; + import java.io.ByteArrayInputStream; import java.io.File; import java.io.InputStreamReader; @@ -19,8 +22,6 @@ import java.util.Map; import java.util.Scanner; import java.util.Set; -import javax.xml.bind.DatatypeConverter; - public abstract class DescriptorImpl implements Descriptor { public static final String NL = "\n"; @@ -383,7 +384,7 @@ public abstract class DescriptorImpl implements Descriptor { end = ascii.indexOf(endToken) + endToken.length(); } if (start >= 0 && end >= 0 && end > start) { - this.digestSha1Hex = DatatypeConverter.printHexBinary( + this.digestSha1Hex = Hex.encodeHexString( messageDigest("SHA-1", start, end)).toLowerCase(); } } @@ -426,7 +427,7 @@ public abstract class DescriptorImpl implements Descriptor { end = ascii.indexOf(endToken) + endToken.length(); } if (start >= 0 && end >= 0 && end > start) { - this.digestSha256Base64 = DatatypeConverter.printBase64Binary( + this.digestSha256Base64 = Base64.encodeBase64String( messageDigest("SHA-256", start, end)).replaceAll("=", ""); } } diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index d0c83f0..49a3430 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -5,6 +5,9 @@ package org.torproject.descriptor.impl; import org.torproject.descriptor.DescriptorParseException; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.codec.binary.Hex; + import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -19,8 +22,6 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.regex.Pattern; -import javax.xml.bind.DatatypeConverter; - /** * Parse helper for descriptor contents. * @@ -302,8 +303,7 @@ public class ParseHelper { + "' in line '" + line + "' is not a valid base64-encoded " + "20-byte value."); } - return DatatypeConverter.printHexBinary( - DatatypeConverter.parseBase64Binary(base64String + "=")) + return Hex.encodeHexString(Base64.decodeBase64(base64String + "=")) .toUpperCase(); } @@ -322,8 +322,7 @@ public class ParseHelper { + "' in line '" + line + "' is not a valid base64-encoded " + "32-byte value."); } - return DatatypeConverter.printHexBinary( - DatatypeConverter.parseBase64Binary(base64String + "=")) + return Hex.encodeHexString(Base64.decodeBase64(base64String + "=")) .toUpperCase(); } @@ -457,8 +456,7 @@ public class ParseHelper { .substring(beginEd25519CertLine.length(), identityEd25519CryptoBlock.length() - endEd25519CertLine.length()).replaceAll("=", ""); - byte[] identityEd25519 = DatatypeConverter.parseBase64Binary( - identityEd25519Base64); + byte[] identityEd25519 = Base64.decodeBase64(identityEd25519Base64); if (identityEd25519.length < 40) { throw new DescriptorParseException("Invalid length of " + "identity-ed25519 (in bytes): " + identityEd25519.length); @@ -494,8 +492,8 @@ public class ParseHelper { byte[] masterKeyEd25519 = new byte[32]; System.arraycopy(identityEd25519, extensionStart + 4, masterKeyEd25519, 0, masterKeyEd25519.length); - String masterKeyEd25519Base64 = DatatypeConverter - .printBase64Binary(masterKeyEd25519).replaceAll("=", ""); + String masterKeyEd25519Base64 + = Base64.encodeBase64String(masterKeyEd25519).replaceAll("=", ""); String masterKeyEd25519Base64NoTrailingEqualSigns = masterKeyEd25519Base64.replaceAll("=", ""); return masterKeyEd25519Base64NoTrailingEqualSigns;

1 0