nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

mod: Move dirauth specific files to its own module

Browse Source 
This is a pretty big commit but it only moves these files to src/or/dirauth:

  dircollate.c dirvote.c shared_random.c shared_random_state.c
  dircollate.h dirvote.h shared_random.h shared_random_state.h

Then many files are modified to change the include line for those header files
that have moved into a new directory.

Without using --disable-module-dirauth, everything builds fine. When using the
flag to disable the module, tor doesn't build due to linking errors. This will
be addressed in the next commit(s).

No code behavior change.

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2018-04-05 14:27:30 -04:00
parent 35d86b088d
commit 2115a54b4a
28 changed files with 51 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/config.c
View File

@ -79,7 +79,6 @@
#include "confparse.h"
#include "cpuworker.h"
#include "dirserv.h"
#include "dirvote.h"
#include "dns.h"
#include "dos.h"
#include "entrynodes.h"
@ -110,6 +109,8 @@
#include "procmon.h"
#include "dirauth/dirvote.h"
#ifdef HAVE_SYSTEMD
# if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__)
/* Systemd's use of gcc's __INCLUDE_LEVEL__ extension macro appears to confuse

2
src/or/control.c
View File

@ -76,7 +76,7 @@
#include "router.h"
#include "routerlist.h"
#include "routerparse.h"
#include "shared_random.h"
#include "dirauth/shared_random.h"
#ifndef _WIN32
#include <pwd.h>

0
src/or/dircollate.c → src/or/dirauth/dircollate.c
View File

0
src/or/dircollate.h → src/or/dirauth/dircollate.h
View File

0
src/or/dirvote.c → src/or/dirauth/dirvote.c
View File

0
src/or/dirvote.h → src/or/dirauth/dirvote.h
View File

3
src/or/shared_random.c → src/or/dirauth/shared_random.c
View File

@ -91,7 +91,6 @@
#include "shared_random.h"
#include "config.h"
#include "confparse.h"
#include "dirvote.h"
#include "networkstatus.h"
#include "routerkeys.h"
#include "router.h"
@ -99,6 +98,8 @@
#include "shared_random_state.h"
#include "util.h"
#include "dirauth/dirvote.h"
/* String prefix of shared random values in votes/consensuses. */
static const char previous_srv_str[] = "shared-rand-previous-value";
static const char current_srv_str[] = "shared-rand-current-value";

0
src/or/shared_random.h → src/or/dirauth/shared_random.h
View File

3
src/or/shared_random_state.c → src/or/dirauth/shared_random_state.c
View File

@ -14,11 +14,12 @@
#include "shared_random.h"
#include "config.h"
#include "confparse.h"
#include "dirvote.h"
#include "networkstatus.h"
#include "router.h"
#include "shared_random_state.h"
#include "dirauth/dirvote.h"
/* Default filename of the shared random state on disk. */
static const char default_fname[] = "sr-state";

0
src/or/shared_random_state.h → src/or/dirauth/shared_random_state.h
View File

5
src/or/directory.c
View File

@ -20,7 +20,6 @@
#include "compat.h"
#include "directory.h"
#include "dirserv.h"
#include "dirvote.h"
#include "entrynodes.h"
#include "geoip.h"
#include "hs_cache.h"
@ -41,7 +40,7 @@
#include "routerlist.h"
#include "routerparse.h"
#include "routerset.h"
#include "shared_random.h"
#include "dirauth/shared_random.h"
#if defined(EXPORTMALLINFO) && defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
#if !defined(OpenBSD)
@ -49,6 +48,8 @@
#endif
#endif
#include "dirauth/dirvote.h"
/**
* \file directory.c
* \brief Code to send and fetch information from directory authorities and

3
src/or/dirserv.c
View File

@ -18,7 +18,6 @@
#include "control.h"
#include "directory.h"
#include "dirserv.h"
#include "dirvote.h"
#include "hibernate.h"
#include "keypin.h"
#include "main.h"
@ -34,6 +33,8 @@
#include "routerset.h"
#include "torcert.h"
#include "dirauth/dirvote.h"
/**
* \file dirserv.c
* \brief Directory server core implementation. Manages directory

4
src/or/hs_common.c
View File

@ -28,8 +28,8 @@
#include "rendservice.h"
#include "routerset.h"
#include "router.h"
#include "shared_random.h"
#include "shared_random_state.h"
#include "dirauth/shared_random.h"
#include "dirauth/shared_random_state.h"
/* Trunnel */
#include "ed25519_cert.h"

2
src/or/hs_service.c
View File

@ -24,7 +24,7 @@
#include "router.h"
#include "routerkeys.h"
#include "routerlist.h"
#include "shared_random_state.h"
#include "dirauth/shared_random_state.h"
#include "statefile.h"
#include "hs_circuit.h"

20
src/or/include.am
View File

@ -41,10 +41,8 @@ LIBTOR_A_SOURCES = \
src/or/consdiffmgr.c \
src/or/control.c \
src/or/cpuworker.c \
src/or/dircollate.c \
src/or/directory.c \
src/or/dirserv.c \
src/or/dirvote.c \
src/or/dns.c \
src/or/dnsserv.c \
src/or/dos.c \
@ -76,8 +74,6 @@ LIBTOR_A_SOURCES = \
src/or/onion.c \
src/or/onion_fast.c \
src/or/onion_tap.c \
src/or/shared_random.c \
src/or/shared_random_state.c \
src/or/transports.c \
src/or/parsecommon.c \
src/or/periodic.c \
@ -121,7 +117,11 @@ LIBTOR_A_SOURCES = \
# The Directory Authority module.
if BUILD_MODULE_DIRAUTH
#LIBTOR_A_SOURCES +=
LIBTOR_A_SOURCES += \
src/or/dirauth/dircollate.c \
src/or/dirauth/dirvote.c \
src/or/dirauth/shared_random.c \
src/or/dirauth/shared_random_state.c
endif
src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)
@ -195,10 +195,8 @@ ORHEADERS = \
src/or/consdiffmgr.h \
src/or/control.h \
src/or/cpuworker.h \
src/or/dircollate.h \
src/or/directory.h \
src/or/dirserv.h \
src/or/dirvote.h \
src/or/dns.h \
src/or/dns_structs.h \
src/or/dnsserv.h \
@ -235,8 +233,6 @@ ORHEADERS = \
src/or/onion_ntor.h \
src/or/onion_tap.h \
src/or/or.h \
src/or/shared_random.h \
src/or/shared_random_state.h \
src/or/transports.h \
src/or/parsecommon.h \
src/or/periodic.h \
@ -273,7 +269,11 @@ ORHEADERS = \
# properly compiled the entry points stub.
# The Directory Authority module headers.
#ORHEADERS +=
ORHEADERS += \
src/or/dirauth/dircollate.h \
src/or/dirauth/dirvote.h \
src/or/dirauth/shared_random.h \
src/or/dirauth/shared_random_state.h
# This may someday want to be an installed file?
noinst_HEADERS += src/or/tor_api.h

5
src/or/main.c
View File

@ -72,7 +72,6 @@
#include "crypto_s2k.h"
#include "directory.h"
#include "dirserv.h"
#include "dirvote.h"
#include "dns.h"
#include "dnsserv.h"
#include "dos.h"
@ -103,7 +102,7 @@
#include "routerlist.h"
#include "routerparse.h"
#include "scheduler.h"
#include "shared_random.h"
#include "dirauth/shared_random.h"
#include "statefile.h"
#include "status.h"
#include "tor_api.h"
@ -118,6 +117,8 @@
#include <event2/event.h>
#include "dirauth/dirvote.h"
#ifdef HAVE_SYSTEMD
# if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__)
/* Systemd's use of gcc's __INCLUDE_LEVEL__ extension macro appears to confuse

5
src/or/networkstatus.c
View File

@ -50,7 +50,6 @@
#include "control.h"
#include "directory.h"
#include "dirserv.h"
#include "dirvote.h"
#include "dos.h"
#include "entrynodes.h"
#include "hibernate.h"
@ -64,11 +63,13 @@
#include "routerlist.h"
#include "routerparse.h"
#include "scheduler.h"
#include "shared_random.h"
#include "dirauth/shared_random.h"
#include "transports.h"
#include "torcert.h"
#include "channelpadding.h"
#include "dirauth/dirvote.h"
/** Most recently received and validated v3 "ns"-flavored consensus network
* status. */
STATIC networkstatus_t *current_ns_consensus = NULL;

3
src/or/routerlist.c
View File

@ -101,7 +101,6 @@
#include "control.h"
#include "directory.h"
#include "dirserv.h"
#include "dirvote.h"
#include "entrynodes.h"
#include "fp_pair.h"
#include "geoip.h"
@ -122,6 +121,8 @@
#include "sandbox.h"
#include "torcert.h"
#include "dirauth/dirvote.h"
// #define DEBUG_ROUTERLIST
/****************************************************************************/

5
src/or/routerparse.c
View File

@ -59,7 +59,6 @@
#include "config.h"
#include "circuitstats.h"
#include "dirserv.h"
#include "dirvote.h"
#include "parsecommon.h"
#include "policies.h"
#include "protover.h"
@ -75,11 +74,13 @@
#include "entrynodes.h"
#include "torcert.h"
#include "sandbox.h"
#include "shared_random.h"
#include "dirauth/shared_random.h"
#undef log
#include <math.h>
#include "dirauth/dirvote.h"
/****************************************************************************/
/** List of tokens recognized in router descriptors */

2
src/test/test_config.c
View File

@ -24,7 +24,7 @@
#include "control.h"
#include "cpuworker.h"
#include "dirserv.h"
#include "dirvote.h"
#include "dirauth/dirvote.h"
#include "dns.h"
#include "entrynodes.h"
#include "transports.h"

4
src/test/test_dir.c
View File

@ -25,7 +25,7 @@
#include "crypto_ed25519.h"
#include "directory.h"
#include "dirserv.h"
#include "dirvote.h"
#include "dirauth/dirvote.h"
#include "entrynodes.h"
#include "hibernate.h"
#include "memarea.h"
@ -35,7 +35,7 @@
#include "routerlist.h"
#include "routerparse.h"
#include "routerset.h"
#include "shared_random_state.h"
#include "dirauth/shared_random_state.h"
#include "test.h"
#include "test_dir_common.h"
#include "torcert.h"

2
src/test/test_dir_common.c
View File

@ -9,7 +9,7 @@
#include "test.h"
#include "container.h"
#include "or.h"
#include "dirvote.h"
#include "dirauth/dirvote.h"
#include "nodelist.h"
#include "routerlist.h"
#include "test_dir_common.h"

2
src/test/test_dir_handle_get.c
View File

@ -30,7 +30,7 @@
#include "proto_http.h"
#include "geoip.h"
#include "dirserv.h"
#include "dirvote.h"
#include "dirauth/dirvote.h"
#include "log_test_helpers.h"
#ifdef _WIN32

4
src/test/test_hs_common.c
View File

@ -23,12 +23,12 @@
#include "config.h"
#include "networkstatus.h"
#include "directory.h"
#include "dirvote.h"
#include "dirauth/dirvote.h"
#include "nodelist.h"
#include "routerlist.h"
#include "statefile.h"
#include "circuitlist.h"
#include "shared_random.h"
#include "dirauth/shared_random.h"
#include "util.h"
/** Test the validation of HS v3 addresses */

4
src/test/test_hs_service.c
View File

@ -34,7 +34,7 @@
#include "circuitlist.h"
#include "circuituse.h"
#include "crypto.h"
#include "dirvote.h"
#include "dirauth/dirvote.h"
#include "networkstatus.h"
#include "nodelist.h"
#include "relay.h"
@ -51,7 +51,7 @@
#include "main.h"
#include "rendservice.h"
#include "statefile.h"
#include "shared_random_state.h"
#include "dirauth/shared_random_state.h"
/* Trunnel */
#include "hs/cell_establish_intro.h"

2
src/test/test_microdesc.c
View File

@ -6,7 +6,7 @@
#include "config.h"
#define DIRVOTE_PRIVATE
#include "dirvote.h"
#include "dirauth/dirvote.h"
#include "microdesc.h"
#include "networkstatus.h"
#include "routerlist.h"

4
src/test/test_routerlist.c
View File

@ -19,7 +19,7 @@
#include "container.h"
#include "control.h"
#include "directory.h"
#include "dirvote.h"
#include "dirauth/dirvote.h"
#include "entrynodes.h"
#include "hibernate.h"
#include "microdesc.h"
@ -30,7 +30,7 @@
#include "routerlist.h"
#include "routerset.h"
#include "routerparse.h"
#include "shared_random.h"
#include "dirauth/shared_random.h"
#include "statefile.h"
#include "test.h"
#include "test_dir_common.h"

6
src/test/test_shared_random.c
View File

@ -9,9 +9,9 @@
#include "or.h"
#include "test.h"
#include "config.h"
#include "dirvote.h"
#include "shared_random.h"
#include "shared_random_state.h"
#include "dirauth/dirvote.h"
#include "dirauth/shared_random.h"
#include "dirauth/shared_random_state.h"
#include "routerkeys.h"
#include "routerlist.h"
#include "router.h"