From 999f7984e189250216fcd0bbbe1c4c8d1b0c380b Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 21 Jun 2018 14:02:11 -0400 Subject: New script to check includes for modularity violations Includes configuration files to enforce these rules on lib and common. Of course, "common" *is* a modularity violation right now, so these rules aren't as strict as I would like them to be. --- src/lib/cc/.may_include | 1 + src/lib/compress/.may_include | 6 ++++++ src/lib/crypt_ops/.may_include | 14 ++++++++++++++ src/lib/ctime/.may_include | 6 ++++++ src/lib/err/.may_include | 3 +++ src/lib/testsupport/.may_include | 0 src/lib/tls/.may_include | 11 +++++++++++ src/lib/tls/buffers_tls.c | 2 -- src/lib/trace/.may_include | 5 +++++ 9 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 src/lib/cc/.may_include create mode 100644 src/lib/compress/.may_include create mode 100644 src/lib/crypt_ops/.may_include create mode 100644 src/lib/ctime/.may_include create mode 100644 src/lib/err/.may_include create mode 100644 src/lib/testsupport/.may_include create mode 100644 src/lib/tls/.may_include create mode 100644 src/lib/trace/.may_include (limited to 'src/lib') diff --git a/src/lib/cc/.may_include b/src/lib/cc/.may_include new file mode 100644 index 0000000000..2b06e8519c --- /dev/null +++ b/src/lib/cc/.may_include @@ -0,0 +1 @@ +orconfig.h diff --git a/src/lib/compress/.may_include b/src/lib/compress/.may_include new file mode 100644 index 0000000000..70528a7df0 --- /dev/null +++ b/src/lib/compress/.may_include @@ -0,0 +1,6 @@ +orconfig.h +lib/cc/*.h +lib/compress/*.h + +# XXX I'd like to remove this. +common/*.h diff --git a/src/lib/crypt_ops/.may_include b/src/lib/crypt_ops/.may_include new file mode 100644 index 0000000000..6eefec1581 --- /dev/null +++ b/src/lib/crypt_ops/.may_include @@ -0,0 +1,14 @@ +orconfig.h +lib/cc/*.h +lib/crypt_ops/*.h +lib/ctime/*.h +lib/err/*.h +lib/testsupport/testsupport.h + +trunnel/pwbox.h + +keccak-tiny/*.h +ed25519/*.h + +# XXX I'd like to remove this. +common/*.h diff --git a/src/lib/ctime/.may_include b/src/lib/ctime/.may_include new file mode 100644 index 0000000000..72d854c374 --- /dev/null +++ b/src/lib/ctime/.may_include @@ -0,0 +1,6 @@ +orconfig.h +lib/cc/*.h +lib/ctime/*.h + +# XXXX I'd like to remove this +common/util.h diff --git a/src/lib/err/.may_include b/src/lib/err/.may_include new file mode 100644 index 0000000000..48cc0ef088 --- /dev/null +++ b/src/lib/err/.may_include @@ -0,0 +1,3 @@ +orconfig.h +lib/cc/*.h +lib/err/*.h diff --git a/src/lib/testsupport/.may_include b/src/lib/testsupport/.may_include new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/lib/tls/.may_include b/src/lib/tls/.may_include new file mode 100644 index 0000000000..22792b6bfc --- /dev/null +++ b/src/lib/tls/.may_include @@ -0,0 +1,11 @@ +orconfig.h +lib/cc/*.h +lib/crypt_ops/*.h +lib/err/*.h +lib/testsupport/testsupport.h +lib/tls/*.h + +ciphers.inc + +# XXX I'd like to remove this. +common/*.h diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c index 5accb2d91a..55c3ac334b 100644 --- a/src/lib/tls/buffers_tls.c +++ b/src/lib/tls/buffers_tls.c @@ -10,7 +10,6 @@ #include "common/buffers.h" #include "lib/tls/buffers_tls.h" #include "common/compat.h" -#include "lib/compress/compress.h" #include "common/util.h" #include "lib/cc/torint.h" #include "common/torlog.h" @@ -176,4 +175,3 @@ buf_flush_to_tls(buf_t *buf, tor_tls_t *tls, size_t flushlen, tor_assert(flushed < INT_MAX); return (int)flushed; } - diff --git a/src/lib/trace/.may_include b/src/lib/trace/.may_include new file mode 100644 index 0000000000..694c8405ec --- /dev/null +++ b/src/lib/trace/.may_include @@ -0,0 +1,5 @@ +orconfig.h +lib/trace/*.h + +# XXXX +common/torlog.h -- cgit v1.2.3-54-g00ecf