[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge branch 'net_refactor'
commit b9b05e437d09c4d06b554d0484c7ae1a3aa1d647
Merge: 300e3bebd d893be190
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Wed Jun 27 12:52:31 2018 -0400
Merge branch 'net_refactor'
.gitignore | 2 +
Makefile.am | 2 +
changes/iphplapi | 4 +
src/common/address_set.c | 2 +-
src/common/compat.c | 871 +-------------------------------------
src/common/compat.h | 186 +-------
src/common/include.am | 2 -
src/common/sandbox.c | 179 +-------
src/common/sandbox.h | 24 --
src/common/util.c | 240 +----------
src/common/util.h | 15 +-
src/include.am | 1 +
src/lib/log/escape.c | 132 ++++++
src/lib/log/escape.h | 18 +
src/lib/log/include.am | 2 +
src/lib/net/.may_include | 13 +
src/{common => lib/net}/address.c | 65 +--
src/{common => lib/net}/address.h | 21 +-
src/lib/net/include.am | 26 ++
src/lib/net/ipv4.c | 52 +++
src/lib/net/ipv4.h | 17 +
src/lib/net/ipv6.c | 221 ++++++++++
src/lib/net/ipv6.h | 86 ++++
src/lib/net/nettypes.h | 39 ++
src/lib/net/resolve.c | 236 +++++++++++
src/lib/net/resolve.h | 50 +++
src/lib/net/socket.c | 649 ++++++++++++++++++++++++++++
src/lib/net/socket.h | 113 +++++
src/lib/string/include.am | 2 +
src/lib/string/parse_int.c | 126 ++++++
src/lib/string/parse_int.h | 20 +
src/or/hs_descriptor.h | 2 +-
src/or/include.am | 5 +-
src/or/nodelist.c | 2 +-
src/or/or.h | 2 +-
src/rust/build.rs | 1 +
src/test/fuzz/include.am | 2 +-
src/test/include.am | 16 +-
src/test/test_address.c | 2 +-
src/test/test_bridges.c | 2 +-
src/test/test_channeltls.c | 2 +-
src/test/test_config.c | 2 +-
src/test/test_util.c | 22 +-
src/tools/include.am | 6 +-
src/tools/tor-gencert.c | 2 +-
src/tools/tor-resolve.c | 2 +-
46 files changed, 1887 insertions(+), 1599 deletions(-)
diff --cc .gitignore
index 34f845442,d6f56f525..390859f5e
--- a/.gitignore
+++ b/.gitignore
@@@ -183,10 -183,10 +183,12 @@@ uptime-*.jso
/src/lib/libtor-log-testing.a
/src/lib/libtor-malloc.a
/src/lib/libtor-malloc-testing.a
+ /src/lib/libtor-net.a
+ /src/lib/libtor-net-testing.a
/src/lib/libtor-string.a
/src/lib/libtor-string-testing.a
+/src/lib/libtor-smartlist-core.a
+/src/lib/libtor-smartlist-core-testing.a
/src/lib/libtor-tls.a
/src/lib/libtor-tls-testing.a
/src/lib/libtor-trace.a
diff --cc Makefile.am
index 482189eeb,d80f81de1..c151d441c
--- a/Makefile.am
+++ b/Makefile.am
@@@ -40,7 -40,7 +40,8 @@@ endi
# "Common" libraries used to link tor's utility code.
TOR_UTIL_LIBS = \
src/common/libor.a \
+ src/lib/libtor-container.a \
+ src/lib/libtor-net.a \
src/lib/libtor-log.a \
src/lib/libtor-lock.a \
src/lib/libtor-fdio.a \
@@@ -56,7 -56,7 +57,8 @@@
# and tests)
TOR_UTIL_TESTING_LIBS = \
src/common/libor-testing.a \
+ src/lib/libtor-container-testing.a \
+ src/lib/libtor-net-testing.a \
src/lib/libtor-log-testing.a \
src/lib/libtor-lock-testing.a \
src/lib/libtor-fdio-testing.a \
diff --cc src/include.am
index 9e89fc8e0,5b8aacdd5..b6ef3cf16
--- a/src/include.am
+++ b/src/include.am
@@@ -12,8 -12,8 +12,9 @@@ include src/lib/intmath/include.a
include src/lib/lock/include.am
include src/lib/log/include.am
include src/lib/malloc/include.am
+ include src/lib/net/include.am
include src/lib/string/include.am
+include src/lib/smartlist_core/include.am
include src/lib/testsupport/include.am
include src/lib/tls/include.am
include src/lib/trace/include.am
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits