[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge branch 'ticket32487_squashed' into ticket32487_squashed_and_merged
commit 3c89622e39d964b731a40c6a705327d5caa07be4
Merge: 5e70c27e8 efb301c86
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Thu Jan 16 07:57:37 2020 -0500
Merge branch 'ticket32487_squashed' into ticket32487_squashed_and_merged
Resolved conflicts in src/core/include.am
changes/feature32487 | 3 +
configure.ac | 10 +-
doc/HACKING/Module.md | 12 ++-
src/app/config/config.c | 13 ++-
src/core/include.am | 2 +-
src/core/mainloop/connection.c | 6 +-
src/core/mainloop/mainloop.c | 8 +-
src/feature/control/control_getinfo.c | 83 ++++++++++++++-
src/feature/dircache/dircache_stub.c | 78 ++++++++++++++
src/feature/dircache/dirserv.c | 175 ++++++--------------------------
src/feature/dircache/dirserv.h | 39 +++++--
src/feature/dircache/include.am | 8 +-
src/feature/dirclient/dirclient.c | 23 ++---
src/feature/dirclient/dirclient.h | 2 -
src/feature/dirclient/dirclient_modes.c | 95 +++++++++++++++++
src/feature/dirclient/dirclient_modes.h | 24 +++++
src/feature/dirclient/include.am | 2 +
src/feature/dircommon/directory.c | 31 ------
src/feature/dircommon/directory.h | 6 --
src/feature/nodelist/microdesc.c | 3 +-
src/feature/nodelist/networkstatus.c | 7 +-
src/feature/nodelist/node_select.c | 5 +-
src/feature/nodelist/nodelist.c | 4 +-
src/feature/nodelist/routerlist.c | 7 +-
src/test/test_config.c | 27 ++---
25 files changed, 422 insertions(+), 251 deletions(-)
diff --cc src/core/include.am
index 41347ed64,f332b3758..7752a7974
--- a/src/core/include.am
+++ b/src/core/include.am
@@@ -7,7 -172,59 +7,6 @@@
#
LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES)
-# The Relay module.
-MODULE_RELAY_SOURCES = \
- src/feature/relay/routermode.c \
- src/feature/relay/relay_config.c \
- src/feature/relay/relay_periodic.c \
- src/feature/relay/relay_sys.c \
- src/feature/relay/transport_config.c
-
-# The Directory Cache module.
-MODULE_DIRCACHE_SOURCES = \
- src/feature/dircache/conscache.c \
- src/feature/dircache/consdiffmgr.c \
- src/feature/dircache/dircache.c \
- src/feature/dircache/dirserv.c
-
-# The Directory Authority module.
-MODULE_DIRAUTH_SOURCES = \
- src/feature/dirauth/authmode.c \
- src/feature/dirauth/bridgeauth.c \
- src/feature/dirauth/bwauth.c \
- src/feature/dirauth/dirauth_config.c \
- src/feature/dirauth/dirauth_periodic.c \
- src/feature/dirauth/dirauth_sys.c \
- src/feature/dirauth/dircollate.c \
- src/feature/dirauth/dirvote.c \
- src/feature/dirauth/dsigs_parse.c \
- src/feature/dirauth/guardfraction.c \
- src/feature/dirauth/keypin.c \
- src/feature/dirauth/process_descs.c \
- src/feature/dirauth/reachability.c \
- src/feature/dirauth/recommend_pkg.c \
- src/feature/dirauth/shared_random.c \
- src/feature/dirauth/shared_random_state.c \
- src/feature/dirauth/voteflags.c
-
-if BUILD_MODULE_RELAY
-LIBTOR_APP_A_SOURCES += $(MODULE_RELAY_SOURCES)
-else
-LIBTOR_APP_A_STUB_SOURCES += src/feature/relay/relay_stub.c
-endif
-
-if BUILD_MODULE_DIRCACHE
-LIBTOR_APP_A_SOURCES += $(MODULE_DIRCACHE_SOURCES)
-else
-LIBTOR_APP_A_STUB_SOURCES += src/feature/dircache/dircache_stub.c
-endif
-
-if BUILD_MODULE_DIRAUTH
-LIBTOR_APP_A_SOURCES += $(MODULE_DIRAUTH_SOURCES)
-else
-LIBTOR_APP_A_STUB_SOURCES += src/feature/dirauth/dirauth_stub.c
-endif
--
src_core_libtor_app_a_SOURCES = \
$(LIBTOR_APP_A_SOURCES) \
$(LIBTOR_APP_A_STUB_SOURCES)
diff --cc src/feature/dircache/include.am
index 3ff54ad64,000000000..ab162565f
mode 100644,000000..100644
--- a/src/feature/dircache/include.am
+++ b/src/feature/dircache/include.am
@@@ -1,15 -1,0 +1,21 @@@
+
+# ADD_C_FILE: INSERT SOURCES HERE.
- LIBTOR_APP_A_SOURCES += \
++MODULE_DIRCACHE_SOURCES = \
+ src/feature/dircache/conscache.c \
+ src/feature/dircache/consdiffmgr.c \
+ src/feature/dircache/dircache.c \
+ src/feature/dircache/dirserv.c
+
+# ADD_C_FILE: INSERT HEADERS HERE.
+noinst_HEADERS += \
+ src/feature/dircache/cached_dir_st.h \
+ src/feature/dircache/conscache.h \
+ src/feature/dircache/consdiffmgr.h \
+ src/feature/dircache/dircache.h \
+ src/feature/dircache/dirserv.h
++
++if BUILD_MODULE_DIRCACHE
++LIBTOR_APP_A_SOURCES += $(MODULE_DIRCACHE_SOURCES)
++else
++LIBTOR_APP_A_STUB_SOURCES += src/feature/dircache/dircache_stub.c
++endif
diff --cc src/feature/dirclient/include.am
index 7e7259bc5,000000000..24cae9eed
mode 100644,000000..100644
--- a/src/feature/dirclient/include.am
+++ b/src/feature/dirclient/include.am
@@@ -1,12 -1,0 +1,14 @@@
+
+# ADD_C_FILE: INSERT SOURCES HERE.
+LIBTOR_APP_A_SOURCES += \
+ src/feature/dirclient/dirclient.c \
++ src/feature/dirclient/dirclient_modes.c \
+ src/feature/dirclient/dlstatus.c
+
+# ADD_C_FILE: INSERT HEADERS HERE.
+noinst_HEADERS += \
+ src/feature/dirclient/dir_server_st.h \
+ src/feature/dirclient/dirclient.h \
++ src/feature/dirclient/dirclient_modes.h \
+ src/feature/dirclient/dlstatus.h \
+ src/feature/dirclient/download_status_st.h
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits