Commit 92d8284a authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'log_dependencies'

parents b4e23dba 1b93b065

.gitignore

+16 −0
Original line number Diff line number Diff line
@@ -165,15 +165,31 @@ uptime-*.json 
/src/lib/libcurve25519_donna.a

/src/lib/libtor-compress.a

/src/lib/libtor-compress-testing.a

/src/lib/libtor-container.a

/src/lib/libtor-container-testing.a

/src/lib/libtor-crypt-ops.a

/src/lib/libtor-crypt-ops-testing.a

/src/lib/libtor-ctime.a

/src/lib/libtor-ctime-testing.a

/src/lib/libtor-err.a

/src/lib/libtor-err-testing.a

/src/lib/libtor-fdio.a

/src/lib/libtor-fdio-testing.a

/src/lib/libtor-intmath.a

/src/lib/libtor-intmath-testing.a

/src/lib/libtor-lock.a

/src/lib/libtor-lock-testing.a

/src/lib/libtor-log.a

/src/lib/libtor-log-testing.a

/src/lib/libtor-malloc.a

/src/lib/libtor-malloc-testing.a

/src/lib/libtor-string.a

/src/lib/libtor-string-testing.a

/src/lib/libtor-tls.a

/src/lib/libtor-tls-testing.a

/src/lib/libtor-trace.a

/src/lib/libtor-wallclock.a

/src/lib/libtor-wallclock-testing.a



# /src/or/

/src/or/Makefile

Makefile.am

+16 −0
Original line number Diff line number Diff line
@@ -40,14 +40,30 @@ endif 
# "Common" libraries used to link tor's utility code.

TOR_UTIL_LIBS = \

	src/common/libor.a \

        src/lib/libtor-log.a \

        src/lib/libtor-lock.a \

        src/lib/libtor-fdio.a \

	src/lib/libtor-container.a \

        src/lib/libtor-string.a \

	src/lib/libtor-malloc.a \

        src/lib/libtor-wallclock.a \

        src/lib/libtor-err.a \

        src/lib/libtor-intmath.a \

	src/lib/libtor-ctime.a



# 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-log-testing.a \

        src/lib/libtor-lock-testing.a \

        src/lib/libtor-fdio-testing.a \

	src/lib/libtor-container-testing.a \

        src/lib/libtor-string-testing.a \

	src/lib/libtor-malloc-testing.a \

        src/lib/libtor-wallclock-testing.a \

        src/lib/libtor-err-testing.a \

        src/lib/libtor-intmath.a \

        src/lib/libtor-ctime-testing.a



# Internal crypto libraries used in Tor

scripts/maint/checkIncludes.py

+12 −3
Original line number Diff line number Diff line
@@ -58,9 +58,18 @@ def load_include_rules(fname): 
            result.addPattern(line)

    return result



MDD = "--mdd" in sys.argv[1:]



if MDD:

    print(



for dirpath, dirnames, fnames in os.walk("src"):

    if ".may_include" in fnames:

        rules = load_include_rules(os.path.join(dirpath, RULES_FNAME))

        if MDD:

            dp = dirpath.replace("src/","")

            rules.dump_mdd(dp)

        else:

            for fname in fnames:

                if fname_is_c(fname):

                    rules.applyToFile(os.path.join(dirpath,fname))

src/common/.may_include

+0 −3
Original line number Diff line number Diff line
@@ -5,10 +5,7 @@ lib/*/*.h 
# XXXX These all belong somewhere else

ht.h

linux_syscalls.inc

micro-revision.i

siphash.h

src/ext/timeouts/timeout.c

strlcat.c

strlcpy.c

tor_queue.h

tor_readpassphrase.h

src/common/address.c

+3 −3
Original line number Diff line number Diff line
@@ -39,9 +39,10 @@ 
#include "common/util.h"

#include "common/util_format.h"

#include "common/address.h"

#include "common/torlog.h"

#include "common/container.h"

#include "lib/log/torlog.h"

#include "lib/container/smartlist.h"

#include "common/sandbox.h"

#include "siphash.h"



#ifdef HAVE_SYS_TIME_H

#include <sys/time.h>
@@ -2169,4 +2170,3 @@ tor_addr_port_eq(const tor_addr_port_t *a, 
{

  return tor_addr_eq(&a->addr, &b->addr) && a->port == b->port;

}