tor-commits

Download

tor-commits@lists.torproject.org

July 2018

17 participants
1737 discussions

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 06 Jul '18

06 Jul '18

commit daa39812e002dbecc27575c796738936c3dabea2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 6 12:47:20 2018 +0000 Update translations for torbutton-torbuttondtd --- ga/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ga/torbutton.dtd b/ga/torbutton.dtd index a6198d932..26c3f555b 100644 --- a/ga/torbutton.dtd +++ b/ga/torbutton.dtd @@ -47,5 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Tá roinnt clófhoirne agus siombailí matamaiticiúla díchumasaithe."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Tá roinnt clófhoirne, deilbhíní, siombailí matamaiticiúla, agus íomhánna díchumasaithe."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Caithfidh tú fuaimeanna agus físeáin (meáin HTML5) a chliceáil lena seinm."> -<!ENTITY torbutton.circuit_display.title "Tor Circuit"> -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> +<!ENTITY torbutton.circuit_display.title "Ciorcad Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "Ciorcad Nua don Suíomh seo">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 06 Jul '18

06 Jul '18

commit d9dec1a7d6578f8bb4dbe8a780510afd37ac8815 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 6 12:47:11 2018 +0000 Update translations for torbutton-torbuttonproperties --- ga/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ga/torbutton.properties b/ga/torbutton.properties index 7e3880d4d..a8e1578af 100644 --- a/ga/torbutton.properties +++ b/ga/torbutton.properties @@ -54,5 +54,5 @@ profileAccessDenied=Níl cead rochtana ag %S ar an bpróifíl. Athraigh na ceada profileMigrationFailed=Níorbh fhéidir an phróifíl %S atá agat a aistriú.\nÚsáidfear socruithe nua. # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) -pageInfo_OnionEncryption=Connection Encrypted (Onion Service) +pageInfo_OnionEncryptionWithBitsAndProtocol=Ceangal Criptithe (Seirbhís Onion, %1$S, eochracha %2$S giotán, %3$S) +pageInfo_OnionEncryption=Ceangal Criptithe (Seirbhís Onion)

1 0

[tor-browser-build/master] Fold in stable changelog
by gk＠torproject.org 06 Jul '18

06 Jul '18

commit 6d63b2ee1e3bfd0479ddc9abef9ae94eb097a668 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 6 12:37:02 2018 +0000 Fold in stable changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 516e81f..b8d30f1 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -86,6 +86,23 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 25540: Stop building and distributing sandboxed tor browser * Bug 25481: Rust support for tor-browser and tor +Tor Browser 7.5.6 -- June 26 2018 + * All platforms + * Update Firefox to 52.9.0esr + * Update Tor to 0.3.3.7 + * Update Tor Launcher to 0.2.14.5 + * Bug 20890: Increase control port connection timeout + * Update HTTPS Everywhere to 2018.6.21 + * Bug 26451: Prevent HTTPS Everywhere from freezing the browser + * Update NoScript to 5.1.8.6 + * Bug 21537: Mark .onion cookies as secure + * Bug 25938: Backport fix for cross-origin header leak (bug 1334776) + * Bug 25721: Backport patches from Mozilla's bug 1448771 + * Bug 25147+25458: Sanitize HTML fragments for chrome documents + * Bug 26221: Backport fix for leak in SHA256 in nsHttpConnectionInfo.cpp + * Windows + * Bug 26424: Disable UNC paths to prevent possible proxy bypasses + Tor Browser 8.0a8 -- June 10 2018 * All platforms * Update Firefox to 52.8.1esr

1 0

[metrics-web/master] Add graphs on circuit build times and latencies.
by karsten＠torproject.org 06 Jul '18

06 Jul '18

commit 2761d1f733989a5c5aa5d9a4af69ea9153bc4b8f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 3 17:38:15 2018 +0200 Add graphs on circuit build times and latencies. Implements #25774. --- src/main/R/rserver/graphs.R | 75 ++++++++++++++ .../torproject/metrics/stats/onionperf/Main.java | 112 ++++++++++++++++++--- src/main/resources/web.xml | 8 ++ src/main/resources/web/json/categories.json | 4 +- src/main/resources/web/json/metrics.json | 24 +++++ src/main/sql/onionperf/init-onionperf.sql | 68 +++++++++++++ 6 files changed, 275 insertions(+), 16 deletions(-) diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R index d5eeff5..56c8a55 100644 --- a/src/main/R/rserver/graphs.R +++ b/src/main/R/rserver/graphs.R @@ -721,6 +721,81 @@ write_torperf_failures <- function(start_p = NULL, end_p = NULL, write.csv(path_p, quote = FALSE, row.names = FALSE, na = "") } +prepare_onionperf_buildtimes <- function(start_p, end_p, source_p) { + read.csv(paste(stats_dir, "buildtimes.csv", sep = ""), + colClasses = c("date" = "Date")) %>% + filter(if (!is.null(start_p)) date >= as.Date(start_p) else TRUE) %>% + filter(if (!is.null(end_p)) date <= as.Date(end_p) else TRUE) %>% + filter(if (!is.null(source_p)) + source == ifelse(source_p == "all", "", source_p) else TRUE) +} + +write_onionperf_buildtimes <- function(start_p = NULL, end_p = NULL, + source_p = NULL, path_p) { + prepare_onionperf_buildtimes(start_p, end_p, source_p) %>% + write.csv(path_p, quote = FALSE, row.names = FALSE, na = "") +} + +plot_onionperf_buildtimes <- function(start_p, end_p, source_p, path_p) { + prepare_onionperf_buildtimes(start_p, end_p, source_p) %>% + mutate(date = as.Date(date), + position = factor(position, levels = seq(1, 3, 1), + labels = c("1st hop", "2nd hop", "3rd hop"))) %>% + ggplot(aes(x = date, y = md, colour = position, fill = position)) + + geom_line(size = 0.75) + + geom_ribbon(aes(x = as.Date(date), ymin = q1, ymax = q3, alpha = 0.5), + show.legend = FALSE) + + scale_x_date(name = "", breaks = custom_breaks, + labels = custom_labels, minor_breaks = custom_minor_breaks) + + scale_y_continuous(name = "", labels = unit_format(unit = "ms"), + limits = c(0, NA)) + + scale_colour_hue(name = "Medians and interquartile ranges") + + scale_fill_hue(name = "Medians and interquartile ranges") + + ggtitle(ifelse(source_p == "all", "Circuit build times on all sources", + paste("Circuit build times on", source_p))) + + labs(caption = copyright_notice) + + theme(legend.position = "top") + ggsave(filename = path_p, width = 8, height = 5, dpi = 150) +} + +prepare_onionperf_latencies <- function(start_p, end_p, source_p) { + read.csv(paste(stats_dir, "latencies.csv", sep = ""), + colClasses = c("date" = "Date")) %>% + filter(if (!is.null(start_p)) date >= as.Date(start_p) else TRUE) %>% + filter(if (!is.null(end_p)) date <= as.Date(end_p) else TRUE) %>% + filter(if (!is.null(source_p)) + source == ifelse(source_p == "all", "", source_p) else TRUE) +} + +write_onionperf_latencies <- function(start_p = NULL, end_p = NULL, + source_p = NULL, path_p) { + prepare_onionperf_latencies(start_p, end_p, source_p) %>% + write.csv(path_p, quote = FALSE, row.names = FALSE, na = "") +} + +plot_onionperf_latencies <- function(start_p, end_p, source_p, path_p) { + prepare_onionperf_latencies(start_p, end_p, source_p) %>% + mutate(date = as.Date(date), + server = factor(server, levels = c("public", "onion"), + labels = c("public server", "onion server"))) %>% + ggplot(aes(x = date, y = md, colour = server, fill = server)) + + geom_line(size = 0.75) + + geom_ribbon(aes(x = as.Date(date), ymin = q1, ymax = q3, alpha = 0.5), + show.legend = FALSE) + + scale_x_date(name = "", breaks = custom_breaks, + labels = custom_labels, minor_breaks = custom_minor_breaks) + + scale_y_continuous(name = "", labels = unit_format(unit = "ms"), + limits = c(0, NA)) + + scale_colour_hue(name = "Medians and interquartile ranges") + + scale_fill_hue(name = "Medians and interquartile ranges") + + ggtitle(ifelse(source_p == "all", + "Circuit round-trip latencies on all sources", + paste("Circuit round-trip latencies on", source_p))) + + labs(caption = copyright_notice) + + theme(legend.position = "top") + ggsave(filename = path_p, width = 8, height = 5, dpi = 150) +} + prepare_connbidirect <- function(start_p, end_p) { read.csv(paste(stats_dir, "connbidirect2.csv", sep = ""), colClasses = c("date" = "Date", "direction" = "factor")) %>% diff --git a/src/main/java/org/torproject/metrics/stats/onionperf/Main.java b/src/main/java/org/torproject/metrics/stats/onionperf/Main.java index 76c2809..5bd55ab 100644 --- a/src/main/java/org/torproject/metrics/stats/onionperf/Main.java +++ b/src/main/java/org/torproject/metrics/stats/onionperf/Main.java @@ -26,11 +26,11 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; +import java.util.HashSet; import java.util.List; import java.util.Locale; -import java.util.SortedSet; +import java.util.Set; import java.util.TimeZone; -import java.util.TreeSet; public class Main { @@ -43,8 +43,12 @@ public class Main { String dbUrlString = "jdbc:postgresql:onionperf"; Connection connection = connectToDatabase(dbUrlString); importOnionPerfFiles(connection); - SortedSet<String> statistics = queryOnionPerf(connection); - writeStatistics(Paths.get("stats", "torperf-1.1.csv"), statistics); + writeStatistics(Paths.get("stats", "torperf-1.1.csv"), + queryOnionPerf(connection)); + writeStatistics(Paths.get("stats", "buildtimes.csv"), + queryBuildTimes(connection)); + writeStatistics(Paths.get("stats", "latencies.csv"), + queryLatencies(connection)); disconnectFromDatabase(connection); log.info("Terminated onionperf module."); } @@ -77,6 +81,13 @@ public class Main { + "?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, " + "?, ?, ?, ?, ?, ?)", Statement.RETURN_GENERATED_KEYS); + PreparedStatement psBuildTimesSelect = connection.prepareStatement( + "SELECT position FROM buildtimes WHERE measurement_id = ?"); + + PreparedStatement psBuildTimesInsert = connection.prepareStatement( + "INSERT INTO buildtimes (measurement_id, position, buildtime, delta) " + + "VALUES (?, ?, ?, ?)"); + Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); DescriptorReader dr = DescriptorSourceFactory.createDescriptorReader(); for (Descriptor d : dr.readDescriptors( @@ -184,7 +195,30 @@ public class Main { } } } - /* Could use measurementId to insert path. */ + if (null != tr.getBuildTimes()) { + psBuildTimesSelect.clearParameters(); + psBuildTimesSelect.setInt(1, measurementId); + Set<Integer> skipPositions = new HashSet<>(); + try (ResultSet rs = psBuildTimesSelect.executeQuery()) { + while (rs.next()) { + skipPositions.add(rs.getInt(1)); + } + } + int position = 1; + long previousBuildTime = 0L; + for (long buildtime : tr.getBuildTimes()) { + if (!skipPositions.contains(position)) { + psBuildTimesInsert.clearParameters(); + psBuildTimesInsert.setInt(1, measurementId); + psBuildTimesInsert.setInt(2, position); + psBuildTimesInsert.setInt(3, (int) buildtime); + psBuildTimesInsert.setInt(4, (int) (buildtime - previousBuildTime)); + psBuildTimesInsert.execute(); + } + position++; + previousBuildTime = buildtime; + } + } connection.commit(); } } @@ -197,10 +231,12 @@ public class Main { return originalString; } - static SortedSet<String> queryOnionPerf(Connection connection) + static List<String> queryOnionPerf(Connection connection) throws SQLException { log.info("Querying statistics from database."); - SortedSet<String> statistics = new TreeSet<>(); + List<String> statistics = new ArrayList<>(); + statistics + .add("date,filesize,source,server,q1,md,q3,timeouts,failures,requests"); Statement st = connection.createStatement(); String queryString = "SELECT date, filesize, source, server, q1, md, q3, " + "timeouts, failures, requests FROM onionperf"; @@ -225,20 +261,66 @@ public class Main { return statistics; } + static List<String> queryBuildTimes(Connection connection) + throws SQLException { + log.info("Querying buildtime statistics from database."); + List<String> statistics = new ArrayList<>(); + statistics.add("date,source,position,q1,md,q3"); + Statement st = connection.createStatement(); + String queryString = "SELECT date, source, position, q1, md, q3 " + + "FROM buildtimes_stats"; + DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.US); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + try (ResultSet rs = st.executeQuery(queryString)) { + while (rs.next()) { + statistics.add(String.format("%s,%s,%d,%d,%d,%d", + dateFormat.format(rs.getDate("date", calendar)), + emptyNull(rs.getString("source")), + rs.getInt("position"), + rs.getInt("q1"), + rs.getInt("md"), + rs.getInt("q3"))); + } + } + return statistics; + } + + static List<String> queryLatencies(Connection connection) + throws SQLException { + log.info("Querying latency statistics from database."); + List<String> statistics = new ArrayList<>(); + statistics.add("date,source,server,q1,md,q3"); + Statement st = connection.createStatement(); + String queryString = "SELECT date, source, server, q1, md, q3 " + + "FROM latencies_stats"; + DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.US); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + try (ResultSet rs = st.executeQuery(queryString)) { + while (rs.next()) { + statistics.add(String.format("%s,%s,%s,%d,%d,%d", + dateFormat.format(rs.getDate("date", calendar)), + emptyNull(rs.getString("source")), + rs.getString("server"), + rs.getInt("q1"), + rs.getInt("md"), + rs.getInt("q3"))); + } + } + return statistics; + } + private static String emptyNull(String text) { return null == text ? "" : text; } - static void writeStatistics(Path webstatsPath, - SortedSet<String> statistics) throws IOException { + static void writeStatistics(Path webstatsPath, List<String> statistics) + throws IOException { webstatsPath.toFile().getParentFile().mkdirs(); - List<String> lines = new ArrayList<>(); - lines - .add("date,filesize,source,server,q1,md,q3,timeouts,failures,requests"); - lines.addAll(statistics); - log.info("Writing {} lines to {}.", lines.size(), + log.info("Writing {} lines to {}.", statistics.size(), webstatsPath.toFile().getAbsolutePath()); - Files.write(webstatsPath, lines, StandardCharsets.UTF_8); + Files.write(webstatsPath, statistics, StandardCharsets.UTF_8); } private static void disconnectFromDatabase(Connection connection) diff --git a/src/main/resources/web.xml b/src/main/resources/web.xml index 9c83591..1fe51b9 100644 --- a/src/main/resources/web.xml +++ b/src/main/resources/web.xml @@ -43,6 +43,8 @@ <url-pattern>/userstats-bridge-version.html</url-pattern> <url-pattern>/torperf.html</url-pattern> <url-pattern>/torperf-failures.html</url-pattern> + <url-pattern>/onionperf-buildtimes.html</url-pattern> + <url-pattern>/onionperf-latencies.html</url-pattern> <url-pattern>/connbidirect.html</url-pattern> <url-pattern>/hidserv-dir-onions-seen.html</url-pattern> <url-pattern>/hidserv-rend-relayed-cells.html</url-pattern> @@ -152,6 +154,12 @@ <url-pattern>/torperf-failures.png</url-pattern> <url-pattern>/torperf-failures.pdf</url-pattern> <url-pattern>/torperf-failures.csv</url-pattern> + <url-pattern>/onionperf-buildtimes.png</url-pattern> + <url-pattern>/onionperf-buildtimes.pdf</url-pattern> + <url-pattern>/onionperf-buildtimes.csv</url-pattern> + <url-pattern>/onionperf-latencies.png</url-pattern> + <url-pattern>/onionperf-latencies.pdf</url-pattern> + <url-pattern>/onionperf-latencies.csv</url-pattern> <url-pattern>/connbidirect.png</url-pattern> <url-pattern>/connbidirect.pdf</url-pattern> <url-pattern>/connbidirect.csv</url-pattern> diff --git a/src/main/resources/web/json/categories.json b/src/main/resources/web/json/categories.json index b323c79..23e6ee4 100644 --- a/src/main/resources/web/json/categories.json +++ b/src/main/resources/web/json/categories.json @@ -61,7 +61,9 @@ "description": "We use <a href=\"https://gitweb.torproject.org/torperf.git\">Torperf</a> and <a href=\"https://github.com/robgjansen/onionperf\">OnionPerf</a> to run performance measurements. Both work by fetching files of different sizes over Tor and measuring how long that takes.", "metrics": [ "torperf", - "torperf-failures" + "torperf-failures", + "onionperf-buildtimes", + "onionperf-latencies" ] }, { diff --git a/src/main/resources/web/json/metrics.json b/src/main/resources/web/json/metrics.json index 8dbdc66..0f85a28 100644 --- a/src/main/resources/web/json/metrics.json +++ b/src/main/resources/web/json/metrics.json @@ -310,6 +310,30 @@ ] }, { + "id": "onionperf-buildtimes", + "title": "Circuit build times", + "type": "Graph", + "description": "<p>This graph shows build times of circuits used for downloading static files of different sizes over Tor. The graph shows the range of measurements from first to third quartile, and highlights the median. The slowest and fastest quarter of measurements are omitted from the graph.</p>", + "function": "onionperf_buildtimes", + "parameters": [ + "start", + "end", + "source" + ] + }, + { + "id": "onionperf-latencies", + "title": "Circuit round-trip latencies", + "type": "Graph", + "description": "<p>This graph shows round-trip latencies of circuits used for downloading static files of different sizes over Tor, either from a server on the public internet or from a version 2 onion server. Round-trip latencies are measured as the time between sending the HTTP request and receiving the HTTP response header. The graph shows the range of measurements from first to third quartile, and highlights the median. The slowest and fastest quarter of measurements are omitted from the graph.</p>", + "function": "onionperf_latencies", + "parameters": [ + "start", + "end", + "source" + ] + }, + { "id": "connbidirect", "title": "Fraction of connections used uni-/bidirectionally", "type": "Graph", diff --git a/src/main/sql/onionperf/init-onionperf.sql b/src/main/sql/onionperf/init-onionperf.sql index 557eabb..fad6bef 100644 --- a/src/main/sql/onionperf/init-onionperf.sql +++ b/src/main/sql/onionperf/init-onionperf.sql @@ -43,6 +43,14 @@ CREATE TABLE IF NOT EXISTS measurements ( UNIQUE (source, filesize, start) ); +CREATE TABLE IF NOT EXISTS buildtimes ( + measurement_id INTEGER REFERENCES measurements (measurement_id) NOT NULL, + position INTEGER NOT NULL, + buildtime INTEGER NOT NULL, + delta INTEGER NOT NULL, + UNIQUE (measurement_id, position) +); + CREATE TYPE server AS ENUM ('public', 'onion'); CREATE OR REPLACE VIEW onionperf AS @@ -88,3 +96,63 @@ WHERE DATE(start) < current_date - 1 GROUP BY date, filesize, 3, server) sub ORDER BY date, filesize, source, server; +CREATE OR REPLACE VIEW buildtimes_stats AS +SELECT date, + source, + position, + TRUNC(q[1]) AS q1, + TRUNC(q[2]) AS md, + TRUNC(q[3]) AS q3 +FROM ( +SELECT DATE(start) AS date, + source, + position, + PERCENTILE_CONT(ARRAY[0.25,0.5,0.75]) WITHIN GROUP(ORDER BY delta) AS q +FROM measurements NATURAL JOIN buildtimes +WHERE DATE(start) < current_date - 1 +AND position <= 3 +GROUP BY date, source, position +UNION +SELECT DATE(start) AS date, + '' AS source, + position, + PERCENTILE_CONT(ARRAY[0.25,0.5,0.75]) WITHIN GROUP(ORDER BY delta) AS q +FROM measurements NATURAL JOIN buildtimes +WHERE DATE(start) < current_date - 1 +AND position <= 3 +GROUP BY date, 2, position) sub +ORDER BY date, source, position; + +CREATE OR REPLACE VIEW latencies_stats AS +SELECT date, + source, + server, + TRUNC(q[1]) AS q1, + TRUNC(q[2]) AS md, + TRUNC(q[3]) AS q3 +FROM ( +SELECT DATE(start) AS date, + source, + CASE WHEN endpointremote LIKE '%.onion%' THEN 'onion' + ELSE 'public' END AS server, + PERCENTILE_CONT(ARRAY[0.25,0.5,0.75]) + WITHIN GROUP(ORDER BY dataresponse - datarequest) AS q +FROM measurements +WHERE DATE(start) < current_date - 1 +AND datarequest > 0 +AND dataresponse > 0 +GROUP BY date, source, server +UNION +SELECT DATE(start) AS date, + '' AS source, + CASE WHEN endpointremote LIKE '%.onion%' THEN 'onion' + ELSE 'public' END AS server, + PERCENTILE_CONT(ARRAY[0.25,0.5,0.75]) + WITHIN GROUP(ORDER BY dataresponse - datarequest) AS q +FROM measurements +WHERE DATE(start) < current_date - 1 +AND datarequest > 0 +AND dataresponse > 0 +GROUP BY date, 2, server) sub +ORDER BY date, source, server; +

1 0

[chutney/master] Give a better warning when chutney can't find a binary
by teor＠torproject.org 06 Jul '18

06 Jul '18

commit 8500a1761f70b6969baa3236ce23c6cdb8c1a504 Author: teor <teor2345(a)gmail.com> Date: Fri Jul 6 13:52:15 2018 +1000 Give a better warning when chutney can't find a binary --- lib/chutney/TorNet.py | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 3e6da22..ceed4ee 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -261,6 +261,19 @@ class LocalNodeBuilder(NodeBuilder): NodeBuilder.__init__(self, env) self._env = env + def _warnMissingTor(self, tor, cmdline, + tor_name="tor", tor_env="CHUTNEY_TOR"): + """Log a warning that the binary tor can't be found while running + cmdline. Advise the user to put the path to tor_name in the tor_env + environmental variable. + """ + print(("Cannot find the {} binary {} for the command line '{}'. " + + "Use the {} environment variable to set the path, " + + "or put the binary into $PATH: '{}'. " + + "If your $PATH contains ~, use $HOME instead.") + .format(tor_name, tor, " ".join(cmdline), + tor_env, os.getenv("PATH"))) + def _createTorrcFile(self, checkOnly=False): """Write the torrc file for this node, disabling any options that are not supported by env's tor binary using comments. @@ -290,9 +303,7 @@ class LocalNodeBuilder(NodeBuilder): except OSError as e: # only catch file not found error if e.errno == errno.ENOENT: - print("Cannot find tor binary %r. Use " - "CHUTNEY_TOR environment variable to set the " - "path, or put the binary into $PATH." % tor) + self._warnMissingTor(tor, cmdline) sys.exit(0) else: raise @@ -418,9 +429,9 @@ class LocalNodeBuilder(NodeBuilder): except OSError as e: # only catch file not found error if e.errno == errno.ENOENT: - print("Cannot find tor-gencert binary %r. Use " - "CHUTNEY_TOR_GENCERT environment variable to set the " - "path, or put the binary into $PATH." % tor_gencert) + self._warnMissingTor(tor_gencert, cmdline, + tor_name="tor-gencert", + tor_env="CHUTNEY_TOR_GENCERT") sys.exit(0) else: raise @@ -448,9 +459,7 @@ class LocalNodeBuilder(NodeBuilder): except OSError as e: # only catch file not found error if e.errno == errno.ENOENT: - print("Cannot find tor binary %r. Use " - "CHUTNEY_TOR environment variable to set the " - "path, or put the binary into $PATH." % tor) + self._warnMissingTor(tor, cmdline) sys.exit(0) else: raise

1 0

[tor/master] Fix every include path changed in the previous commit (automated)
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit ef486e3c029efe8cb18886eea52f20af766f9daa Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 16:34:59 2018 -0400 Fix every include path changed in the previous commit (automated) I am very glad to have written this script. --- src/app/config/config.c | 90 +++++++++--------- src/app/config/config.h | 2 +- src/app/config/confparse.c | 6 +- src/app/config/statefile.c | 26 ++--- src/app/main/ntmain.c | 8 +- src/core/crypto/hs_ntor.c | 4 +- src/core/crypto/hs_ntor.h | 2 +- src/core/crypto/onion.c | 34 +++---- src/core/crypto/onion_fast.c | 4 +- src/core/crypto/onion_ntor.c | 2 +- src/core/crypto/onion_tap.c | 8 +- src/core/crypto/relay_crypto.c | 18 ++-- src/core/mainloop/connection.c | 90 +++++++++--------- src/core/mainloop/cpuworker.c | 24 ++--- src/core/mainloop/main.c | 136 +++++++++++++-------------- src/core/mainloop/main.h | 2 +- src/core/mainloop/periodic.c | 8 +- src/core/or/address_set.c | 2 +- src/core/or/channel.c | 44 ++++----- src/core/or/channel.h | 4 +- src/core/or/channelpadding.c | 28 +++--- src/core/or/channeltls.c | 56 +++++------ src/core/or/channeltls.h | 4 +- src/core/or/circuit_st.h | 4 +- src/core/or/circuitbuild.c | 92 +++++++++--------- src/core/or/circuitlist.c | 76 +++++++-------- src/core/or/circuitlist.h | 2 +- src/core/or/circuitmux.c | 18 ++-- src/core/or/circuitmux.h | 2 +- src/core/or/circuitmux_ewma.c | 10 +- src/core/or/circuitmux_ewma.h | 4 +- src/core/or/circuitstats.c | 34 +++---- src/core/or/circuituse.c | 72 +++++++------- src/core/or/command.c | 46 ++++----- src/core/or/command.h | 2 +- src/core/or/connection_edge.c | 92 +++++++++--------- src/core/or/connection_or.c | 78 +++++++-------- src/core/or/crypt_path_st.h | 2 +- src/core/or/dos.c | 26 ++--- src/core/or/edge_connection_st.h | 4 +- src/core/or/entry_connection_st.h | 2 +- src/core/or/entry_port_cfg_st.h | 2 +- src/core/or/git_revision.c | 2 +- src/core/or/listener_connection_st.h | 2 +- src/core/or/or.h | 2 +- src/core/or/or_circuit_st.h | 6 +- src/core/or/or_connection_st.h | 2 +- src/core/or/origin_circuit_st.h | 4 +- src/core/or/policies.c | 36 +++---- src/core/or/port_cfg_st.h | 4 +- src/core/or/reasons.c | 8 +- src/core/or/relay.c | 84 ++++++++--------- src/core/or/scheduler.c | 12 +-- src/core/or/scheduler.h | 4 +- src/core/or/scheduler_kist.c | 16 ++-- src/core/or/scheduler_vanilla.c | 8 +- src/core/or/status.c | 38 ++++---- src/core/proto/proto_cell.c | 8 +- src/core/proto/proto_control0.c | 4 +- src/core/proto/proto_ext_or.c | 6 +- src/core/proto/proto_http.c | 4 +- src/core/proto/proto_socks.c | 18 ++-- src/core/proto/protover.c | 6 +- src/core/proto/protover_rust.c | 4 +- src/feature/api/tor_api.c | 4 +- src/feature/client/addressmap.c | 22 ++--- src/feature/client/bridges.c | 36 +++---- src/feature/client/circpathbias.c | 34 +++---- src/feature/client/dnsserv.c | 26 ++--- src/feature/client/entrynodes.c | 56 +++++------ src/feature/client/transports.c | 22 ++--- src/feature/control/control.c | 116 +++++++++++------------ src/feature/control/control_connection_st.h | 4 +- src/feature/dirauth/dircollate.c | 8 +- src/feature/dirauth/dircollate.h | 2 +- src/feature/dirauth/dirvote.c | 76 +++++++-------- src/feature/dirauth/keypin.c | 2 +- src/feature/dirauth/mode.h | 2 +- src/feature/dirauth/shared_random.c | 34 +++---- src/feature/dirauth/shared_random.h | 2 +- src/feature/dirauth/shared_random_state.c | 22 ++--- src/feature/dirauth/shared_random_state.h | 2 +- src/feature/dircache/conscache.c | 6 +- src/feature/dircache/consdiffmgr.c | 20 ++-- src/feature/dircache/directory.c | 92 +++++++++--------- src/feature/dircache/directory.h | 2 +- src/feature/dircache/dirserv.c | 80 ++++++++-------- src/feature/dirclient/dir_server_st.h | 4 +- src/feature/dircommon/consdiff.c | 6 +- src/feature/dircommon/consdiff.h | 2 +- src/feature/dircommon/dir_connection_st.h | 2 +- src/feature/dircommon/fp_pair.c | 4 +- src/feature/dircommon/voting_schedule.c | 10 +- src/feature/dircommon/voting_schedule.h | 2 +- src/feature/hibernate/hibernate.c | 28 +++--- src/feature/hs/hs_cache.c | 20 ++-- src/feature/hs/hs_cache.h | 8 +- src/feature/hs/hs_cell.c | 14 +-- src/feature/hs/hs_cell.h | 4 +- src/feature/hs/hs_circuit.c | 46 ++++----- src/feature/hs/hs_circuit.h | 4 +- src/feature/hs/hs_circuitmap.c | 12 +-- src/feature/hs/hs_client.c | 60 ++++++------ src/feature/hs/hs_client.h | 4 +- src/feature/hs/hs_common.c | 48 +++++----- src/feature/hs/hs_common.h | 2 +- src/feature/hs/hs_config.c | 10 +- src/feature/hs/hs_config.h | 2 +- src/feature/hs/hs_control.c | 20 ++-- src/feature/hs/hs_control.h | 2 +- src/feature/hs/hs_descriptor.c | 18 ++-- src/feature/hs/hs_descriptor.h | 4 +- src/feature/hs/hs_ident.c | 2 +- src/feature/hs/hs_ident.h | 2 +- src/feature/hs/hs_intropoint.c | 24 ++--- src/feature/hs/hs_intropoint.h | 2 +- src/feature/hs/hs_service.c | 74 +++++++-------- src/feature/hs/hs_service.h | 10 +- src/feature/hs/hs_stats.c | 6 +- src/feature/hs_common/replaycache.c | 4 +- src/feature/hs_common/shared_random_client.c | 10 +- src/feature/hs_common/shared_random_client.h | 2 +- src/feature/nodelist/authority_cert_st.h | 2 +- src/feature/nodelist/extrainfo_st.h | 2 +- src/feature/nodelist/microdesc.c | 36 +++---- src/feature/nodelist/networkstatus.c | 96 +++++++++---------- src/feature/nodelist/networkstatus_st.h | 2 +- src/feature/nodelist/node_st.h | 2 +- src/feature/nodelist/nodelist.c | 60 ++++++------ src/feature/nodelist/parsecommon.c | 2 +- src/feature/nodelist/routerinfo_st.h | 2 +- src/feature/nodelist/routerlist.c | 80 ++++++++-------- src/feature/nodelist/routerlist_st.h | 2 +- src/feature/nodelist/routerparse.c | 80 ++++++++-------- src/feature/nodelist/routerset.c | 28 +++--- src/feature/nodelist/routerstatus_st.h | 2 +- src/feature/nodelist/signed_descriptor_st.h | 2 +- src/feature/nodelist/torcert.c | 8 +- src/feature/nodelist/vote_routerstatus_st.h | 2 +- src/feature/relay/dns.c | 28 +++--- src/feature/relay/dns.h | 2 +- src/feature/relay/ext_orport.c | 18 ++-- src/feature/relay/router.c | 82 ++++++++-------- src/feature/relay/routerkeys.c | 10 +- src/feature/rend/rendcache.c | 18 ++-- src/feature/rend/rendcache.h | 4 +- src/feature/rend/rendclient.c | 64 ++++++------- src/feature/rend/rendclient.h | 2 +- src/feature/rend/rendcommon.c | 58 ++++++------ src/feature/rend/rendmid.c | 26 ++--- src/feature/rend/rendservice.c | 72 +++++++------- src/feature/rend/rendservice.h | 4 +- src/feature/stats/geoip.c | 14 +-- src/feature/stats/geoip.h | 2 +- src/feature/stats/rephist.c | 30 +++--- src/test/bench.c | 18 ++-- src/test/fuzz/fuzz_consensus.c | 8 +- src/test/fuzz/fuzz_descriptor.c | 8 +- src/test/fuzz/fuzz_diff.c | 4 +- src/test/fuzz/fuzz_diff_apply.c | 4 +- src/test/fuzz/fuzz_extrainfo.c | 8 +- src/test/fuzz/fuzz_hsdescv2.c | 6 +- src/test/fuzz/fuzz_hsdescv3.c | 6 +- src/test/fuzz/fuzz_http.c | 10 +- src/test/fuzz/fuzz_http_connect.c | 14 +-- src/test/fuzz/fuzz_iptsv2.c | 8 +- src/test/fuzz/fuzz_microdesc.c | 6 +- src/test/fuzz/fuzz_vrs.c | 12 +-- src/test/fuzz/fuzzing_common.c | 4 +- src/test/hs_test_helpers.c | 6 +- src/test/hs_test_helpers.h | 2 +- src/test/log_test_helpers.h | 2 +- src/test/rend_test_helpers.c | 10 +- src/test/rend_test_helpers.h | 2 +- src/test/test.c | 44 ++++----- src/test/test_accounting.c | 10 +- src/test/test_addr.c | 4 +- src/test/test_address.c | 2 +- src/test/test_address_set.c | 24 ++--- src/test/test_bridges.c | 8 +- src/test/test_bt_cl.c | 2 +- src/test/test_buffers.c | 6 +- src/test/test_bwmgt.c | 2 +- src/test/test_cell_formats.c | 28 +++--- src/test/test_cell_queue.c | 14 +-- src/test/test_channel.c | 30 +++--- src/test/test_channelpadding.c | 26 ++--- src/test/test_channeltls.c | 16 ++-- src/test/test_checkdir.c | 4 +- src/test/test_circuitbuild.c | 10 +- src/test/test_circuitlist.c | 16 ++-- src/test/test_circuitmux.c | 14 +-- src/test/test_circuitstats.c | 24 ++--- src/test/test_circuituse.c | 18 ++-- src/test/test_compat_libevent.c | 2 +- src/test/test_config.c | 66 ++++++------- src/test/test_connection.c | 34 +++---- src/test/test_conscache.c | 6 +- src/test/test_consdiff.c | 4 +- src/test/test_consdiffmgr.c | 18 ++-- src/test/test_containers.c | 4 +- src/test/test_controller.c | 26 ++--- src/test/test_controller_events.c | 16 ++-- src/test/test_crypto.c | 2 +- src/test/test_crypto_slow.c | 2 +- src/test/test_dir.c | 70 +++++++------- src/test/test_dir_common.c | 22 ++--- src/test/test_dir_common.h | 6 +- src/test/test_dir_handle_get.c | 52 +++++----- src/test/test_dns.c | 14 +-- src/test/test_dos.c | 26 ++--- src/test/test_entryconn.c | 22 ++--- src/test/test_entrynodes.c | 52 +++++----- src/test/test_extorport.c | 16 ++-- src/test/test_geoip.c | 6 +- src/test/test_guardfraction.c | 20 ++-- src/test/test_helpers.c | 28 +++--- src/test/test_helpers.h | 2 +- src/test/test_hs.c | 28 +++--- src/test/test_hs_cache.c | 16 ++-- src/test/test_hs_cell.c | 6 +- src/test/test_hs_client.c | 52 +++++----- src/test/test_hs_common.c | 42 ++++----- src/test/test_hs_config.c | 10 +- src/test/test_hs_control.c | 18 ++-- src/test/test_hs_descriptor.c | 6 +- src/test/test_hs_intropoint.c | 22 ++--- src/test/test_hs_ntor.c | 2 +- src/test/test_hs_ntor_cl.c | 6 +- src/test/test_hs_service.c | 64 ++++++------- src/test/test_introduce.c | 4 +- src/test/test_keypin.c | 4 +- src/test/test_link_handshake.c | 28 +++--- src/test/test_logging.c | 4 +- src/test/test_mainloop.c | 4 +- src/test/test_microdesc.c | 26 ++--- src/test/test_nodelist.c | 20 ++-- src/test/test_ntor_cl.c | 4 +- src/test/test_oom.c | 18 ++-- src/test/test_oos.c | 16 ++-- src/test/test_options.c | 14 +-- src/test/test_periodic_event.c | 12 +-- src/test/test_policy.c | 20 ++-- src/test/test_procmon.c | 2 +- src/test/test_proto_http.c | 4 +- src/test/test_proto_misc.c | 14 +-- src/test/test_protover.c | 6 +- src/test/test_pt.c | 16 ++-- src/test/test_relay.c | 14 +-- src/test/test_relaycell.c | 26 ++--- src/test/test_relaycrypt.c | 16 ++-- src/test/test_rendcache.c | 24 ++--- src/test/test_replay.c | 4 +- src/test/test_router.c | 10 +- src/test/test_routerkeys.c | 10 +- src/test/test_routerlist.c | 50 +++++----- src/test/test_routerset.c | 24 ++--- src/test/test_scheduler.c | 14 +-- src/test/test_shared_random.c | 32 +++---- src/test/test_slow.c | 2 +- src/test/test_socks.c | 10 +- src/test/test_status.c | 28 +++--- src/test/test_storagedir.c | 2 +- src/test/test_switch_id.c | 2 +- src/test/test_threads.c | 2 +- src/test/test_tortls.c | 6 +- src/test/test_util.c | 8 +- src/test/test_util_format.c | 2 +- src/test/test_util_process.c | 2 +- src/test/test_voting_schedule.c | 4 +- src/test/test_workqueue.c | 4 +- src/test/testing_common.c | 12 +-- src/test/testing_rsakeys.c | 2 +- src/tools/tor_runner.c | 4 +- 274 files changed, 2595 insertions(+), 2595 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 9b2706982..28d2be5ec 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -60,52 +60,52 @@ **/ #define CONFIG_PRIVATE -#include "or/or.h" -#include "or/bridges.h" -#include "or/addressmap.h" -#include "or/channel.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuitmux.h" -#include "or/circuitmux_ewma.h" -#include "or/circuitstats.h" +#include "core/or/or.h" +#include "feature/client/bridges.h" +#include "feature/client/addressmap.h" +#include "core/or/channel.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuitmux.h" +#include "core/or/circuitmux_ewma.h" +#include "core/or/circuitstats.h" #include "lib/compress/compress.h" -#include "or/config.h" +#include "app/config/config.h" #include "lib/encoding/confline.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/connection_or.h" -#include "or/consdiffmgr.h" -#include "or/control.h" -#include "or/confparse.h" -#include "or/cpuworker.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "core/or/connection_or.h" +#include "feature/dircache/consdiffmgr.h" +#include "feature/control/control.h" +#include "app/config/confparse.h" +#include "core/mainloop/cpuworker.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/dirserv.h" -#include "or/dns.h" -#include "or/dos.h" -#include "or/entrynodes.h" -#include "or/git_revision.h" -#include "or/geoip.h" -#include "or/hibernate.h" -#include "or/main.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/relay.h" -#include "or/rendclient.h" -#include "or/rendservice.h" -#include "or/hs_config.h" -#include "or/rephist.h" -#include "or/router.h" +#include "feature/dircache/dirserv.h" +#include "feature/relay/dns.h" +#include "core/or/dos.h" +#include "feature/client/entrynodes.h" +#include "core/or/git_revision.h" +#include "feature/stats/geoip.h" +#include "feature/hibernate/hibernate.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "core/or/relay.h" +#include "feature/rend/rendclient.h" +#include "feature/rend/rendservice.h" +#include "feature/hs/hs_config.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" #include "lib/sandbox/sandbox.h" -#include "or/routerlist.h" -#include "or/routerset.h" -#include "or/scheduler.h" -#include "or/statefile.h" -#include "or/transports.h" -#include "or/ext_orport.h" -#include "or/voting_schedule.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerset.h" +#include "core/or/scheduler.h" +#include "app/config/statefile.h" +#include "feature/client/transports.h" +#include "feature/relay/ext_orport.h" +#include "feature/dircommon/voting_schedule.h" #ifdef _WIN32 #include <shlobj.h> #endif @@ -133,11 +133,11 @@ #include "lib/fs/conffile.h" #include "lib/evloop/procmon.h" -#include "or/dirauth/dirvote.h" -#include "or/dirauth/mode.h" +#include "feature/dirauth/dirvote.h" +#include "feature/dirauth/mode.h" -#include "or/connection_st.h" -#include "or/port_cfg_st.h" +#include "core/or/connection_st.h" +#include "core/or/port_cfg_st.h" #ifdef HAVE_SYSTEMD # if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) diff --git a/src/app/config/config.h b/src/app/config/config.h index 6d2feb5f4..a169cfd45 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -12,7 +12,7 @@ #ifndef TOR_CONFIG_H #define TOR_CONFIG_H -#include "or/or_options_st.h" +#include "app/config/or_options_st.h" #include "lib/testsupport/testsupport.h" #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(DARWIN) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 87405c6e7..5b7f54bc6 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -21,9 +21,9 @@ * specified, and a linked list of key-value pairs. */ -#include "or/or.h" -#include "or/confparse.h" -#include "or/routerset.h" +#include "core/or/or.h" +#include "app/config/confparse.h" +#include "feature/nodelist/routerset.h" #include "lib/container/bitarray.h" #include "lib/encoding/confline.h" diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c index e9db1ff06..8eeef4502 100644 --- a/src/app/config/statefile.c +++ b/src/app/config/statefile.c @@ -29,22 +29,22 @@ */ #define STATEFILE_PRIVATE -#include "or/or.h" -#include "or/circuitstats.h" -#include "or/config.h" -#include "or/confparse.h" -#include "or/connection.h" -#include "or/control.h" -#include "or/entrynodes.h" -#include "or/hibernate.h" -#include "or/main.h" -#include "or/rephist.h" -#include "or/router.h" +#include "core/or/or.h" +#include "core/or/circuitstats.h" +#include "app/config/config.h" +#include "app/config/confparse.h" +#include "core/mainloop/connection.h" +#include "feature/control/control.h" +#include "feature/client/entrynodes.h" +#include "feature/hibernate/hibernate.h" +#include "core/mainloop/main.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" #include "lib/sandbox/sandbox.h" -#include "or/statefile.h" +#include "app/config/statefile.h" #include "lib/encoding/confline.h" -#include "or/or_state_st.h" +#include "app/config/or_state_st.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/src/app/main/ntmain.c b/src/app/main/ntmain.c index 63d82f686..232529a80 100644 --- a/src/app/main/ntmain.c +++ b/src/app/main/ntmain.c @@ -19,10 +19,10 @@ #ifdef _WIN32 -#include "or/or.h" -#include "or/config.h" -#include "or/main.h" -#include "app/ntmain.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "core/mainloop/main.h" +#include "app/main/ntmain.h" #include "lib/log/win32err.h" #include "lib/fs/winlib.h" #include "lib/evloop/compat_libevent.h" diff --git a/src/core/crypto/hs_ntor.c b/src/core/crypto/hs_ntor.c index b5007545d..d98d16f7f 100644 --- a/src/core/crypto/hs_ntor.c +++ b/src/core/crypto/hs_ntor.c @@ -24,11 +24,11 @@ * rendezvous key expansion to setup end-to-end rend circuit keys. */ -#include "or/or.h" +#include "core/or/or.h" #include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_ed25519.h" -#include "or/hs_ntor.h" +#include "core/crypto/hs_ntor.h" /* String constants used by the ntor HS protocol */ #define PROTOID "tor-hs-ntor-curve25519-sha3-256-1" diff --git a/src/core/crypto/hs_ntor.h b/src/core/crypto/hs_ntor.h index 67a957343..30738c4ae 100644 --- a/src/core/crypto/hs_ntor.h +++ b/src/core/crypto/hs_ntor.h @@ -4,7 +4,7 @@ #ifndef TOR_HS_NTOR_H #define TOR_HS_NTOR_H -#include "or/or.h" +#include "core/or/or.h" struct ed25519_public_key_t; struct curve25519_public_key_t; struct curve25519_keypair_t; diff --git a/src/core/crypto/onion.c b/src/core/crypto/onion.c index 80d8e1a8b..e71bfc1fd 100644 --- a/src/core/crypto/onion.c +++ b/src/core/crypto/onion.c @@ -62,25 +62,25 @@ * onion_fast.c for more information. **/ -#include "or/or.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/config.h" -#include "or/cpuworker.h" +#include "core/or/or.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "app/config/config.h" +#include "core/mainloop/cpuworker.h" #include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_dh.h" -#include "or/networkstatus.h" -#include "or/onion.h" -#include "or/onion_fast.h" -#include "or/onion_ntor.h" -#include "or/onion_tap.h" -#include "or/relay.h" -#include "or/rephist.h" -#include "or/router.h" - -#include "or/cell_st.h" -#include "or/extend_info_st.h" -#include "or/or_circuit_st.h" +#include "feature/nodelist/networkstatus.h" +#include "core/crypto/onion.h" +#include "core/crypto/onion_fast.h" +#include "core/crypto/onion_ntor.h" +#include "core/crypto/onion_tap.h" +#include "core/or/relay.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" + +#include "core/or/cell_st.h" +#include "core/or/extend_info_st.h" +#include "core/or/or_circuit_st.h" // trunnel #include "trunnel/ed25519_cert.h" diff --git a/src/core/crypto/onion_fast.c b/src/core/crypto/onion_fast.c index 6e834ccf9..292aeca40 100644 --- a/src/core/crypto/onion_fast.c +++ b/src/core/crypto/onion_fast.c @@ -27,8 +27,8 @@ * many RSA1024 keys. **/ -#include "or/or.h" -#include "or/onion_fast.h" +#include "core/or/or.h" +#include "core/crypto/onion_fast.h" #include "lib/crypt_ops/crypto_hkdf.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" diff --git a/src/core/crypto/onion_ntor.c b/src/core/crypto/onion_ntor.c index 59c923cb9..9e1e273ef 100644 --- a/src/core/crypto/onion_ntor.c +++ b/src/core/crypto/onion_ntor.c @@ -29,7 +29,7 @@ #include "lib/ctime/di_ops.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" -#include "or/onion_ntor.h" +#include "core/crypto/onion_ntor.h" #include <string.h> diff --git a/src/core/crypto/onion_tap.c b/src/core/crypto/onion_tap.c index 05bcce2e8..7ffe0ea5c 100644 --- a/src/core/crypto/onion_tap.c +++ b/src/core/crypto/onion_tap.c @@ -27,13 +27,13 @@ * invoked from onion.c. **/ -#include "or/or.h" -#include "or/config.h" +#include "core/or/or.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_dh.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/onion_tap.h" -#include "or/rephist.h" +#include "core/crypto/onion_tap.h" +#include "feature/stats/rephist.h" /*----------------------------------------------------------------------*/ diff --git a/src/core/crypto/relay_crypto.c b/src/core/crypto/relay_crypto.c index 1fcfae0b3..b2388d2c4 100644 --- a/src/core/crypto/relay_crypto.c +++ b/src/core/crypto/relay_crypto.c @@ -4,18 +4,18 @@ * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" -#include "or/circuitlist.h" -#include "or/config.h" +#include "core/or/or.h" +#include "core/or/circuitlist.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/hs_ntor.h" // for HS_NTOR_KEY_EXPANSION_KDF_OUT_LEN -#include "or/relay.h" -#include "or/relay_crypto.h" +#include "core/crypto/hs_ntor.h" // for HS_NTOR_KEY_EXPANSION_KDF_OUT_LEN +#include "core/or/relay.h" +#include "core/crypto/relay_crypto.h" -#include "or/cell_st.h" -#include "or/or_circuit_st.h" -#include "or/origin_circuit_st.h" +#include "core/or/cell_st.h" +#include "core/or/or_circuit_st.h" +#include "core/or/origin_circuit_st.h" /** Update digest from the payload of cell. Assign integrity part to * cell. diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 6fd8fbf77..ed789d520 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -55,8 +55,8 @@ **/ #define CONNECTION_PRIVATE -#include "or/or.h" -#include "or/bridges.h" +#include "core/or/or.h" +#include "feature/client/bridges.h" #include "lib/container/buffers.h" #include "lib/tls/buffers_tls.h" /* @@ -66,42 +66,42 @@ #define TOR_CHANNEL_INTERNAL_ #define CONNECTION_PRIVATE #include "lib/err/backtrace.h" -#include "or/channel.h" -#include "or/channeltls.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/connection_or.h" -#include "or/control.h" +#include "core/or/channel.h" +#include "core/or/channeltls.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "core/or/connection_or.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/directory.h" -#include "or/dirserv.h" -#include "or/dns.h" -#include "or/dnsserv.h" -#include "or/dos.h" -#include "or/entrynodes.h" -#include "or/ext_orport.h" -#include "or/geoip.h" -#include "or/main.h" -#include "or/hibernate.h" -#include "or/hs_common.h" -#include "or/hs_ident.h" -#include "or/nodelist.h" -#include "or/proto_http.h" -#include "or/proto_socks.h" -#include "or/policies.h" -#include "or/reasons.h" -#include "or/relay.h" -#include "or/rendclient.h" -#include "or/rendcommon.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/transports.h" -#include "or/routerparse.h" +#include "feature/dircache/directory.h" +#include "feature/dircache/dirserv.h" +#include "feature/relay/dns.h" +#include "feature/client/dnsserv.h" +#include "core/or/dos.h" +#include "feature/client/entrynodes.h" +#include "feature/relay/ext_orport.h" +#include "feature/stats/geoip.h" +#include "core/mainloop/main.h" +#include "feature/hibernate/hibernate.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_ident.h" +#include "feature/nodelist/nodelist.h" +#include "core/proto/proto_http.h" +#include "core/proto/proto_socks.h" +#include "core/or/policies.h" +#include "core/or/reasons.h" +#include "core/or/relay.h" +#include "feature/rend/rendclient.h" +#include "feature/rend/rendcommon.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/client/transports.h" +#include "feature/nodelist/routerparse.h" #include "lib/sandbox/sandbox.h" #include "lib/net/buffers_net.h" #include "lib/tls/tortls.h" @@ -124,14 +124,14 @@ #include <sys/un.h> #endif -#include "or/dir_connection_st.h" -#include "or/control_connection_st.h" -#include "or/entry_connection_st.h" -#include "or/listener_connection_st.h" -#include "or/or_connection_st.h" -#include "or/port_cfg_st.h" -#include "or/routerinfo_st.h" -#include "or/socks_request_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "feature/control/control_connection_st.h" +#include "core/or/entry_connection_st.h" +#include "core/or/listener_connection_st.h" +#include "core/or/or_connection_st.h" +#include "core/or/port_cfg_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "core/or/socks_request_st.h" static connection_t *connection_listener_new( const struct sockaddr *listensockaddr, diff --git a/src/core/mainloop/cpuworker.c b/src/core/mainloop/cpuworker.c index 8b58e4c68..a372db3f1 100644 --- a/src/core/mainloop/cpuworker.c +++ b/src/core/mainloop/cpuworker.c @@ -17,22 +17,22 @@ * <li>and for calculating diffs and compressing them in consdiffmgr.c. * </ul> **/ -#include "or/or.h" -#include "or/channel.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/connection_or.h" -#include "or/config.h" -#include "or/cpuworker.h" +#include "core/or/or.h" +#include "core/or/channel.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/connection_or.h" +#include "app/config/config.h" +#include "core/mainloop/cpuworker.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/main.h" -#include "or/onion.h" -#include "or/rephist.h" -#include "or/router.h" +#include "core/mainloop/main.h" +#include "core/crypto/onion.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" #include "lib/evloop/workqueue.h" -#include "or/or_circuit_st.h" +#include "core/or/or_circuit_st.h" #include "lib/intmath/weakrng.h" static void queue_pending_tasks(void); diff --git a/src/core/mainloop/main.c b/src/core/mainloop/main.c index 2a57aa587..bad949097 100644 --- a/src/core/mainloop/main.c +++ b/src/core/mainloop/main.c @@ -47,69 +47,69 @@ **/ #define MAIN_PRIVATE -#include "or/or.h" -#include "or/addressmap.h" +#include "core/or/or.h" +#include "feature/client/addressmap.h" #include "lib/err/backtrace.h" -#include "or/bridges.h" +#include "feature/client/bridges.h" #include "lib/container/buffers.h" #include "lib/tls/buffers_tls.h" -#include "or/channel.h" -#include "or/channeltls.h" -#include "or/channelpadding.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/circuitmux_ewma.h" -#include "or/command.h" +#include "core/or/channel.h" +#include "core/or/channeltls.h" +#include "core/or/channelpadding.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "core/or/circuitmux_ewma.h" +#include "core/or/command.h" #include "lib/compress/compress.h" -#include "or/config.h" -#include "or/confparse.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/connection_or.h" -#include "or/consdiffmgr.h" -#include "or/control.h" -#include "or/cpuworker.h" +#include "app/config/config.h" +#include "app/config/confparse.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "core/or/connection_or.h" +#include "feature/dircache/consdiffmgr.h" +#include "feature/control/control.h" +#include "core/mainloop/cpuworker.h" #include "lib/crypt_ops/crypto_s2k.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/directory.h" -#include "or/dirserv.h" -#include "or/dns.h" -#include "or/dnsserv.h" -#include "or/dos.h" -#include "or/entrynodes.h" -#include "or/geoip.h" -#include "or/hibernate.h" -#include "or/hs_cache.h" -#include "or/hs_circuitmap.h" -#include "or/hs_client.h" -#include "or/keypin.h" -#include "or/main.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "app/ntmain.h" -#include "or/onion.h" -#include "or/periodic.h" -#include "or/policies.h" -#include "or/protover.h" -#include "or/transports.h" -#include "or/relay.h" -#include "or/rendclient.h" -#include "or/rendcommon.h" -#include "or/rendservice.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerkeys.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/scheduler.h" -#include "or/statefile.h" -#include "or/status.h" -#include "or/tor_api.h" -#include "or/tor_api_internal.h" +#include "feature/dircache/directory.h" +#include "feature/dircache/dirserv.h" +#include "feature/relay/dns.h" +#include "feature/client/dnsserv.h" +#include "core/or/dos.h" +#include "feature/client/entrynodes.h" +#include "feature/stats/geoip.h" +#include "feature/hibernate/hibernate.h" +#include "feature/hs/hs_cache.h" +#include "feature/hs/hs_circuitmap.h" +#include "feature/hs/hs_client.h" +#include "feature/dirauth/keypin.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "app/main/ntmain.h" +#include "core/crypto/onion.h" +#include "core/mainloop/periodic.h" +#include "core/or/policies.h" +#include "core/proto/protover.h" +#include "feature/client/transports.h" +#include "core/or/relay.h" +#include "feature/rend/rendclient.h" +#include "feature/rend/rendcommon.h" +#include "feature/rend/rendservice.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/relay/routerkeys.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "core/or/scheduler.h" +#include "app/config/statefile.h" +#include "core/or/status.h" +#include "feature/api/tor_api.h" +#include "feature/api/tor_api_internal.h" #include "lib/process/waitpid.h" -#include "or/ext_orport.h" +#include "feature/relay/ext_orport.h" #include "lib/memarea/memarea.h" #include "lib/meminfo/meminfo.h" #include "lib/osinfo/uname.h" @@ -123,18 +123,18 @@ #include <event2/event.h> -#include "or/dirauth/dirvote.h" -#include "or/dirauth/mode.h" -#include "or/dirauth/shared_random.h" - -#include "or/cell_st.h" -#include "or/entry_connection_st.h" -#include "or/networkstatus_st.h" -#include "or/or_connection_st.h" -#include "or/or_state_st.h" -#include "or/port_cfg_st.h" -#include "or/routerinfo_st.h" -#include "or/socks_request_st.h" +#include "feature/dirauth/dirvote.h" +#include "feature/dirauth/mode.h" +#include "feature/dirauth/shared_random.h" + +#include "core/or/cell_st.h" +#include "core/or/entry_connection_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "core/or/or_connection_st.h" +#include "app/config/or_state_st.h" +#include "core/or/port_cfg_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "core/or/socks_request_st.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/src/core/mainloop/main.h b/src/core/mainloop/main.h index 90146f4bd..2b4459670 100644 --- a/src/core/mainloop/main.h +++ b/src/core/mainloop/main.h @@ -114,7 +114,7 @@ STATIC int get_my_roles(const or_options_t *options); extern smartlist_t *connection_array; /* We need the periodic_event_item_t definition. */ -#include "or/periodic.h" +#include "core/mainloop/periodic.h" extern periodic_event_item_t periodic_events[]; #endif #endif /* defined(MAIN_PRIVATE) */ diff --git a/src/core/mainloop/periodic.c b/src/core/mainloop/periodic.c index 041b2d287..c17c0c56d 100644 --- a/src/core/mainloop/periodic.c +++ b/src/core/mainloop/periodic.c @@ -11,11 +11,11 @@ * that they fire. See periodic_events[] in main.c for examples. */ -#include "or/or.h" +#include "core/or/or.h" #include "lib/evloop/compat_libevent.h" -#include "or/config.h" -#include "or/main.h" -#include "or/periodic.h" +#include "app/config/config.h" +#include "core/mainloop/main.h" +#include "core/mainloop/periodic.h" #include "lib/evloop/compat_libevent.h" /** We disable any interval greater than this number of seconds, on the diff --git a/src/core/or/address_set.c b/src/core/or/address_set.c index 927a5597c..014e650d2 100644 --- a/src/core/or/address_set.c +++ b/src/core/or/address_set.c @@ -11,7 +11,7 @@ **/ #include "orconfig.h" -#include "or/address_set.h" +#include "core/or/address_set.h" #include "lib/net/address.h" #include "lib/container/bloomfilt.h" #include "lib/crypt_ops/crypto_rand.h" diff --git a/src/core/or/channel.c b/src/core/or/channel.c index e6d717f11..476f31d5b 100644 --- a/src/core/or/channel.c +++ b/src/core/or/channel.c @@ -57,31 +57,31 @@ /* This one's for stuff only channel.c and the test suite should see */ #define CHANNEL_PRIVATE_ -#include "or/or.h" -#include "or/channel.h" -#include "or/channeltls.h" -#include "or/channelpadding.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuitstats.h" -#include "or/config.h" -#include "or/connection_or.h" /* For var_cell_free() */ -#include "or/circuitmux.h" -#include "or/entrynodes.h" -#include "or/geoip.h" -#include "or/main.h" -#include "or/nodelist.h" -#include "or/relay.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/scheduler.h" +#include "core/or/or.h" +#include "core/or/channel.h" +#include "core/or/channeltls.h" +#include "core/or/channelpadding.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuitstats.h" +#include "app/config/config.h" +#include "core/or/connection_or.h" /* For var_cell_free() */ +#include "core/or/circuitmux.h" +#include "feature/client/entrynodes.h" +#include "feature/stats/geoip.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/relay.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "core/or/scheduler.h" #include "lib/time/compat_time.h" -#include "or/networkstatus.h" -#include "or/rendservice.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/rend/rendservice.h" #include "lib/evloop/timers.h" -#include "or/cell_queue_st.h" +#include "core/or/cell_queue_st.h" /* Global lists of channels */ diff --git a/src/core/or/channel.h b/src/core/or/channel.h index 7f2505676..b3d97a9ad 100644 --- a/src/core/or/channel.h +++ b/src/core/or/channel.h @@ -9,8 +9,8 @@ #ifndef TOR_CHANNEL_H #define TOR_CHANNEL_H -#include "or/or.h" -#include "or/circuitmux.h" +#include "core/or/or.h" +#include "core/or/circuitmux.h" #include "lib/container/handles.h" #include "lib/crypt_ops/crypto_ed25519.h" diff --git a/src/core/or/channelpadding.c b/src/core/or/channelpadding.c index 504f6f8f8..b8cfd33d5 100644 --- a/src/core/or/channelpadding.c +++ b/src/core/or/channelpadding.c @@ -8,24 +8,24 @@ * channelpadding_channel_to_channelinfo() */ #define TOR_CHANNEL_INTERNAL_ -#include "or/or.h" -#include "or/channel.h" -#include "or/channelpadding.h" -#include "or/channeltls.h" -#include "or/config.h" -#include "or/networkstatus.h" -#include "or/connection.h" -#include "or/connection_or.h" +#include "core/or/or.h" +#include "core/or/channel.h" +#include "core/or/channelpadding.h" +#include "core/or/channeltls.h" +#include "app/config/config.h" +#include "feature/nodelist/networkstatus.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_or.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/main.h" -#include "or/rephist.h" -#include "or/router.h" +#include "core/mainloop/main.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" #include "lib/time/compat_time.h" -#include "or/rendservice.h" +#include "feature/rend/rendservice.h" #include "lib/evloop/timers.h" -#include "or/cell_st.h" -#include "or/or_connection_st.h" +#include "core/or/cell_st.h" +#include "core/or/or_connection_st.h" STATIC int32_t channelpadding_get_netflow_inactive_timeout_ms( const channel_t *); diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 85dfe0c0f..87f5a02b7 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -38,36 +38,36 @@ #define CHANNELTLS_PRIVATE -#include "or/or.h" -#include "or/channel.h" -#include "or/channeltls.h" -#include "or/circuitmux.h" -#include "or/circuitmux_ewma.h" -#include "or/command.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_or.h" -#include "or/control.h" -#include "or/entrynodes.h" +#include "core/or/or.h" +#include "core/or/channel.h" +#include "core/or/channeltls.h" +#include "core/or/circuitmux.h" +#include "core/or/circuitmux_ewma.h" +#include "core/or/command.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_or.h" +#include "feature/control/control.h" +#include "feature/client/entrynodes.h" #include "trunnel/link_handshake.h" -#include "or/relay.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/scheduler.h" -#include "or/torcert.h" -#include "or/networkstatus.h" +#include "core/or/relay.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "core/or/scheduler.h" +#include "feature/nodelist/torcert.h" +#include "feature/nodelist/networkstatus.h" #include "trunnel/channelpadding_negotiation.h" -#include "or/channelpadding.h" - -#include "or/cell_st.h" -#include "or/cell_queue_st.h" -#include "or/extend_info_st.h" -#include "or/or_connection_st.h" -#include "or/or_handshake_certs_st.h" -#include "or/or_handshake_state_st.h" -#include "or/routerinfo_st.h" -#include "or/var_cell_st.h" +#include "core/or/channelpadding.h" + +#include "core/or/cell_st.h" +#include "core/or/cell_queue_st.h" +#include "core/or/extend_info_st.h" +#include "core/or/or_connection_st.h" +#include "core/or/or_handshake_certs_st.h" +#include "core/or/or_handshake_state_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "core/or/var_cell_st.h" #include "lib/tls/tortls.h" diff --git a/src/core/or/channeltls.h b/src/core/or/channeltls.h index 1ab899af9..4a10d51d9 100644 --- a/src/core/or/channeltls.h +++ b/src/core/or/channeltls.h @@ -9,8 +9,8 @@ #ifndef TOR_CHANNELTLS_H #define TOR_CHANNELTLS_H -#include "or/or.h" -#include "or/channel.h" +#include "core/or/or.h" +#include "core/or/channel.h" struct ed25519_public_key_t; struct curve25519_public_key_t; diff --git a/src/core/or/circuit_st.h b/src/core/or/circuit_st.h index 8453efa63..2e33b37b0 100644 --- a/src/core/or/circuit_st.h +++ b/src/core/or/circuit_st.h @@ -7,9 +7,9 @@ #ifndef CIRCUIT_ST_H #define CIRCUIT_ST_H -#include "or/or.h" +#include "core/or/or.h" -#include "or/cell_queue_st.h" +#include "core/or/cell_queue_st.h" struct hs_token_t; diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index 39ae7ebf4..e22ddabde 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -27,54 +27,54 @@ #define CIRCUITBUILD_PRIVATE -#include "or/or.h" -#include "or/bridges.h" -#include "or/channel.h" -#include "or/circpathbias.h" +#include "core/or/or.h" +#include "feature/client/bridges.h" +#include "core/or/channel.h" +#include "feature/client/circpathbias.h" #define CIRCUITBUILD_PRIVATE -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuitstats.h" -#include "or/circuituse.h" -#include "or/command.h" -#include "or/config.h" -#include "or/confparse.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/connection_or.h" -#include "or/control.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuitstats.h" +#include "core/or/circuituse.h" +#include "core/or/command.h" +#include "app/config/config.h" +#include "app/config/confparse.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "core/or/connection_or.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/directory.h" -#include "or/entrynodes.h" -#include "or/hs_ntor.h" -#include "or/main.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/onion.h" -#include "or/onion_tap.h" -#include "or/onion_fast.h" -#include "or/policies.h" -#include "or/relay.h" -#include "or/relay_crypto.h" -#include "or/rendcommon.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/routerset.h" -#include "or/transports.h" - -#include "or/cell_st.h" -#include "or/cpath_build_state_st.h" -#include "or/entry_connection_st.h" -#include "or/extend_info_st.h" -#include "or/node_st.h" -#include "or/or_circuit_st.h" -#include "or/origin_circuit_st.h" -#include "or/microdesc_st.h" -#include "or/routerinfo_st.h" -#include "or/routerstatus_st.h" +#include "feature/dircache/directory.h" +#include "feature/client/entrynodes.h" +#include "core/crypto/hs_ntor.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/crypto/onion.h" +#include "core/crypto/onion_tap.h" +#include "core/crypto/onion_fast.h" +#include "core/or/policies.h" +#include "core/or/relay.h" +#include "core/crypto/relay_crypto.h" +#include "feature/rend/rendcommon.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/routerset.h" +#include "feature/client/transports.h" + +#include "core/or/cell_st.h" +#include "core/or/cpath_build_state_st.h" +#include "core/or/entry_connection_st.h" +#include "core/or/extend_info_st.h" +#include "feature/nodelist/node_st.h" +#include "core/or/or_circuit_st.h" +#include "core/or/origin_circuit_st.h" +#include "feature/nodelist/microdesc_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerstatus_st.h" static channel_t * channel_connect_for_circuit(const tor_addr_t *addr, uint16_t port, diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c index d9d12db9b..f39e05ecd 100644 --- a/src/core/or/circuitlist.c +++ b/src/core/or/circuitlist.c @@ -53,40 +53,40 @@ #define CIRCUITLIST_PRIVATE #include "lib/cc/torint.h" /* TOR_PRIuSZ */ -#include "or/or.h" -#include "or/channel.h" -#include "or/circpathbias.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/circuitstats.h" -#include "or/connection.h" -#include "or/config.h" -#include "or/connection_edge.h" -#include "or/connection_or.h" -#include "or/control.h" +#include "core/or/or.h" +#include "core/or/channel.h" +#include "feature/client/circpathbias.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "core/or/circuitstats.h" +#include "core/mainloop/connection.h" +#include "app/config/config.h" +#include "core/or/connection_edge.h" +#include "core/or/connection_or.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_dh.h" -#include "or/directory.h" -#include "or/entrynodes.h" -#include "or/main.h" -#include "or/hs_circuit.h" -#include "or/hs_circuitmap.h" -#include "or/hs_ident.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/onion.h" -#include "or/onion_fast.h" -#include "or/policies.h" -#include "or/relay.h" -#include "or/relay_crypto.h" -#include "or/rendclient.h" -#include "or/rendcommon.h" -#include "or/rephist.h" -#include "or/routerlist.h" -#include "or/routerset.h" -#include "or/channelpadding.h" +#include "feature/dircache/directory.h" +#include "feature/client/entrynodes.h" +#include "core/mainloop/main.h" +#include "feature/hs/hs_circuit.h" +#include "feature/hs/hs_circuitmap.h" +#include "feature/hs/hs_ident.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/crypto/onion.h" +#include "core/crypto/onion_fast.h" +#include "core/or/policies.h" +#include "core/or/relay.h" +#include "core/crypto/relay_crypto.h" +#include "feature/rend/rendclient.h" +#include "feature/rend/rendcommon.h" +#include "feature/stats/rephist.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerset.h" +#include "core/or/channelpadding.h" #include "lib/compress/compress.h" #include "lib/compress/compress_lzma.h" #include "lib/compress/compress_zlib.h" @@ -95,13 +95,13 @@ #include "ht.h" -#include "or/cpath_build_state_st.h" -#include "or/crypt_path_reference_st.h" -#include "or/dir_connection_st.h" -#include "or/edge_connection_st.h" -#include "or/extend_info_st.h" -#include "or/or_circuit_st.h" -#include "or/origin_circuit_st.h" +#include "core/or/cpath_build_state_st.h" +#include "core/or/crypt_path_reference_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "core/or/edge_connection_st.h" +#include "core/or/extend_info_st.h" +#include "core/or/or_circuit_st.h" +#include "core/or/origin_circuit_st.h" /********* START VARIABLES **********/ diff --git a/src/core/or/circuitlist.h b/src/core/or/circuitlist.h index 7c9bc0199..b069604a1 100644 --- a/src/core/or/circuitlist.h +++ b/src/core/or/circuitlist.h @@ -13,7 +13,7 @@ #define TOR_CIRCUITLIST_H #include "lib/testsupport/testsupport.h" -#include "or/hs_ident.h" +#include "feature/hs/hs_ident.h" /** Circuit state: I'm the origin, still haven't done all my handshakes. */ #define CIRCUIT_STATE_BUILDING 0 diff --git a/src/core/or/circuitmux.c b/src/core/or/circuitmux.c index 9e0126b8f..f55386df2 100644 --- a/src/core/or/circuitmux.c +++ b/src/core/or/circuitmux.c @@ -69,15 +69,15 @@ * made to attach all existing circuits to the new policy. **/ -#include "or/or.h" -#include "or/channel.h" -#include "or/circuitlist.h" -#include "or/circuitmux.h" -#include "or/relay.h" - -#include "or/cell_queue_st.h" -#include "or/destroy_cell_queue_st.h" -#include "or/or_circuit_st.h" +#include "core/or/or.h" +#include "core/or/channel.h" +#include "core/or/circuitlist.h" +#include "core/or/circuitmux.h" +#include "core/or/relay.h" + +#include "core/or/cell_queue_st.h" +#include "core/or/destroy_cell_queue_st.h" +#include "core/or/or_circuit_st.h" /* * Private typedefs for circuitmux.c diff --git a/src/core/or/circuitmux.h b/src/core/or/circuitmux.h index e94cc354c..31bf81463 100644 --- a/src/core/or/circuitmux.h +++ b/src/core/or/circuitmux.h @@ -9,7 +9,7 @@ #ifndef TOR_CIRCUITMUX_H #define TOR_CIRCUITMUX_H -#include "or/or.h" +#include "core/or/or.h" #include "lib/testsupport/testsupport.h" typedef struct circuitmux_policy_s circuitmux_policy_t; diff --git a/src/core/or/circuitmux_ewma.c b/src/core/or/circuitmux_ewma.c index d600602a7..deca81f0a 100644 --- a/src/core/or/circuitmux_ewma.c +++ b/src/core/or/circuitmux_ewma.c @@ -34,12 +34,12 @@ #include <math.h> -#include "or/or.h" -#include "or/circuitmux.h" -#include "or/circuitmux_ewma.h" +#include "core/or/or.h" +#include "core/or/circuitmux.h" +#include "core/or/circuitmux_ewma.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/networkstatus.h" -#include "or/or_options_st.h" +#include "feature/nodelist/networkstatus.h" +#include "app/config/or_options_st.h" /*** EWMA parameter #defines ***/ diff --git a/src/core/or/circuitmux_ewma.h b/src/core/or/circuitmux_ewma.h index 1214b0264..8e87830a8 100644 --- a/src/core/or/circuitmux_ewma.h +++ b/src/core/or/circuitmux_ewma.h @@ -9,8 +9,8 @@ #ifndef TOR_CIRCUITMUX_EWMA_H #define TOR_CIRCUITMUX_EWMA_H -#include "or/or.h" -#include "or/circuitmux.h" +#include "core/or/or.h" +#include "core/or/circuitmux.h" /* The public EWMA policy callbacks object. */ extern circuitmux_policy_t ewma_policy; diff --git a/src/core/or/circuitstats.c b/src/core/or/circuitstats.c index d275399e9..63cd21540 100644 --- a/src/core/or/circuitstats.c +++ b/src/core/or/circuitstats.c @@ -25,28 +25,28 @@ #define CIRCUITSTATS_PRIVATE -#include "or/or.h" -#include "or/circuitbuild.h" -#include "or/circuitstats.h" -#include "or/config.h" -#include "or/confparse.h" -#include "or/control.h" +#include "core/or/or.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitstats.h" +#include "app/config/config.h" +#include "app/config/confparse.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/main.h" -#include "or/networkstatus.h" -#include "or/rendclient.h" -#include "or/rendservice.h" -#include "or/router.h" -#include "or/statefile.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/rend/rendclient.h" +#include "feature/rend/rendservice.h" +#include "feature/relay/router.h" +#include "app/config/statefile.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" #include "lib/math/fp.h" #include "lib/time/tvdiff.h" #include "lib/encoding/confline.h" -#include "or/crypt_path_st.h" -#include "or/origin_circuit_st.h" -#include "or/or_state_st.h" +#include "core/or/crypt_path_st.h" +#include "core/or/origin_circuit_st.h" +#include "app/config/or_state_st.h" #undef log #include <math.h> diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index a3a69dc35..a3b9eb171 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -27,45 +27,45 @@ * logic in circuitstats.c. **/ -#include "or/or.h" -#include "or/addressmap.h" -#include "or/bridges.h" -#include "or/channel.h" -#include "or/circpathbias.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuitstats.h" -#include "or/circuituse.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/control.h" -#include "or/directory.h" -#include "or/entrynodes.h" -#include "or/hs_common.h" -#include "or/hs_client.h" -#include "or/hs_circuit.h" -#include "or/hs_ident.h" -#include "or/hs_stats.h" -#include "or/nodelist.h" -#include "or/networkstatus.h" -#include "or/policies.h" -#include "or/rendclient.h" -#include "or/rendcommon.h" -#include "or/rendservice.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerlist.h" +#include "core/or/or.h" +#include "feature/client/addressmap.h" +#include "feature/client/bridges.h" +#include "core/or/channel.h" +#include "feature/client/circpathbias.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuitstats.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "feature/control/control.h" +#include "feature/dircache/directory.h" +#include "feature/client/entrynodes.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_client.h" +#include "feature/hs/hs_circuit.h" +#include "feature/hs/hs_ident.h" +#include "feature/hs/hs_stats.h" +#include "feature/nodelist/nodelist.h" +#include "feature/nodelist/networkstatus.h" +#include "core/or/policies.h" +#include "feature/rend/rendclient.h" +#include "feature/rend/rendcommon.h" +#include "feature/rend/rendservice.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" #include "lib/math/fp.h" #include "lib/time/tvdiff.h" -#include "or/cpath_build_state_st.h" -#include "or/dir_connection_st.h" -#include "or/entry_connection_st.h" -#include "or/extend_info_st.h" -#include "or/or_circuit_st.h" -#include "or/origin_circuit_st.h" -#include "or/socks_request_st.h" +#include "core/or/cpath_build_state_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "core/or/entry_connection_st.h" +#include "core/or/extend_info_st.h" +#include "core/or/or_circuit_st.h" +#include "core/or/origin_circuit_st.h" +#include "core/or/socks_request_st.h" static void circuit_expire_old_circuits_clientside(void); static void circuit_increment_failure_count(void); diff --git a/src/core/or/command.c b/src/core/or/command.c index c2d6e2bb2..461e49b62 100644 --- a/src/core/or/command.c +++ b/src/core/or/command.c @@ -36,30 +36,30 @@ * callbacks registered in command_setup_channel(), * called when channels are created in circuitbuild.c */ -#include "or/or.h" -#include "or/channel.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/command.h" -#include "or/connection.h" -#include "or/connection_or.h" -#include "or/config.h" -#include "or/control.h" -#include "or/cpuworker.h" +#include "core/or/or.h" +#include "core/or/channel.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/command.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_or.h" +#include "app/config/config.h" +#include "feature/control/control.h" +#include "core/mainloop/cpuworker.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/dos.h" -#include "or/hibernate.h" -#include "or/nodelist.h" -#include "or/onion.h" -#include "or/rephist.h" -#include "or/relay.h" -#include "or/router.h" -#include "or/routerlist.h" - -#include "or/cell_st.h" -#include "or/or_circuit_st.h" -#include "or/origin_circuit_st.h" -#include "or/var_cell_st.h" +#include "core/or/dos.h" +#include "feature/hibernate/hibernate.h" +#include "feature/nodelist/nodelist.h" +#include "core/crypto/onion.h" +#include "feature/stats/rephist.h" +#include "core/or/relay.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" + +#include "core/or/cell_st.h" +#include "core/or/or_circuit_st.h" +#include "core/or/origin_circuit_st.h" +#include "core/or/var_cell_st.h" /** How many CELL_CREATE cells have we received, ever? */ uint64_t stats_n_create_cells_processed = 0; diff --git a/src/core/or/command.h b/src/core/or/command.h index 864a5b2fd..83ffd8dcc 100644 --- a/src/core/or/command.h +++ b/src/core/or/command.h @@ -12,7 +12,7 @@ #ifndef TOR_COMMAND_H #define TOR_COMMAND_H -#include "or/channel.h" +#include "core/or/channel.h" void command_process_cell(channel_t *chan, cell_t *cell); void command_process_var_cell(channel_t *chan, var_cell_t *cell); diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 13d957a93..8e8a5e21c 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -55,57 +55,57 @@ **/ #define CONNECTION_EDGE_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "lib/err/backtrace.h" -#include "or/addressmap.h" +#include "feature/client/addressmap.h" #include "lib/container/buffers.h" -#include "or/channel.h" -#include "or/circpathbias.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/connection_or.h" -#include "or/control.h" +#include "core/or/channel.h" +#include "feature/client/circpathbias.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "core/or/connection_or.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/dns.h" -#include "or/dnsserv.h" -#include "or/directory.h" -#include "or/dirserv.h" -#include "or/hibernate.h" -#include "or/hs_common.h" -#include "or/hs_cache.h" -#include "or/hs_client.h" -#include "or/hs_circuit.h" -#include "or/main.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/proto_http.h" -#include "or/proto_socks.h" -#include "or/reasons.h" -#include "or/relay.h" -#include "or/rendclient.h" -#include "or/rendcommon.h" -#include "or/rendservice.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerset.h" -#include "or/circuitbuild.h" - -#include "or/cell_st.h" -#include "or/cpath_build_state_st.h" -#include "or/dir_connection_st.h" -#include "or/entry_connection_st.h" -#include "or/extend_info_st.h" -#include "or/node_st.h" -#include "or/or_circuit_st.h" -#include "or/origin_circuit_st.h" -#include "or/socks_request_st.h" +#include "feature/relay/dns.h" +#include "feature/client/dnsserv.h" +#include "feature/dircache/directory.h" +#include "feature/dircache/dirserv.h" +#include "feature/hibernate/hibernate.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_cache.h" +#include "feature/hs/hs_client.h" +#include "feature/hs/hs_circuit.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "core/proto/proto_http.h" +#include "core/proto/proto_socks.h" +#include "core/or/reasons.h" +#include "core/or/relay.h" +#include "feature/rend/rendclient.h" +#include "feature/rend/rendcommon.h" +#include "feature/rend/rendservice.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerset.h" +#include "core/or/circuitbuild.h" + +#include "core/or/cell_st.h" +#include "core/or/cpath_build_state_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "core/or/entry_connection_st.h" +#include "core/or/extend_info_st.h" +#include "feature/nodelist/node_st.h" +#include "core/or/or_circuit_st.h" +#include "core/or/origin_circuit_st.h" +#include "core/or/socks_request_st.h" #include "lib/evloop/compat_libevent.h" #ifdef HAVE_LINUX_TYPES_H diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c index 71ab90594..159ee9626 100644 --- a/src/core/or/connection_or.c +++ b/src/core/or/connection_or.c @@ -20,8 +20,8 @@ * * This module also implements the client side of the v3 Tor link handshake, **/ -#include "or/or.h" -#include "or/bridges.h" +#include "core/or/or.h" +#include "feature/client/bridges.h" #include "lib/container/buffers.h" /* * Define this so we get channel internal functions, since we're implementing @@ -29,46 +29,46 @@ */ #define TOR_CHANNEL_INTERNAL_ #define CONNECTION_OR_PRIVATE -#include "or/channel.h" -#include "or/channeltls.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuitstats.h" -#include "or/command.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_or.h" -#include "or/control.h" +#include "core/or/channel.h" +#include "core/or/channeltls.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuitstats.h" +#include "core/or/command.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_or.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/dirserv.h" -#include "or/entrynodes.h" -#include "or/geoip.h" -#include "or/main.h" +#include "feature/dircache/dirserv.h" +#include "feature/client/entrynodes.h" +#include "feature/stats/geoip.h" +#include "core/mainloop/main.h" #include "trunnel/link_handshake.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/proto_cell.h" -#include "or/reasons.h" -#include "or/relay.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerkeys.h" -#include "or/routerlist.h" -#include "or/ext_orport.h" -#include "or/scheduler.h" -#include "or/torcert.h" -#include "or/channelpadding.h" - -#include "or/cell_st.h" -#include "or/cell_queue_st.h" -#include "or/or_connection_st.h" -#include "or/or_handshake_certs_st.h" -#include "or/or_handshake_state_st.h" -#include "or/or_state_st.h" -#include "or/routerinfo_st.h" -#include "or/var_cell_st.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/proto/proto_cell.h" +#include "core/or/reasons.h" +#include "core/or/relay.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/relay/routerkeys.h" +#include "feature/nodelist/routerlist.h" +#include "feature/relay/ext_orport.h" +#include "core/or/scheduler.h" +#include "feature/nodelist/torcert.h" +#include "core/or/channelpadding.h" + +#include "core/or/cell_st.h" +#include "core/or/cell_queue_st.h" +#include "core/or/or_connection_st.h" +#include "core/or/or_handshake_certs_st.h" +#include "core/or/or_handshake_state_st.h" +#include "app/config/or_state_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "core/or/var_cell_st.h" #include "lib/crypt_ops/crypto_format.h" #include "lib/tls/tortls.h" diff --git a/src/core/or/crypt_path_st.h b/src/core/or/crypt_path_st.h index 0fde1fab0..138091336 100644 --- a/src/core/or/crypt_path_st.h +++ b/src/core/or/crypt_path_st.h @@ -7,7 +7,7 @@ #ifndef CRYPT_PATH_ST_H #define CRYPT_PATH_ST_H -#include "or/relay_crypto_st.h" +#include "core/or/relay_crypto_st.h" struct crypto_dh_t; #define CRYPT_PATH_MAGIC 0x70127012u diff --git a/src/core/or/dos.c b/src/core/or/dos.c index d86ede02c..52879c34d 100644 --- a/src/core/or/dos.c +++ b/src/core/or/dos.c @@ -8,22 +8,22 @@ #define DOS_PRIVATE -#include "or/or.h" -#include "or/channel.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_or.h" +#include "core/or/or.h" +#include "core/or/channel.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_or.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/geoip.h" -#include "or/main.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/relay.h" -#include "or/router.h" +#include "feature/stats/geoip.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/relay.h" +#include "feature/relay/router.h" -#include "or/dos.h" +#include "core/or/dos.h" -#include "or/or_connection_st.h" +#include "core/or/or_connection_st.h" /* * Circuit creation denial of service mitigation. diff --git a/src/core/or/edge_connection_st.h b/src/core/or/edge_connection_st.h index d58e1c2b8..f4388c10e 100644 --- a/src/core/or/edge_connection_st.h +++ b/src/core/or/edge_connection_st.h @@ -7,9 +7,9 @@ #ifndef EDGE_CONNECTION_ST_H #define EDGE_CONNECTION_ST_H -#include "or/or.h" +#include "core/or/or.h" -#include "or/connection_st.h" +#include "core/or/connection_st.h" /** Subtype of connection_t for an "edge connection" -- that is, an entry (ap) * connection, or an exit. */ diff --git a/src/core/or/entry_connection_st.h b/src/core/or/entry_connection_st.h index 2f9676088..ebaee2f1a 100644 --- a/src/core/or/entry_connection_st.h +++ b/src/core/or/entry_connection_st.h @@ -7,7 +7,7 @@ #ifndef ENTRY_CONNECTION_ST_H #define ENTRY_CONNECTION_ST_H -#include "or/edge_connection_st.h" +#include "core/or/edge_connection_st.h" /** Subtype of edge_connection_t for an "entry connection" -- that is, a SOCKS * connection, a DNS request, a TransPort connection or a NATD connection */ diff --git a/src/core/or/entry_port_cfg_st.h b/src/core/or/entry_port_cfg_st.h index 9b07ccb06..492fafbd6 100644 --- a/src/core/or/entry_port_cfg_st.h +++ b/src/core/or/entry_port_cfg_st.h @@ -8,7 +8,7 @@ #define ENTRY_PORT_CFG_ST_H #include "lib/cc/torint.h" -#include "or/or.h" +#include "core/or/or.h" struct entry_port_cfg_t { /* Client port types (socks, dns, trans, natd) only: */ diff --git a/src/core/or/git_revision.c b/src/core/or/git_revision.c index be6f67423..f34f922c8 100644 --- a/src/core/or/git_revision.c +++ b/src/core/or/git_revision.c @@ -3,7 +3,7 @@ * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/git_revision.h" +#include "core/or/git_revision.h" /** String describing which Tor Git repository version the source was * built from. This string is generated by a bit of shell kludging in diff --git a/src/core/or/listener_connection_st.h b/src/core/or/listener_connection_st.h index 7b5aafcb5..ec350c1b0 100644 --- a/src/core/or/listener_connection_st.h +++ b/src/core/or/listener_connection_st.h @@ -7,7 +7,7 @@ #ifndef LISTENER_CONNECTION_ST_H #define LISTENER_CONNECTION_ST_H -#include "or/connection_st.h" +#include "core/or/connection_st.h" /** Subtype of connection_t; used for a listener socket. */ struct listener_connection_t { diff --git a/src/core/or/or.h b/src/core/or/or.h index 826e81e46..6edfd21df 100644 --- a/src/core/or/or.h +++ b/src/core/or/or.h @@ -69,7 +69,7 @@ // These, more than other includes, are for keeping the other struct // definitions working. We should remove them when we minimize our includes. -#include "or/entry_port_cfg_st.h" +#include "core/or/entry_port_cfg_st.h" struct ed25519_public_key_t; struct curve25519_public_key_t; diff --git a/src/core/or/or_circuit_st.h b/src/core/or/or_circuit_st.h index 158a5314e..b5e21d986 100644 --- a/src/core/or/or_circuit_st.h +++ b/src/core/or/or_circuit_st.h @@ -7,10 +7,10 @@ #ifndef OR_CIRCUIT_ST_H #define OR_CIRCUIT_ST_H -#include "or/or.h" +#include "core/or/or.h" -#include "or/circuit_st.h" -#include "or/crypt_path_st.h" +#include "core/or/circuit_st.h" +#include "core/or/crypt_path_st.h" struct onion_queue_t; diff --git a/src/core/or/or_connection_st.h b/src/core/or/or_connection_st.h index 8c2c1f89c..020a717c1 100644 --- a/src/core/or/or_connection_st.h +++ b/src/core/or/or_connection_st.h @@ -7,7 +7,7 @@ #ifndef OR_CONNECTION_ST_H #define OR_CONNECTION_ST_H -#include "or/connection_st.h" +#include "core/or/connection_st.h" #include "lib/evloop/token_bucket.h" struct tor_tls_t; diff --git a/src/core/or/origin_circuit_st.h b/src/core/or/origin_circuit_st.h index b885725ed..e7b864e82 100644 --- a/src/core/or/origin_circuit_st.h +++ b/src/core/or/origin_circuit_st.h @@ -7,9 +7,9 @@ #ifndef ORIGIN_CIRCUIT_ST_H #define ORIGIN_CIRCUIT_ST_H -#include "or/or.h" +#include "core/or/or.h" -#include "or/circuit_st.h" +#include "core/or/circuit_st.h" struct onion_queue_t; diff --git a/src/core/or/policies.c b/src/core/or/policies.c index 53e00e808..e01415f95 100644 --- a/src/core/or/policies.c +++ b/src/core/or/policies.c @@ -17,27 +17,27 @@ #define POLICIES_PRIVATE -#include "or/or.h" -#include "or/bridges.h" -#include "or/config.h" -#include "or/dirserv.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/router.h" -#include "or/routerparse.h" -#include "or/geoip.h" +#include "core/or/or.h" +#include "feature/client/bridges.h" +#include "app/config/config.h" +#include "feature/dircache/dirserv.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerparse.h" +#include "feature/stats/geoip.h" #include "ht.h" #include "lib/encoding/confline.h" -#include "or/addr_policy_st.h" -#include "or/dir_server_st.h" -#include "or/microdesc_st.h" -#include "or/node_st.h" -#include "or/port_cfg_st.h" -#include "or/routerinfo_st.h" -#include "or/routerstatus_st.h" +#include "core/or/addr_policy_st.h" +#include "feature/dirclient/dir_server_st.h" +#include "feature/nodelist/microdesc_st.h" +#include "feature/nodelist/node_st.h" +#include "core/or/port_cfg_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerstatus_st.h" /** Policy that addresses for incoming SOCKS connections must match. */ static smartlist_t *socks_policy = NULL; diff --git a/src/core/or/port_cfg_st.h b/src/core/or/port_cfg_st.h index 86a3b963b..19410871e 100644 --- a/src/core/or/port_cfg_st.h +++ b/src/core/or/port_cfg_st.h @@ -7,8 +7,8 @@ #ifndef PORT_CFG_ST_H #define PORT_CFG_ST_H -#include "or/entry_port_cfg_st.h" -#include "or/server_port_cfg_st.h" +#include "core/or/entry_port_cfg_st.h" +#include "core/or/server_port_cfg_st.h" /** Configuration for a single port that we're listening on. */ struct port_cfg_t { diff --git a/src/core/or/reasons.c b/src/core/or/reasons.c index 7d8dcf374..7a1e09e9f 100644 --- a/src/core/or/reasons.c +++ b/src/core/or/reasons.c @@ -14,10 +14,10 @@ * to another. **/ -#include "or/or.h" -#include "or/config.h" -#include "or/reasons.h" -#include "or/routerlist.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "core/or/reasons.h" +#include "feature/nodelist/routerlist.h" #include "lib/tls/tortls.h" /***************************** Edge (stream) reasons **********************/ diff --git a/src/core/or/relay.c b/src/core/or/relay.c index e8e1762b4..32bb69d25 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -46,53 +46,53 @@ **/ #define RELAY_PRIVATE -#include "or/or.h" -#include "or/addressmap.h" +#include "core/or/or.h" +#include "feature/client/addressmap.h" #include "lib/err/backtrace.h" #include "lib/container/buffers.h" -#include "or/channel.h" -#include "or/circpathbias.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" +#include "core/or/channel.h" +#include "feature/client/circpathbias.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" #include "lib/compress/compress.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/connection_or.h" -#include "or/control.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "core/or/connection_or.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/directory.h" -#include "or/geoip.h" -#include "or/hs_cache.h" -#include "or/main.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/onion.h" -#include "or/policies.h" -#include "or/reasons.h" -#include "or/relay.h" -#include "or/relay_crypto.h" -#include "or/rendcache.h" -#include "or/rendcommon.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/scheduler.h" -#include "or/rephist.h" - -#include "or/cell_st.h" -#include "or/cell_queue_st.h" -#include "or/cpath_build_state_st.h" -#include "or/dir_connection_st.h" -#include "or/destroy_cell_queue_st.h" -#include "or/entry_connection_st.h" -#include "or/extend_info_st.h" -#include "or/or_circuit_st.h" -#include "or/origin_circuit_st.h" -#include "or/routerinfo_st.h" -#include "or/socks_request_st.h" +#include "feature/dircache/directory.h" +#include "feature/stats/geoip.h" +#include "feature/hs/hs_cache.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/crypto/onion.h" +#include "core/or/policies.h" +#include "core/or/reasons.h" +#include "core/or/relay.h" +#include "core/crypto/relay_crypto.h" +#include "feature/rend/rendcache.h" +#include "feature/rend/rendcommon.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "core/or/scheduler.h" +#include "feature/stats/rephist.h" + +#include "core/or/cell_st.h" +#include "core/or/cell_queue_st.h" +#include "core/or/cpath_build_state_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "core/or/destroy_cell_queue_st.h" +#include "core/or/entry_connection_st.h" +#include "core/or/extend_info_st.h" +#include "core/or/or_circuit_st.h" +#include "core/or/origin_circuit_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "core/or/socks_request_st.h" #include "lib/intmath/weakrng.h" diff --git a/src/core/or/scheduler.c b/src/core/or/scheduler.c index b8eaca3dc..e19059f0c 100644 --- a/src/core/or/scheduler.c +++ b/src/core/or/scheduler.c @@ -1,20 +1,20 @@ /* Copyright (c) 2013-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" -#include "or/config.h" +#include "core/or/or.h" +#include "app/config/config.h" #include "lib/evloop/compat_libevent.h" #define SCHEDULER_PRIVATE_ #define SCHEDULER_KIST_PRIVATE -#include "or/scheduler.h" -#include "or/main.h" +#include "core/or/scheduler.h" +#include "core/mainloop/main.h" #include "lib/container/buffers.h" #define TOR_CHANNEL_INTERNAL_ -#include "or/channeltls.h" +#include "core/or/channeltls.h" #include "lib/evloop/compat_libevent.h" -#include "or/or_connection_st.h" +#include "core/or/or_connection_st.h" /** * \file scheduler.c diff --git a/src/core/or/scheduler.h b/src/core/or/scheduler.h index 856923f9a..05a888365 100644 --- a/src/core/or/scheduler.h +++ b/src/core/or/scheduler.h @@ -9,8 +9,8 @@ #ifndef TOR_SCHEDULER_H #define TOR_SCHEDULER_H -#include "or/or.h" -#include "or/channel.h" +#include "core/or/or.h" +#include "core/or/channel.h" #include "lib/testsupport/testsupport.h" /** Scheduler type, we build an ordered list with those values from the diff --git a/src/core/or/scheduler_kist.c b/src/core/or/scheduler_kist.c index 5a45ccab8..449478df7 100644 --- a/src/core/or/scheduler_kist.c +++ b/src/core/or/scheduler_kist.c @@ -3,19 +3,19 @@ #define SCHEDULER_KIST_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "lib/container/buffers.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/networkstatus.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "feature/nodelist/networkstatus.h" #define TOR_CHANNEL_INTERNAL_ -#include "or/channel.h" -#include "or/channeltls.h" +#include "core/or/channel.h" +#include "core/or/channeltls.h" #define SCHEDULER_PRIVATE_ -#include "or/scheduler.h" +#include "core/or/scheduler.h" #include "lib/math/fp.h" -#include "or/or_connection_st.h" +#include "core/or/or_connection_st.h" #define TLS_PER_CELL_OVERHEAD 29 diff --git a/src/core/or/scheduler_vanilla.c b/src/core/or/scheduler_vanilla.c index e05bebb37..db8374ead 100644 --- a/src/core/or/scheduler_vanilla.c +++ b/src/core/or/scheduler_vanilla.c @@ -1,12 +1,12 @@ /* Copyright (c) 2017-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" -#include "or/config.h" +#include "core/or/or.h" +#include "app/config/config.h" #define TOR_CHANNEL_INTERNAL_ -#include "or/channel.h" +#include "core/or/channel.h" #define SCHEDULER_PRIVATE_ -#include "or/scheduler.h" +#include "core/or/scheduler.h" /***************************************************************************** * Other internal data diff --git a/src/core/or/status.c b/src/core/or/status.c index 2259b3aae..30a65b1d4 100644 --- a/src/core/or/status.c +++ b/src/core/or/status.c @@ -14,28 +14,28 @@ #define STATUS_PRIVATE -#include "or/or.h" -#include "or/circuituse.h" -#include "or/config.h" -#include "or/status.h" -#include "or/nodelist.h" -#include "or/relay.h" -#include "or/router.h" -#include "or/circuitlist.h" -#include "or/main.h" -#include "or/rephist.h" -#include "or/hibernate.h" -#include "or/statefile.h" -#include "or/hs_stats.h" -#include "or/hs_service.h" -#include "or/dos.h" - -#include "or/or_state_st.h" -#include "or/routerinfo_st.h" +#include "core/or/or.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" +#include "core/or/status.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/relay.h" +#include "feature/relay/router.h" +#include "core/or/circuitlist.h" +#include "core/mainloop/main.h" +#include "feature/stats/rephist.h" +#include "feature/hibernate/hibernate.h" +#include "app/config/statefile.h" +#include "feature/hs/hs_stats.h" +#include "feature/hs/hs_service.h" +#include "core/or/dos.h" + +#include "app/config/or_state_st.h" +#include "feature/nodelist/routerinfo_st.h" #include "lib/tls/tortls.h" static void log_accounting(const time_t now, const or_options_t *options); -#include "or/geoip.h" +#include "feature/stats/geoip.h" /** Return the total number of circuits. */ STATIC int diff --git a/src/core/proto/proto_cell.c b/src/core/proto/proto_cell.c index 41554bd1b..49b07663d 100644 --- a/src/core/proto/proto_cell.c +++ b/src/core/proto/proto_cell.c @@ -4,13 +4,13 @@ * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" #include "lib/container/buffers.h" -#include "or/proto_cell.h" +#include "core/proto/proto_cell.h" -#include "or/connection_or.h" +#include "core/or/connection_or.h" -#include "or/var_cell_st.h" +#include "core/or/var_cell_st.h" /** True iff the cell command <b>command</b> is one that implies a * variable-length cell in Tor link protocol <b>linkproto</b>. */ diff --git a/src/core/proto/proto_control0.c b/src/core/proto/proto_control0.c index 34e7ddb8d..d26c69753 100644 --- a/src/core/proto/proto_control0.c +++ b/src/core/proto/proto_control0.c @@ -4,9 +4,9 @@ * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" #include "lib/container/buffers.h" -#include "or/proto_control0.h" +#include "core/proto/proto_control0.h" /** Return 1 iff buf looks more like it has an (obsolete) v0 controller * command on it than any valid v1 controller command. */ diff --git a/src/core/proto/proto_ext_or.c b/src/core/proto/proto_ext_or.c index f30d87623..04bec4e6b 100644 --- a/src/core/proto/proto_ext_or.c +++ b/src/core/proto/proto_ext_or.c @@ -4,10 +4,10 @@ * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" #include "lib/container/buffers.h" -#include "or/ext_orport.h" -#include "or/proto_ext_or.h" +#include "feature/relay/ext_orport.h" +#include "core/proto/proto_ext_or.h" /** The size of the header of an Extended ORPort message: 2 bytes for * COMMAND, 2 bytes for BODYLEN */ diff --git a/src/core/proto/proto_http.c b/src/core/proto/proto_http.c index ecc669e3a..37298d128 100644 --- a/src/core/proto/proto_http.c +++ b/src/core/proto/proto_http.c @@ -5,9 +5,9 @@ /* See LICENSE for licensing information */ #define PROTO_HTTP_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "lib/container/buffers.h" -#include "or/proto_http.h" +#include "core/proto/proto_http.h" /** Return true if <b>cmd</b> looks like a HTTP (proxy) request. */ int diff --git a/src/core/proto/proto_socks.c b/src/core/proto/proto_socks.c index f5e6ce581..691244147 100644 --- a/src/core/proto/proto_socks.c +++ b/src/core/proto/proto_socks.c @@ -4,18 +4,18 @@ * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" -#include "or/addressmap.h" +#include "core/or/or.h" +#include "feature/client/addressmap.h" #include "lib/container/buffers.h" -#include "or/connection.h" -#include "or/control.h" -#include "or/config.h" +#include "core/mainloop/connection.h" +#include "feature/control/control.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/ext_orport.h" -#include "or/proto_socks.h" -#include "or/reasons.h" +#include "feature/relay/ext_orport.h" +#include "core/proto/proto_socks.h" +#include "core/or/reasons.h" -#include "or/socks_request_st.h" +#include "core/or/socks_request_st.h" static void socks_request_set_socks5_error(socks_request_t *req, socks5_reply_status_t reason); diff --git a/src/core/proto/protover.c b/src/core/proto/protover.c index f63c13456..3ae91688d 100644 --- a/src/core/proto/protover.c +++ b/src/core/proto/protover.c @@ -23,9 +23,9 @@ #define PROTOVER_PRIVATE -#include "or/or.h" -#include "or/protover.h" -#include "or/routerparse.h" +#include "core/or/or.h" +#include "core/proto/protover.h" +#include "feature/nodelist/routerparse.h" #ifndef HAVE_RUST diff --git a/src/core/proto/protover_rust.c b/src/core/proto/protover_rust.c index bd2f88b98..55b0ebedf 100644 --- a/src/core/proto/protover_rust.c +++ b/src/core/proto/protover_rust.c @@ -7,8 +7,8 @@ * and safe translation/handling between the Rust/C boundary. */ -#include "or/or.h" -#include "or/protover.h" +#include "core/or/or.h" +#include "core/proto/protover.h" #ifdef HAVE_RUST diff --git a/src/feature/api/tor_api.c b/src/feature/api/tor_api.c index efedf2dc7..2a4458bf6 100644 --- a/src/feature/api/tor_api.c +++ b/src/feature/api/tor_api.c @@ -8,8 +8,8 @@ * \file tor_api.c **/ -#include "or/tor_api.h" -#include "or/tor_api_internal.h" +#include "feature/api/tor_api.h" +#include "feature/api/tor_api_internal.h" // Include this after the above headers, to insure that they don't // depend on anything else. diff --git a/src/feature/client/addressmap.c b/src/feature/client/addressmap.c index ba78a5f90..e62d82b7f 100644 --- a/src/feature/client/addressmap.c +++ b/src/feature/client/addressmap.c @@ -17,17 +17,17 @@ #include "lib/crypt_ops/crypto_rand.h" -#include "or/or.h" -#include "or/addressmap.h" -#include "or/circuituse.h" -#include "or/config.h" -#include "or/connection_edge.h" -#include "or/control.h" -#include "or/dns.h" -#include "or/nodelist.h" -#include "or/routerset.h" - -#include "or/entry_connection_st.h" +#include "core/or/or.h" +#include "feature/client/addressmap.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" +#include "core/or/connection_edge.h" +#include "feature/control/control.h" +#include "feature/relay/dns.h" +#include "feature/nodelist/nodelist.h" +#include "feature/nodelist/routerset.h" + +#include "core/or/entry_connection_st.h" /** A client-side struct to remember requests to rewrite addresses * to new addresses. These structs are stored in the hash table diff --git a/src/feature/client/bridges.c b/src/feature/client/bridges.c index ca0a13f2a..4bffe1603 100644 --- a/src/feature/client/bridges.c +++ b/src/feature/client/bridges.c @@ -13,24 +13,24 @@ #define TOR_BRIDGES_PRIVATE -#include "or/or.h" -#include "or/bridges.h" -#include "or/circuitbuild.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/directory.h" -#include "or/entrynodes.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerset.h" -#include "or/transports.h" - -#include "or/extend_info_st.h" -#include "or/node_st.h" -#include "or/routerinfo_st.h" -#include "or/routerstatus_st.h" +#include "core/or/or.h" +#include "feature/client/bridges.h" +#include "core/or/circuitbuild.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "feature/dircache/directory.h" +#include "feature/client/entrynodes.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerset.h" +#include "feature/client/transports.h" + +#include "core/or/extend_info_st.h" +#include "feature/nodelist/node_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerstatus_st.h" /** Information about a configured bridge. Currently this just matches the * ones in the torrc file, but one day we may be able to learn about new diff --git a/src/feature/client/circpathbias.c b/src/feature/client/circpathbias.c index 32b3212d3..1ee29c639 100644 --- a/src/feature/client/circpathbias.c +++ b/src/feature/client/circpathbias.c @@ -21,27 +21,27 @@ * each guard, and stored persistently in the state file. */ -#include "or/or.h" -#include "or/channel.h" -#include "or/circpathbias.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/circuitstats.h" -#include "or/connection_edge.h" -#include "or/config.h" +#include "core/or/or.h" +#include "core/or/channel.h" +#include "feature/client/circpathbias.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "core/or/circuitstats.h" +#include "core/or/connection_edge.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/entrynodes.h" -#include "or/networkstatus.h" -#include "or/relay.h" +#include "feature/client/entrynodes.h" +#include "feature/nodelist/networkstatus.h" +#include "core/or/relay.h" #include "lib/math/fp.h" #include "lib/math/laplace.h" -#include "or/cell_st.h" -#include "or/cpath_build_state_st.h" -#include "or/crypt_path_st.h" -#include "or/extend_info_st.h" -#include "or/origin_circuit_st.h" +#include "core/or/cell_st.h" +#include "core/or/cpath_build_state_st.h" +#include "core/or/crypt_path_st.h" +#include "core/or/extend_info_st.h" +#include "core/or/origin_circuit_st.h" static void pathbias_count_successful_close(origin_circuit_t *circ); static void pathbias_count_collapse(origin_circuit_t *circ); diff --git a/src/feature/client/dnsserv.c b/src/feature/client/dnsserv.c index 6e7525423..31cc3eff7 100644 --- a/src/feature/client/dnsserv.c +++ b/src/feature/client/dnsserv.c @@ -21,19 +21,19 @@ * DNS client. **/ -#include "or/or.h" -#include "or/dnsserv.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/control.h" -#include "or/main.h" -#include "or/policies.h" - -#include "or/control_connection_st.h" -#include "or/entry_connection_st.h" -#include "or/listener_connection_st.h" -#include "or/socks_request_st.h" +#include "core/or/or.h" +#include "feature/client/dnsserv.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "feature/control/control.h" +#include "core/mainloop/main.h" +#include "core/or/policies.h" + +#include "feature/control/control_connection_st.h" +#include "core/or/entry_connection_st.h" +#include "core/or/listener_connection_st.h" +#include "core/or/socks_request_st.h" #include "lib/evloop/compat_libevent.h" #include <event2/dns.h> diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index ba9c30f8b..664be8ce1 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -112,38 +112,38 @@ #define ENTRYNODES_PRIVATE -#include "or/or.h" -#include "or/channel.h" -#include "or/bridges.h" -#include "or/circpathbias.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/circuitstats.h" -#include "or/config.h" -#include "or/confparse.h" -#include "or/connection.h" -#include "or/control.h" +#include "core/or/or.h" +#include "core/or/channel.h" +#include "feature/client/bridges.h" +#include "feature/client/circpathbias.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "core/or/circuitstats.h" +#include "app/config/config.h" +#include "app/config/confparse.h" +#include "core/mainloop/connection.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/directory.h" -#include "or/entrynodes.h" -#include "or/main.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/routerset.h" -#include "or/transports.h" -#include "or/statefile.h" +#include "feature/dircache/directory.h" +#include "feature/client/entrynodes.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/routerset.h" +#include "feature/client/transports.h" +#include "app/config/statefile.h" #include "lib/math/fp.h" #include "lib/encoding/confline.h" -#include "or/node_st.h" -#include "or/origin_circuit_st.h" -#include "or/or_state_st.h" +#include "feature/nodelist/node_st.h" +#include "core/or/origin_circuit_st.h" +#include "app/config/or_state_st.h" #include "lib/crypt_ops/digestset.h" diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index 1d3cb7b95..85d4d2e08 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -90,17 +90,17 @@ **/ #define PT_PRIVATE -#include "or/or.h" -#include "or/bridges.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/circuitbuild.h" -#include "or/transports.h" -#include "or/router.h" -#include "or/statefile.h" -#include "or/connection_or.h" -#include "or/ext_orport.h" -#include "or/control.h" +#include "core/or/or.h" +#include "feature/client/bridges.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/circuitbuild.h" +#include "feature/client/transports.h" +#include "feature/relay/router.h" +#include "app/config/statefile.h" +#include "core/or/connection_or.h" +#include "feature/relay/ext_orport.h" +#include "feature/control/control.h" #include "lib/process/env.h" #include "lib/process/subprocess.h" diff --git a/src/feature/control/control.c b/src/feature/control/control.c index aa43fccff..12f10926b 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -35,70 +35,70 @@ #define CONTROL_PRIVATE -#include "or/or.h" -#include "or/addressmap.h" -#include "or/bridges.h" +#include "core/or/or.h" +#include "feature/client/addressmap.h" +#include "feature/client/bridges.h" #include "lib/container/buffers.h" -#include "or/channel.h" -#include "or/channeltls.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuitstats.h" -#include "or/circuituse.h" -#include "or/command.h" +#include "core/or/channel.h" +#include "core/or/channeltls.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuitstats.h" +#include "core/or/circuituse.h" +#include "core/or/command.h" #include "lib/evloop/compat_libevent.h" -#include "or/config.h" -#include "or/confparse.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/connection_or.h" -#include "or/control.h" +#include "app/config/config.h" +#include "app/config/confparse.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "core/or/connection_or.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/directory.h" -#include "or/dirserv.h" -#include "or/dnsserv.h" -#include "or/entrynodes.h" -#include "or/geoip.h" -#include "or/hibernate.h" -#include "or/hs_cache.h" -#include "or/hs_common.h" -#include "or/hs_control.h" -#include "or/main.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/proto_control0.h" -#include "or/proto_http.h" -#include "or/reasons.h" -#include "or/rendclient.h" -#include "or/rendcommon.h" -#include "or/rendservice.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/shared_random_client.h" +#include "feature/dircache/directory.h" +#include "feature/dircache/dirserv.h" +#include "feature/client/dnsserv.h" +#include "feature/client/entrynodes.h" +#include "feature/stats/geoip.h" +#include "feature/hibernate/hibernate.h" +#include "feature/hs/hs_cache.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_control.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "core/proto/proto_control0.h" +#include "core/proto/proto_http.h" +#include "core/or/reasons.h" +#include "feature/rend/rendclient.h" +#include "feature/rend/rendcommon.h" +#include "feature/rend/rendservice.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "feature/hs_common/shared_random_client.h" #include "lib/encoding/confline.h" -#include "or/cached_dir_st.h" -#include "or/control_connection_st.h" -#include "or/cpath_build_state_st.h" -#include "or/entry_connection_st.h" -#include "or/extrainfo_st.h" -#include "or/networkstatus_st.h" -#include "or/node_st.h" -#include "or/or_connection_st.h" -#include "or/or_circuit_st.h" -#include "or/origin_circuit_st.h" -#include "or/microdesc_st.h" -#include "or/rend_authorized_client_st.h" -#include "or/rend_encoded_v2_service_descriptor_st.h" -#include "or/rend_service_descriptor_st.h" -#include "or/routerinfo_st.h" -#include "or/routerlist_st.h" -#include "or/socks_request_st.h" +#include "feature/dircache/cached_dir_st.h" +#include "feature/control/control_connection_st.h" +#include "core/or/cpath_build_state_st.h" +#include "core/or/entry_connection_st.h" +#include "feature/nodelist/extrainfo_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/node_st.h" +#include "core/or/or_connection_st.h" +#include "core/or/or_circuit_st.h" +#include "core/or/origin_circuit_st.h" +#include "feature/nodelist/microdesc_st.h" +#include "feature/rend/rend_authorized_client_st.h" +#include "feature/rend/rend_encoded_v2_service_descriptor_st.h" +#include "feature/rend/rend_service_descriptor_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerlist_st.h" +#include "core/or/socks_request_st.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/src/feature/control/control_connection_st.h b/src/feature/control/control_connection_st.h index 4f8ab25d9..ff6264a9a 100644 --- a/src/feature/control/control_connection_st.h +++ b/src/feature/control/control_connection_st.h @@ -7,8 +7,8 @@ #ifndef CONTROL_CONNECTION_ST_H #define CONTROL_CONNECTION_ST_H -#include "or/or.h" -#include "or/connection_st.h" +#include "core/or/or.h" +#include "core/or/connection_st.h" /** Subtype of connection_t for an connection to a controller. */ struct control_connection_t { diff --git a/src/feature/dirauth/dircollate.c b/src/feature/dirauth/dircollate.c index 246977dcc..ca8e5b787 100644 --- a/src/feature/dirauth/dircollate.c +++ b/src/feature/dirauth/dircollate.c @@ -22,11 +22,11 @@ */ #define DIRCOLLATE_PRIVATE -#include "or/dirauth/dircollate.h" -#include "or/dirauth/dirvote.h" +#include "feature/dirauth/dircollate.h" +#include "feature/dirauth/dirvote.h" -#include "or/networkstatus_st.h" -#include "or/vote_routerstatus_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/vote_routerstatus_st.h" static void dircollator_collate_by_ed25519(dircollator_t *dc); diff --git a/src/feature/dirauth/dircollate.h b/src/feature/dirauth/dircollate.h index aae782978..0e84c66e6 100644 --- a/src/feature/dirauth/dircollate.h +++ b/src/feature/dirauth/dircollate.h @@ -13,7 +13,7 @@ #define TOR_DIRCOLLATE_H #include "lib/testsupport/testsupport.h" -#include "or/or.h" +#include "core/or/or.h" typedef struct dircollator_s dircollator_t; diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 15f837874..282546567 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4,44 +4,44 @@ /* See LICENSE for licensing information */ #define DIRVOTE_PRIVATE -#include "or/or.h" -#include "or/config.h" -#include "or/dirauth/dircollate.h" -#include "or/directory.h" -#include "or/dirserv.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/parsecommon.h" -#include "or/policies.h" -#include "or/protover.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerkeys.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/entrynodes.h" /* needed for guardfraction methods */ -#include "or/torcert.h" -#include "or/voting_schedule.h" - -#include "or/dirauth/dirvote.h" -#include "or/dirauth/mode.h" -#include "or/dirauth/shared_random_state.h" - -#include "or/authority_cert_st.h" -#include "or/cached_dir_st.h" -#include "or/dir_server_st.h" -#include "or/document_signature_st.h" -#include "or/microdesc_st.h" -#include "or/networkstatus_st.h" -#include "or/networkstatus_voter_info_st.h" -#include "or/node_st.h" -#include "or/ns_detached_signatures_st.h" -#include "or/routerinfo_st.h" -#include "or/routerlist_st.h" -#include "or/vote_microdesc_hash_st.h" -#include "or/vote_routerstatus_st.h" -#include "or/vote_timing_st.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "feature/dirauth/dircollate.h" +#include "feature/dircache/directory.h" +#include "feature/dircache/dirserv.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "feature/nodelist/parsecommon.h" +#include "core/or/policies.h" +#include "core/proto/protover.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/relay/routerkeys.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "feature/client/entrynodes.h" /* needed for guardfraction methods */ +#include "feature/nodelist/torcert.h" +#include "feature/dircommon/voting_schedule.h" + +#include "feature/dirauth/dirvote.h" +#include "feature/dirauth/mode.h" +#include "feature/dirauth/shared_random_state.h" + +#include "feature/nodelist/authority_cert_st.h" +#include "feature/dircache/cached_dir_st.h" +#include "feature/dirclient/dir_server_st.h" +#include "feature/nodelist/document_signature_st.h" +#include "feature/nodelist/microdesc_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/networkstatus_voter_info_st.h" +#include "feature/nodelist/node_st.h" +#include "feature/dirauth/ns_detached_signatures_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerlist_st.h" +#include "feature/dirauth/vote_microdesc_hash_st.h" +#include "feature/nodelist/vote_routerstatus_st.h" +#include "feature/dircommon/vote_timing_st.h" #include "lib/container/order.h" #include "lib/encoding/confline.h" diff --git a/src/feature/dirauth/keypin.c b/src/feature/dirauth/keypin.c index a2f3654b8..44e19985f 100644 --- a/src/feature/dirauth/keypin.c +++ b/src/feature/dirauth/keypin.c @@ -30,7 +30,7 @@ #include "lib/wallclock/approx_time.h" #include "ht.h" -#include "or/keypin.h" +#include "feature/dirauth/keypin.h" #include "siphash.h" diff --git a/src/feature/dirauth/mode.h b/src/feature/dirauth/mode.h index 17c35aff6..8bb961dff 100644 --- a/src/feature/dirauth/mode.h +++ b/src/feature/dirauth/mode.h @@ -11,7 +11,7 @@ #ifdef HAVE_MODULE_DIRAUTH -#include "or/router.h" +#include "feature/relay/router.h" /* Return true iff we believe ourselves to be a v3 authoritative directory * server. */ diff --git a/src/feature/dirauth/shared_random.c b/src/feature/dirauth/shared_random.c index d12269012..8ae267977 100644 --- a/src/feature/dirauth/shared_random.c +++ b/src/feature/dirauth/shared_random.c @@ -87,25 +87,25 @@ #define SHARED_RANDOM_PRIVATE -#include "or/or.h" -#include "or/dirauth/shared_random.h" -#include "or/config.h" -#include "or/confparse.h" +#include "core/or/or.h" +#include "feature/dirauth/shared_random.h" +#include "app/config/config.h" +#include "app/config/confparse.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/networkstatus.h" -#include "or/router.h" -#include "or/routerkeys.h" -#include "or/routerlist.h" -#include "or/shared_random_client.h" -#include "or/dirauth/shared_random_state.h" -#include "or/voting_schedule.h" - -#include "or/dirauth/dirvote.h" -#include "or/dirauth/mode.h" - -#include "or/authority_cert_st.h" -#include "or/networkstatus_st.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/relay/router.h" +#include "feature/relay/routerkeys.h" +#include "feature/nodelist/routerlist.h" +#include "feature/hs_common/shared_random_client.h" +#include "feature/dirauth/shared_random_state.h" +#include "feature/dircommon/voting_schedule.h" + +#include "feature/dirauth/dirvote.h" +#include "feature/dirauth/mode.h" + +#include "feature/nodelist/authority_cert_st.h" +#include "feature/nodelist/networkstatus_st.h" /* String prefix of shared random values in votes/consensuses. */ static const char previous_srv_str[] = "shared-rand-previous-value"; diff --git a/src/feature/dirauth/shared_random.h b/src/feature/dirauth/shared_random.h index 93bab99f7..68ece9aec 100644 --- a/src/feature/dirauth/shared_random.h +++ b/src/feature/dirauth/shared_random.h @@ -10,7 +10,7 @@ * with "sr_" which stands for shared random. */ -#include "or/or.h" +#include "core/or/or.h" /* Protocol version */ #define SR_PROTO_VERSION 1 diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index 87ddcc073..55936a736 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -10,20 +10,20 @@ #define SHARED_RANDOM_STATE_PRIVATE -#include "or/or.h" -#include "or/config.h" -#include "or/confparse.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "app/config/confparse.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/dirauth/dirvote.h" -#include "or/networkstatus.h" -#include "or/router.h" -#include "or/dirauth/shared_random.h" -#include "or/shared_random_client.h" -#include "or/dirauth/shared_random_state.h" -#include "or/voting_schedule.h" +#include "feature/dirauth/dirvote.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/relay/router.h" +#include "feature/dirauth/shared_random.h" +#include "feature/hs_common/shared_random_client.h" +#include "feature/dirauth/shared_random_state.h" +#include "feature/dircommon/voting_schedule.h" #include "lib/encoding/confline.h" -#include "or/or_state_st.h" +#include "app/config/or_state_st.h" /* Default filename of the shared random state on disk. */ static const char default_fname[] = "sr-state"; diff --git a/src/feature/dirauth/shared_random_state.h b/src/feature/dirauth/shared_random_state.h index f99874872..83edfaf10 100644 --- a/src/feature/dirauth/shared_random_state.h +++ b/src/feature/dirauth/shared_random_state.h @@ -4,7 +4,7 @@ #ifndef TOR_SHARED_RANDOM_STATE_H #define TOR_SHARED_RANDOM_STATE_H -#include "or/dirauth/shared_random.h" +#include "feature/dirauth/shared_random.h" /* Action that can be performed on the state for any objects. */ typedef enum { diff --git a/src/feature/dircache/conscache.c b/src/feature/dircache/conscache.c index bc5928ff2..e9bf58a18 100644 --- a/src/feature/dircache/conscache.c +++ b/src/feature/dircache/conscache.c @@ -1,10 +1,10 @@ /* Copyright (c) 2017-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" -#include "or/config.h" -#include "or/conscache.h" +#include "app/config/config.h" +#include "feature/dircache/conscache.h" #include "lib/crypt_ops/crypto_util.h" #include "lib/fs/storagedir.h" #include "lib/encoding/confline.h" diff --git a/src/feature/dircache/consdiffmgr.c b/src/feature/dircache/consdiffmgr.c index 6d5183f93..304b64f3b 100644 --- a/src/feature/dircache/consdiffmgr.c +++ b/src/feature/dircache/consdiffmgr.c @@ -13,21 +13,21 @@ #define CONSDIFFMGR_PRIVATE -#include "or/or.h" -#include "or/config.h" -#include "or/conscache.h" -#include "or/consdiff.h" -#include "or/consdiffmgr.h" -#include "or/cpuworker.h" -#include "or/networkstatus.h" -#include "or/routerparse.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "feature/dircache/conscache.h" +#include "feature/dircommon/consdiff.h" +#include "feature/dircache/consdiffmgr.h" +#include "core/mainloop/cpuworker.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/routerparse.h" #include "lib/evloop/compat_libevent.h" #include "lib/evloop/workqueue.h" #include "lib/compress/compress.h" #include "lib/encoding/confline.h" -#include "or/networkstatus_st.h" -#include "or/networkstatus_voter_info_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/networkstatus_voter_info_st.h" /** * Labels to apply to items in the conscache object. diff --git a/src/feature/dircache/directory.c b/src/feature/dircache/directory.c index 8f2bd8d3a..a72317618 100644 --- a/src/feature/dircache/directory.c +++ b/src/feature/dircache/directory.c @@ -5,44 +5,44 @@ #define DIRECTORY_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "lib/err/backtrace.h" -#include "or/bridges.h" +#include "feature/client/bridges.h" #include "lib/container/buffers.h" -#include "or/circuitbuild.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/conscache.h" -#include "or/consdiff.h" -#include "or/consdiffmgr.h" -#include "or/control.h" +#include "core/or/circuitbuild.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "feature/dircache/conscache.h" +#include "feature/dircommon/consdiff.h" +#include "feature/dircache/consdiffmgr.h" +#include "feature/control/control.h" #include "lib/compress/compress.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/directory.h" -#include "or/dirserv.h" -#include "or/entrynodes.h" -#include "or/fp_pair.h" -#include "or/geoip.h" -#include "or/hs_cache.h" -#include "or/hs_common.h" -#include "or/hs_control.h" -#include "or/hs_client.h" -#include "or/main.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/relay.h" -#include "or/rendclient.h" -#include "or/rendcommon.h" -#include "or/rendservice.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/routerset.h" +#include "feature/dircache/directory.h" +#include "feature/dircache/dirserv.h" +#include "feature/client/entrynodes.h" +#include "feature/dircommon/fp_pair.h" +#include "feature/stats/geoip.h" +#include "feature/hs/hs_cache.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_control.h" +#include "feature/hs/hs_client.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "core/or/relay.h" +#include "feature/rend/rendclient.h" +#include "feature/rend/rendcommon.h" +#include "feature/rend/rendservice.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/routerset.h" #include "lib/encoding/confline.h" #include "lib/crypt_ops/crypto_format.h" @@ -52,19 +52,19 @@ #endif #endif -#include "or/dirauth/dirvote.h" -#include "or/dirauth/mode.h" -#include "or/dirauth/shared_random.h" - -#include "or/authority_cert_st.h" -#include "or/cached_dir_st.h" -#include "or/dir_connection_st.h" -#include "or/dir_server_st.h" -#include "or/entry_connection_st.h" -#include "or/networkstatus_st.h" -#include "or/node_st.h" -#include "or/rend_service_descriptor_st.h" -#include "or/routerinfo_st.h" +#include "feature/dirauth/dirvote.h" +#include "feature/dirauth/mode.h" +#include "feature/dirauth/shared_random.h" + +#include "feature/nodelist/authority_cert_st.h" +#include "feature/dircache/cached_dir_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "feature/dirclient/dir_server_st.h" +#include "core/or/entry_connection_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/node_st.h" +#include "feature/rend/rend_service_descriptor_st.h" +#include "feature/nodelist/routerinfo_st.h" /** * \file directory.c diff --git a/src/feature/dircache/directory.h b/src/feature/dircache/directory.h index 992ff618f..54ea0c584 100644 --- a/src/feature/dircache/directory.h +++ b/src/feature/dircache/directory.h @@ -12,7 +12,7 @@ #ifndef TOR_DIRECTORY_H #define TOR_DIRECTORY_H -#include "or/hs_ident.h" +#include "feature/hs/hs_ident.h" enum compress_method_t; dir_connection_t *TO_DIR_CONN(connection_t *c); diff --git a/src/feature/dircache/dirserv.c b/src/feature/dircache/dirserv.c index 2980d63f0..0e1d0645e 100644 --- a/src/feature/dircache/dirserv.c +++ b/src/feature/dircache/dirserv.c @@ -4,47 +4,47 @@ /* See LICENSE for licensing information */ #define DIRSERV_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "lib/container/buffers.h" -#include "or/config.h" -#include "or/confparse.h" -#include "or/channel.h" -#include "or/channeltls.h" -#include "or/command.h" -#include "or/connection.h" -#include "or/connection_or.h" -#include "or/conscache.h" -#include "or/consdiffmgr.h" -#include "or/control.h" -#include "or/directory.h" -#include "or/dirserv.h" -#include "or/hibernate.h" -#include "or/keypin.h" -#include "or/main.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/protover.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/routerset.h" -#include "or/torcert.h" -#include "or/voting_schedule.h" - -#include "or/dirauth/dirvote.h" - -#include "or/cached_dir_st.h" -#include "or/dir_connection_st.h" -#include "or/extrainfo_st.h" -#include "or/microdesc_st.h" -#include "or/node_st.h" -#include "or/routerinfo_st.h" -#include "or/routerlist_st.h" -#include "or/tor_version_st.h" -#include "or/vote_routerstatus_st.h" +#include "app/config/config.h" +#include "app/config/confparse.h" +#include "core/or/channel.h" +#include "core/or/channeltls.h" +#include "core/or/command.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_or.h" +#include "feature/dircache/conscache.h" +#include "feature/dircache/consdiffmgr.h" +#include "feature/control/control.h" +#include "feature/dircache/directory.h" +#include "feature/dircache/dirserv.h" +#include "feature/hibernate/hibernate.h" +#include "feature/dirauth/keypin.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "core/proto/protover.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/routerset.h" +#include "feature/nodelist/torcert.h" +#include "feature/dircommon/voting_schedule.h" + +#include "feature/dirauth/dirvote.h" + +#include "feature/dircache/cached_dir_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "feature/nodelist/extrainfo_st.h" +#include "feature/nodelist/microdesc_st.h" +#include "feature/nodelist/node_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerlist_st.h" +#include "core/or/tor_version_st.h" +#include "feature/nodelist/vote_routerstatus_st.h" #include "lib/compress/compress.h" #include "lib/container/order.h" diff --git a/src/feature/dirclient/dir_server_st.h b/src/feature/dirclient/dir_server_st.h index fe1f5c3d5..0a6d8155a 100644 --- a/src/feature/dirclient/dir_server_st.h +++ b/src/feature/dirclient/dir_server_st.h @@ -8,8 +8,8 @@ #define DIR_SERVER_ST_H #include "lib/cc/torint.h" -#include "or/or.h" -#include "or/routerstatus_st.h" +#include "core/or/or.h" +#include "feature/nodelist/routerstatus_st.h" /** Represents information about a single trusted or fallback directory * server. */ diff --git a/src/feature/dircommon/consdiff.c b/src/feature/dircommon/consdiff.c index 88edda716..1823dc07f 100644 --- a/src/feature/dircommon/consdiff.c +++ b/src/feature/dircommon/consdiff.c @@ -38,10 +38,10 @@ #define CONSDIFF_PRIVATE -#include "or/or.h" -#include "or/consdiff.h" +#include "core/or/or.h" +#include "feature/dircommon/consdiff.h" #include "lib/memarea/memarea.h" -#include "or/routerparse.h" +#include "feature/nodelist/routerparse.h" static const char* ns_diff_version = "network-status-diff-version 1"; static const char* hash_token = "hash"; diff --git a/src/feature/dircommon/consdiff.h b/src/feature/dircommon/consdiff.h index 1cae59a1a..a5e4ba5cb 100644 --- a/src/feature/dircommon/consdiff.h +++ b/src/feature/dircommon/consdiff.h @@ -5,7 +5,7 @@ #ifndef TOR_CONSDIFF_H #define TOR_CONSDIFF_H -#include "or/or.h" +#include "core/or/or.h" char *consensus_diff_generate(const char *cons1, const char *cons2); diff --git a/src/feature/dircommon/dir_connection_st.h b/src/feature/dircommon/dir_connection_st.h index 1282f82d6..768f6ba81 100644 --- a/src/feature/dircommon/dir_connection_st.h +++ b/src/feature/dircommon/dir_connection_st.h @@ -7,7 +7,7 @@ #ifndef DIR_CONNECTION_ST_H #define DIR_CONNECTION_ST_H -#include "or/connection_st.h" +#include "core/or/connection_st.h" struct tor_compress_state_t; diff --git a/src/feature/dircommon/fp_pair.c b/src/feature/dircommon/fp_pair.c index 1d7b751c2..054414528 100644 --- a/src/feature/dircommon/fp_pair.c +++ b/src/feature/dircommon/fp_pair.c @@ -17,8 +17,8 @@ * certificate for any (ID key, signing key) pair. **/ -#include "or/or.h" -#include "or/fp_pair.h" +#include "core/or/or.h" +#include "feature/dircommon/fp_pair.h" /* Define fp_pair_map_t structures */ diff --git a/src/feature/dircommon/voting_schedule.c b/src/feature/dircommon/voting_schedule.c index 6edde3f22..84c016c2b 100644 --- a/src/feature/dircommon/voting_schedule.c +++ b/src/feature/dircommon/voting_schedule.c @@ -9,13 +9,13 @@ **/ #define VOTING_SCHEDULE_PRIVATE -#include "or/voting_schedule.h" +#include "feature/dircommon/voting_schedule.h" -#include "or/or.h" -#include "or/config.h" -#include "or/networkstatus.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "feature/nodelist/networkstatus.h" -#include "or/networkstatus_st.h" +#include "feature/nodelist/networkstatus_st.h" /* ===== * Vote scheduling diff --git a/src/feature/dircommon/voting_schedule.h b/src/feature/dircommon/voting_schedule.h index 0f27d36d5..0e0b0cc98 100644 --- a/src/feature/dircommon/voting_schedule.h +++ b/src/feature/dircommon/voting_schedule.h @@ -9,7 +9,7 @@ #ifndef TOR_VOTING_SCHEDULE_H #define TOR_VOTING_SCHEDULE_H -#include "or/or.h" +#include "core/or/or.h" /** Scheduling information for a voting interval. */ typedef struct { diff --git a/src/feature/hibernate/hibernate.c b/src/feature/hibernate/hibernate.c index 55de64c13..d37ba5b8b 100644 --- a/src/feature/hibernate/hibernate.c +++ b/src/feature/hibernate/hibernate.c @@ -28,23 +28,23 @@ hibernating, phase 2: */ #define HIBERNATE_PRIVATE -#include "or/or.h" -#include "or/channel.h" -#include "or/channeltls.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/connection_or.h" -#include "or/control.h" +#include "core/or/or.h" +#include "core/or/channel.h" +#include "core/or/channeltls.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "core/or/connection_or.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/hibernate.h" -#include "or/main.h" -#include "or/router.h" -#include "or/statefile.h" +#include "feature/hibernate/hibernate.h" +#include "core/mainloop/main.h" +#include "feature/relay/router.h" +#include "app/config/statefile.h" #include "lib/evloop/compat_libevent.h" -#include "or/or_connection_st.h" -#include "or/or_state_st.h" +#include "core/or/or_connection_st.h" +#include "app/config/or_state_st.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c index 3772e0c0e..58bb10b19 100644 --- a/src/feature/hs/hs_cache.c +++ b/src/feature/hs/hs_cache.c @@ -9,20 +9,20 @@ /* For unit tests.*/ #define HS_CACHE_PRIVATE -#include "or/or.h" -#include "or/config.h" +#include "core/or/or.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_format.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/hs_ident.h" -#include "or/hs_common.h" -#include "or/hs_client.h" -#include "or/hs_descriptor.h" -#include "or/networkstatus.h" -#include "or/rendcache.h" +#include "feature/hs/hs_ident.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_client.h" +#include "feature/hs/hs_descriptor.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/rend/rendcache.h" -#include "or/hs_cache.h" +#include "feature/hs/hs_cache.h" -#include "or/networkstatus_st.h" +#include "feature/nodelist/networkstatus_st.h" static int cached_client_descriptor_has_expired(time_t now, const hs_cache_client_descriptor_t *cached_desc); diff --git a/src/feature/hs/hs_cache.h b/src/feature/hs/hs_cache.h index 1e479700f..7cd4995d2 100644 --- a/src/feature/hs/hs_cache.h +++ b/src/feature/hs/hs_cache.h @@ -11,10 +11,10 @@ #include <stdint.h> -#include "or/hs_common.h" -#include "or/hs_descriptor.h" -#include "or/rendcommon.h" -#include "or/torcert.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_descriptor.h" +#include "feature/rend/rendcommon.h" +#include "feature/nodelist/torcert.h" struct ed25519_public_key_t; diff --git a/src/feature/hs/hs_cell.c b/src/feature/hs/hs_cell.c index f8b76c513..c6ca6746b 100644 --- a/src/feature/hs/hs_cell.c +++ b/src/feature/hs/hs_cell.c @@ -6,16 +6,16 @@ * \brief Hidden service API for cell creation and handling. **/ -#include "or/or.h" -#include "or/config.h" +#include "core/or/or.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/rendservice.h" -#include "or/replaycache.h" +#include "feature/rend/rendservice.h" +#include "feature/hs_common/replaycache.h" -#include "or/hs_cell.h" -#include "or/hs_ntor.h" +#include "feature/hs/hs_cell.h" +#include "core/crypto/hs_ntor.h" -#include "or/origin_circuit_st.h" +#include "core/or/origin_circuit_st.h" /* Trunnel. */ #include "trunnel/ed25519_cert.h" diff --git a/src/feature/hs/hs_cell.h b/src/feature/hs/hs_cell.h index 4a522810c..7b9d7e579 100644 --- a/src/feature/hs/hs_cell.h +++ b/src/feature/hs/hs_cell.h @@ -9,8 +9,8 @@ #ifndef TOR_HS_CELL_H #define TOR_HS_CELL_H -#include "or/or.h" -#include "or/hs_service.h" +#include "core/or/or.h" +#include "feature/hs/hs_service.h" /* An INTRODUCE1 cell requires at least this amount of bytes (see section * 3.2.2 of the specification). Below this value, the cell must be padded. */ diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c index 5a2c7e4e4..cd312e98b 100644 --- a/src/feature/hs/hs_circuit.c +++ b/src/feature/hs/hs_circuit.c @@ -7,38 +7,38 @@ #define HS_CIRCUIT_PRIVATE -#include "or/or.h" -#include "or/circpathbias.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/config.h" +#include "core/or/or.h" +#include "feature/client/circpathbias.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_dh.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/relay.h" -#include "or/rendservice.h" -#include "or/rephist.h" -#include "or/router.h" - -#include "or/hs_cell.h" -#include "or/hs_circuitmap.h" -#include "or/hs_ident.h" -#include "or/hs_ntor.h" -#include "or/hs_service.h" -#include "or/hs_circuit.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "core/or/relay.h" +#include "feature/rend/rendservice.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" + +#include "feature/hs/hs_cell.h" +#include "feature/hs/hs_circuitmap.h" +#include "feature/hs/hs_ident.h" +#include "core/crypto/hs_ntor.h" +#include "feature/hs/hs_service.h" +#include "feature/hs/hs_circuit.h" /* Trunnel. */ #include "trunnel/ed25519_cert.h" #include "trunnel/hs/cell_common.h" #include "trunnel/hs/cell_establish_intro.h" -#include "or/cpath_build_state_st.h" -#include "or/crypt_path_st.h" -#include "or/node_st.h" -#include "or/origin_circuit_st.h" +#include "core/or/cpath_build_state_st.h" +#include "core/or/crypt_path_st.h" +#include "feature/nodelist/node_st.h" +#include "core/or/origin_circuit_st.h" /* A circuit is about to become an e2e rendezvous circuit. Check * <b>circ_purpose</b> and ensure that it's properly set. Return true iff diff --git a/src/feature/hs/hs_circuit.h b/src/feature/hs/hs_circuit.h index 425070f4c..54f28a39a 100644 --- a/src/feature/hs/hs_circuit.h +++ b/src/feature/hs/hs_circuit.h @@ -9,10 +9,10 @@ #ifndef TOR_HS_CIRCUIT_H #define TOR_HS_CIRCUIT_H -#include "or/or.h" +#include "core/or/or.h" #include "lib/crypt_ops/crypto_ed25519.h" -#include "or/hs_service.h" +#include "feature/hs/hs_service.h" /* Cleanup function when the circuit is closed or/and freed. */ void hs_circ_cleanup(circuit_t *circ); diff --git a/src/feature/hs/hs_circuitmap.c b/src/feature/hs/hs_circuitmap.c index c4bf9fab4..962a421a0 100644 --- a/src/feature/hs/hs_circuitmap.c +++ b/src/feature/hs/hs_circuitmap.c @@ -13,13 +13,13 @@ #define HS_CIRCUITMAP_PRIVATE -#include "or/or.h" -#include "or/config.h" -#include "or/circuitlist.h" -#include "or/hs_circuitmap.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "core/or/circuitlist.h" +#include "feature/hs/hs_circuitmap.h" -#include "or/or_circuit_st.h" -#include "or/origin_circuit_st.h" +#include "core/or/or_circuit_st.h" +#include "core/or/origin_circuit_st.h" /************************** HS circuitmap code *******************************/ diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index cc461e368..1f9218e15 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -8,39 +8,39 @@ #define HS_CLIENT_PRIVATE -#include "or/or.h" -#include "or/circpathbias.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_edge.h" +#include "core/or/or.h" +#include "feature/client/circpathbias.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" #include "lib/crypt_ops/crypto_format.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/directory.h" -#include "or/hs_cache.h" -#include "or/hs_cell.h" -#include "or/hs_circuit.h" -#include "or/hs_circuitmap.h" -#include "or/hs_client.h" -#include "or/hs_control.h" -#include "or/hs_descriptor.h" -#include "or/hs_ident.h" -#include "or/hs_ntor.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/reasons.h" -#include "or/rendclient.h" -#include "or/router.h" -#include "or/routerset.h" - -#include "or/cpath_build_state_st.h" -#include "or/dir_connection_st.h" -#include "or/entry_connection_st.h" -#include "or/extend_info_st.h" -#include "or/origin_circuit_st.h" +#include "feature/dircache/directory.h" +#include "feature/hs/hs_cache.h" +#include "feature/hs/hs_cell.h" +#include "feature/hs/hs_circuit.h" +#include "feature/hs/hs_circuitmap.h" +#include "feature/hs/hs_client.h" +#include "feature/hs/hs_control.h" +#include "feature/hs/hs_descriptor.h" +#include "feature/hs/hs_ident.h" +#include "core/crypto/hs_ntor.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/reasons.h" +#include "feature/rend/rendclient.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerset.h" + +#include "core/or/cpath_build_state_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "core/or/entry_connection_st.h" +#include "core/or/extend_info_st.h" +#include "core/or/origin_circuit_st.h" /* Return a human-readable string for the client fetch status code. */ static const char * diff --git a/src/feature/hs/hs_client.h b/src/feature/hs/hs_client.h index 808391074..6ee9f40c0 100644 --- a/src/feature/hs/hs_client.h +++ b/src/feature/hs/hs_client.h @@ -10,8 +10,8 @@ #define TOR_HS_CLIENT_H #include "lib/crypt_ops/crypto_ed25519.h" -#include "or/hs_descriptor.h" -#include "or/hs_ident.h" +#include "feature/hs/hs_descriptor.h" +#include "feature/hs/hs_ident.h" /* Status code of a descriptor fetch request. */ typedef enum { diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c index d91f45a63..723cfa6ea 100644 --- a/src/feature/hs/hs_common.c +++ b/src/feature/hs/hs_common.c @@ -11,33 +11,33 @@ #define HS_COMMON_PRIVATE -#include "or/or.h" +#include "core/or/or.h" -#include "or/config.h" -#include "or/circuitbuild.h" +#include "app/config/config.h" +#include "core/or/circuitbuild.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/hs_cache.h" -#include "or/hs_common.h" -#include "or/hs_client.h" -#include "or/hs_ident.h" -#include "or/hs_service.h" -#include "or/hs_circuitmap.h" -#include "or/policies.h" -#include "or/rendcommon.h" -#include "or/rendservice.h" -#include "or/routerset.h" -#include "or/router.h" -#include "or/shared_random_client.h" -#include "or/dirauth/shared_random_state.h" - -#include "or/edge_connection_st.h" -#include "or/networkstatus_st.h" -#include "or/node_st.h" -#include "or/origin_circuit_st.h" -#include "or/routerstatus_st.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "feature/hs/hs_cache.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_client.h" +#include "feature/hs/hs_ident.h" +#include "feature/hs/hs_service.h" +#include "feature/hs/hs_circuitmap.h" +#include "core/or/policies.h" +#include "feature/rend/rendcommon.h" +#include "feature/rend/rendservice.h" +#include "feature/nodelist/routerset.h" +#include "feature/relay/router.h" +#include "feature/hs_common/shared_random_client.h" +#include "feature/dirauth/shared_random_state.h" + +#include "core/or/edge_connection_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/node_st.h" +#include "core/or/origin_circuit_st.h" +#include "feature/nodelist/routerstatus_st.h" /* Trunnel */ #include "trunnel/ed25519_cert.h" diff --git a/src/feature/hs/hs_common.h b/src/feature/hs/hs_common.h index 24f5f3a20..888eb0a4e 100644 --- a/src/feature/hs/hs_common.h +++ b/src/feature/hs/hs_common.h @@ -9,7 +9,7 @@ #ifndef TOR_HS_COMMON_H #define TOR_HS_COMMON_H -#include "or/or.h" +#include "core/or/or.h" #include "lib/defs/x25519_sizes.h" struct curve25519_public_key_t; diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c index cb55faa9d..2c25a168a 100644 --- a/src/feature/hs/hs_config.c +++ b/src/feature/hs/hs_config.c @@ -25,12 +25,12 @@ #define HS_CONFIG_PRIVATE -#include "or/hs_common.h" -#include "or/hs_config.h" -#include "or/hs_service.h" -#include "or/rendservice.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_config.h" +#include "feature/hs/hs_service.h" +#include "feature/rend/rendservice.h" #include "lib/encoding/confline.h" -#include "or/or_options_st.h" +#include "app/config/or_options_st.h" /* Using the given list of services, stage them into our global state. Every * service version are handled. This function can remove entries in the given diff --git a/src/feature/hs/hs_config.h b/src/feature/hs/hs_config.h index 461d58d38..96eb19ee7 100644 --- a/src/feature/hs/hs_config.h +++ b/src/feature/hs/hs_config.h @@ -9,7 +9,7 @@ #ifndef TOR_HS_CONFIG_H #define TOR_HS_CONFIG_H -#include "or/or.h" +#include "core/or/or.h" /* Max value for HiddenServiceMaxStreams */ #define HS_CONFIG_MAX_STREAMS_PER_RDV_CIRCUIT 65535 diff --git a/src/feature/hs/hs_control.c b/src/feature/hs/hs_control.c index be456e8da..a21788ecd 100644 --- a/src/feature/hs/hs_control.c +++ b/src/feature/hs/hs_control.c @@ -6,18 +6,18 @@ * \brief Contains control port event related code. **/ -#include "or/or.h" -#include "or/control.h" +#include "core/or/or.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_format.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/hs_common.h" -#include "or/hs_control.h" -#include "or/hs_descriptor.h" -#include "or/hs_service.h" -#include "or/nodelist.h" - -#include "or/node_st.h" -#include "or/routerstatus_st.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_control.h" +#include "feature/hs/hs_descriptor.h" +#include "feature/hs/hs_service.h" +#include "feature/nodelist/nodelist.h" + +#include "feature/nodelist/node_st.h" +#include "feature/nodelist/routerstatus_st.h" /* Send on the control port the "HS_DESC REQUESTED [...]" event. * diff --git a/src/feature/hs/hs_control.h b/src/feature/hs/hs_control.h index 040ce4a79..63e3fe13d 100644 --- a/src/feature/hs/hs_control.h +++ b/src/feature/hs/hs_control.h @@ -9,7 +9,7 @@ #ifndef TOR_HS_CONTROL_H #define TOR_HS_CONTROL_H -#include "or/hs_ident.h" +#include "feature/hs/hs_ident.h" /* Event "HS_DESC REQUESTED [...]" */ void hs_control_desc_event_requested(const ed25519_public_key_t *onion_pk, diff --git a/src/feature/hs/hs_descriptor.c b/src/feature/hs/hs_descriptor.c index 5fd8971dc..392800016 100644 --- a/src/feature/hs/hs_descriptor.c +++ b/src/feature/hs/hs_descriptor.c @@ -55,21 +55,21 @@ /* For unit tests.*/ #define HS_DESCRIPTOR_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "trunnel/ed25519_cert.h" /* Trunnel interface. */ -#include "or/hs_descriptor.h" -#include "or/circuitbuild.h" +#include "feature/hs/hs_descriptor.h" +#include "core/or/circuitbuild.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/parsecommon.h" -#include "or/rendcache.h" -#include "or/hs_cache.h" -#include "or/hs_config.h" -#include "or/torcert.h" /* tor_cert_encode_ed22519() */ +#include "feature/nodelist/parsecommon.h" +#include "feature/rend/rendcache.h" +#include "feature/hs/hs_cache.h" +#include "feature/hs/hs_config.h" +#include "feature/nodelist/torcert.h" /* tor_cert_encode_ed22519() */ #include "lib/memarea/memarea.h" #include "lib/crypt_ops/crypto_format.h" -#include "or/extend_info_st.h" +#include "core/or/extend_info_st.h" /* Constant string value used for the descriptor format. */ #define str_hs_desc "hs-descriptor" diff --git a/src/feature/hs/hs_descriptor.h b/src/feature/hs/hs_descriptor.h index 7a4010cd3..bfdf7559c 100644 --- a/src/feature/hs/hs_descriptor.h +++ b/src/feature/hs/hs_descriptor.h @@ -11,9 +11,9 @@ #include <stdint.h> -#include "or/or.h" +#include "core/or/or.h" #include "trunnel/ed25519_cert.h" /* needed for trunnel */ -#include "or/torcert.h" +#include "feature/nodelist/torcert.h" /* Trunnel */ struct link_specifier_t; diff --git a/src/feature/hs/hs_ident.c b/src/feature/hs/hs_ident.c index 20539ca87..c6ef8c2ce 100644 --- a/src/feature/hs/hs_ident.c +++ b/src/feature/hs/hs_ident.c @@ -8,7 +8,7 @@ **/ #include "lib/crypt_ops/crypto_util.h" -#include "or/hs_ident.h" +#include "feature/hs/hs_ident.h" /* Return a newly allocated circuit identifier. The given public key is copied * identity_pk into the identifier. */ diff --git a/src/feature/hs/hs_ident.h b/src/feature/hs/hs_ident.h index 8c53b9dbe..92d15b052 100644 --- a/src/feature/hs/hs_ident.h +++ b/src/feature/hs/hs_ident.h @@ -23,7 +23,7 @@ #include "lib/crypt_ops/crypto_ed25519.h" -#include "or/hs_common.h" +#include "feature/hs/hs_common.h" /* Length of the rendezvous cookie that is used to connect circuits at the * rendezvous point. */ diff --git a/src/feature/hs/hs_intropoint.c b/src/feature/hs/hs_intropoint.c index 259405867..42092e22b 100644 --- a/src/feature/hs/hs_intropoint.c +++ b/src/feature/hs/hs_intropoint.c @@ -8,13 +8,13 @@ #define HS_INTROPOINT_PRIVATE -#include "or/or.h" -#include "or/config.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/relay.h" -#include "or/rendmid.h" -#include "or/rephist.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "core/or/relay.h" +#include "feature/rend/rendmid.h" +#include "feature/stats/rephist.h" #include "lib/crypt_ops/crypto_format.h" /* Trunnel */ @@ -23,12 +23,12 @@ #include "trunnel/hs/cell_establish_intro.h" #include "trunnel/hs/cell_introduce1.h" -#include "or/hs_circuitmap.h" -#include "or/hs_descriptor.h" -#include "or/hs_intropoint.h" -#include "or/hs_common.h" +#include "feature/hs/hs_circuitmap.h" +#include "feature/hs/hs_descriptor.h" +#include "feature/hs/hs_intropoint.h" +#include "feature/hs/hs_common.h" -#include "or/or_circuit_st.h" +#include "core/or/or_circuit_st.h" /** Extract the authentication key from an ESTABLISH_INTRO or INTRODUCE1 using * the given <b>cell_type</b> from <b>cell</b> and place it in diff --git a/src/feature/hs/hs_intropoint.h b/src/feature/hs/hs_intropoint.h index 5f8292099..562836fb0 100644 --- a/src/feature/hs/hs_intropoint.h +++ b/src/feature/hs/hs_intropoint.h @@ -10,7 +10,7 @@ #define TOR_HS_INTRO_H #include "lib/crypt_ops/crypto_curve25519.h" -#include "or/torcert.h" +#include "feature/nodelist/torcert.h" /* Authentication key type in an ESTABLISH_INTRO cell. */ typedef enum { diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index 6cb01b57c..8b4de2138 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -8,45 +8,45 @@ #define HS_SERVICE_PRIVATE -#include "or/or.h" -#include "or/circpathbias.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/config.h" -#include "or/connection.h" +#include "core/or/or.h" +#include "feature/client/circpathbias.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/directory.h" -#include "or/main.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/relay.h" -#include "or/rendservice.h" -#include "or/router.h" -#include "or/routerkeys.h" -#include "or/routerlist.h" -#include "or/shared_random_client.h" -#include "or/statefile.h" - -#include "or/hs_circuit.h" -#include "or/hs_common.h" -#include "or/hs_config.h" -#include "or/hs_control.h" -#include "or/hs_descriptor.h" -#include "or/hs_ident.h" -#include "or/hs_intropoint.h" -#include "or/hs_service.h" -#include "or/hs_stats.h" - -#include "or/dir_connection_st.h" -#include "or/edge_connection_st.h" -#include "or/extend_info_st.h" -#include "or/networkstatus_st.h" -#include "or/node_st.h" -#include "or/origin_circuit_st.h" -#include "or/or_state_st.h" -#include "or/routerstatus_st.h" +#include "feature/dircache/directory.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/relay.h" +#include "feature/rend/rendservice.h" +#include "feature/relay/router.h" +#include "feature/relay/routerkeys.h" +#include "feature/nodelist/routerlist.h" +#include "feature/hs_common/shared_random_client.h" +#include "app/config/statefile.h" + +#include "feature/hs/hs_circuit.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_config.h" +#include "feature/hs/hs_control.h" +#include "feature/hs/hs_descriptor.h" +#include "feature/hs/hs_ident.h" +#include "feature/hs/hs_intropoint.h" +#include "feature/hs/hs_service.h" +#include "feature/hs/hs_stats.h" + +#include "feature/dircommon/dir_connection_st.h" +#include "core/or/edge_connection_st.h" +#include "core/or/extend_info_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/node_st.h" +#include "core/or/origin_circuit_st.h" +#include "app/config/or_state_st.h" +#include "feature/nodelist/routerstatus_st.h" #include "lib/encoding/confline.h" #include "lib/crypt_ops/crypto_format.h" diff --git a/src/feature/hs/hs_service.h b/src/feature/hs/hs_service.h index 4676042b5..22bfcacc2 100644 --- a/src/feature/hs/hs_service.h +++ b/src/feature/hs/hs_service.h @@ -11,12 +11,12 @@ #include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_ed25519.h" -#include "or/replaycache.h" +#include "feature/hs_common/replaycache.h" -#include "or/hs_common.h" -#include "or/hs_descriptor.h" -#include "or/hs_ident.h" -#include "or/hs_intropoint.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_descriptor.h" +#include "feature/hs/hs_ident.h" +#include "feature/hs/hs_intropoint.h" /* Trunnel */ #include "trunnel/hs/cell_establish_intro.h" diff --git a/src/feature/hs/hs_stats.c b/src/feature/hs/hs_stats.c index c8a99b19d..b109a37cc 100644 --- a/src/feature/hs/hs_stats.c +++ b/src/feature/hs/hs_stats.c @@ -6,9 +6,9 @@ * \brief Keeps stats about the activity of our onion service(s). **/ -#include "or/or.h" -#include "or/hs_stats.h" -#include "or/hs_service.h" +#include "core/or/or.h" +#include "feature/hs/hs_stats.h" +#include "feature/hs/hs_service.h" /** Number of v3 INTRODUCE2 cells received */ static uint32_t n_introduce2_v3 = 0; diff --git a/src/feature/hs_common/replaycache.c b/src/feature/hs_common/replaycache.c index b5cc6a282..1d3f20e81 100644 --- a/src/feature/hs_common/replaycache.c +++ b/src/feature/hs_common/replaycache.c @@ -21,8 +21,8 @@ #define REPLAYCACHE_PRIVATE -#include "or/or.h" -#include "or/replaycache.h" +#include "core/or/or.h" +#include "feature/hs_common/replaycache.h" /** Free the replaycache r and all of its entries. */ diff --git a/src/feature/hs_common/shared_random_client.c b/src/feature/hs_common/shared_random_client.c index 42a5b42f6..329f053d3 100644 --- a/src/feature/hs_common/shared_random_client.c +++ b/src/feature/hs_common/shared_random_client.c @@ -9,14 +9,14 @@ **/ #define SHARED_RANDOM_CLIENT_PRIVATE -#include "or/shared_random_client.h" +#include "feature/hs_common/shared_random_client.h" -#include "or/config.h" -#include "or/voting_schedule.h" -#include "or/networkstatus.h" +#include "app/config/config.h" +#include "feature/dircommon/voting_schedule.h" +#include "feature/nodelist/networkstatus.h" #include "lib/encoding/binascii.h" -#include "or/networkstatus_st.h" +#include "feature/nodelist/networkstatus_st.h" /* Convert a given srv object to a string for the control port. This doesn't * fail and the srv object MUST be valid. */ diff --git a/src/feature/hs_common/shared_random_client.h b/src/feature/hs_common/shared_random_client.h index 079829496..497a015c1 100644 --- a/src/feature/hs_common/shared_random_client.h +++ b/src/feature/hs_common/shared_random_client.h @@ -10,7 +10,7 @@ #define TOR_SHARED_RANDOM_CLIENT_H /* Dirauth module. */ -#include "or/dirauth/shared_random.h" +#include "feature/dirauth/shared_random.h" /* Helper functions. */ void sr_srv_encode(char *dst, size_t dst_len, const sr_srv_t *srv); diff --git a/src/feature/nodelist/authority_cert_st.h b/src/feature/nodelist/authority_cert_st.h index 19c3fda2d..c2846548c 100644 --- a/src/feature/nodelist/authority_cert_st.h +++ b/src/feature/nodelist/authority_cert_st.h @@ -7,7 +7,7 @@ #ifndef AUTHORITY_CERT_ST_H #define AUTHORITY_CERT_ST_H -#include "or/signed_descriptor_st.h" +#include "feature/nodelist/signed_descriptor_st.h" /** Certificate for v3 directory protocol: binds long-term authority identity * keys to medium-term authority signing keys. */ diff --git a/src/feature/nodelist/extrainfo_st.h b/src/feature/nodelist/extrainfo_st.h index f91bba7b6..f5d977e75 100644 --- a/src/feature/nodelist/extrainfo_st.h +++ b/src/feature/nodelist/extrainfo_st.h @@ -7,7 +7,7 @@ #ifndef EXTRAINFO_ST_H #define EXTRAINFO_ST_H -#include "or/signed_descriptor_st.h" +#include "feature/nodelist/signed_descriptor_st.h" /** Information needed to keep and cache a signed extra-info document. */ struct extrainfo_t { diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c index 95c5e8b6f..4d6285d6c 100644 --- a/src/feature/nodelist/microdesc.c +++ b/src/feature/nodelist/microdesc.c @@ -8,27 +8,27 @@ * less-frequently-changing router information. */ -#include "or/or.h" +#include "core/or/or.h" #include "lib/fdio/fdio.h" -#include "or/circuitbuild.h" -#include "or/config.h" -#include "or/directory.h" -#include "or/dirserv.h" -#include "or/entrynodes.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerparse.h" - -#include "or/microdesc_st.h" -#include "or/networkstatus_st.h" -#include "or/node_st.h" -#include "or/routerstatus_st.h" +#include "core/or/circuitbuild.h" +#include "app/config/config.h" +#include "feature/dircache/directory.h" +#include "feature/dircache/dirserv.h" +#include "feature/client/entrynodes.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" + +#include "feature/nodelist/microdesc_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/node_st.h" +#include "feature/nodelist/routerstatus_st.h" #ifdef HAVE_FCNTL_H #include <fcntl.h> diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index f91e46cdd..366410d68 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -37,56 +37,56 @@ */ #define NETWORKSTATUS_PRIVATE -#include "or/or.h" -#include "or/bridges.h" -#include "or/channel.h" -#include "or/circuitmux.h" -#include "or/circuitmux_ewma.h" -#include "or/circuitstats.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/connection_or.h" -#include "or/consdiffmgr.h" -#include "or/control.h" +#include "core/or/or.h" +#include "feature/client/bridges.h" +#include "core/or/channel.h" +#include "core/or/circuitmux.h" +#include "core/or/circuitmux_ewma.h" +#include "core/or/circuitstats.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "core/or/connection_or.h" +#include "feature/dircache/consdiffmgr.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/directory.h" -#include "or/dirserv.h" -#include "or/dos.h" -#include "or/entrynodes.h" -#include "or/hibernate.h" -#include "or/main.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/protover.h" -#include "or/relay.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/scheduler.h" -#include "or/transports.h" -#include "or/torcert.h" -#include "or/channelpadding.h" -#include "or/voting_schedule.h" - -#include "or/dirauth/dirvote.h" -#include "or/dirauth/mode.h" -#include "or/dirauth/shared_random.h" - -#include "or/authority_cert_st.h" -#include "or/dir_connection_st.h" -#include "or/dir_server_st.h" -#include "or/document_signature_st.h" -#include "or/networkstatus_st.h" -#include "or/networkstatus_voter_info_st.h" -#include "or/ns_detached_signatures_st.h" -#include "or/node_st.h" -#include "or/routerinfo_st.h" -#include "or/routerlist_st.h" -#include "or/vote_microdesc_hash_st.h" -#include "or/vote_routerstatus_st.h" +#include "feature/dircache/directory.h" +#include "feature/dircache/dirserv.h" +#include "core/or/dos.h" +#include "feature/client/entrynodes.h" +#include "feature/hibernate/hibernate.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/proto/protover.h" +#include "core/or/relay.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "core/or/scheduler.h" +#include "feature/client/transports.h" +#include "feature/nodelist/torcert.h" +#include "core/or/channelpadding.h" +#include "feature/dircommon/voting_schedule.h" + +#include "feature/dirauth/dirvote.h" +#include "feature/dirauth/mode.h" +#include "feature/dirauth/shared_random.h" + +#include "feature/nodelist/authority_cert_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "feature/dirclient/dir_server_st.h" +#include "feature/nodelist/document_signature_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/networkstatus_voter_info_st.h" +#include "feature/dirauth/ns_detached_signatures_st.h" +#include "feature/nodelist/node_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerlist_st.h" +#include "feature/dirauth/vote_microdesc_hash_st.h" +#include "feature/nodelist/vote_routerstatus_st.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/src/feature/nodelist/networkstatus_st.h b/src/feature/nodelist/networkstatus_st.h index 4a193ad14..46b0f53c0 100644 --- a/src/feature/nodelist/networkstatus_st.h +++ b/src/feature/nodelist/networkstatus_st.h @@ -7,7 +7,7 @@ #ifndef NETWORKSTATUS_ST_H #define NETWORKSTATUS_ST_H -#include "or/networkstatus_sr_info_st.h" +#include "feature/nodelist/networkstatus_sr_info_st.h" /** Enumerates the possible seriousness values of a networkstatus document. */ typedef enum networkstatus_type_t { diff --git a/src/feature/nodelist/node_st.h b/src/feature/nodelist/node_st.h index d56ce2788..8d182050a 100644 --- a/src/feature/nodelist/node_st.h +++ b/src/feature/nodelist/node_st.h @@ -7,7 +7,7 @@ #ifndef NODE_ST_H #define NODE_ST_H -#include "or/hsdir_index_st.h" +#include "feature/hs/hsdir_index_st.h" #include "lib/crypt_ops/crypto_ed25519.h" /** A node_t represents a Tor router. diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index 51fd0015d..e434dd2d1 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -40,41 +40,41 @@ #define NODELIST_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "lib/net/address.h" -#include "or/address_set.h" -#include "or/bridges.h" -#include "or/config.h" -#include "or/control.h" -#include "or/dirserv.h" -#include "or/entrynodes.h" -#include "or/geoip.h" -#include "or/hs_common.h" -#include "or/hs_client.h" -#include "or/main.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/protover.h" -#include "or/rendservice.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/routerset.h" -#include "or/torcert.h" +#include "core/or/address_set.h" +#include "feature/client/bridges.h" +#include "app/config/config.h" +#include "feature/control/control.h" +#include "feature/dircache/dirserv.h" +#include "feature/client/entrynodes.h" +#include "feature/stats/geoip.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_client.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "core/proto/protover.h" +#include "feature/rend/rendservice.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/routerset.h" +#include "feature/nodelist/torcert.h" #include <string.h> -#include "or/dirauth/mode.h" +#include "feature/dirauth/mode.h" -#include "or/dir_server_st.h" -#include "or/microdesc_st.h" -#include "or/networkstatus_st.h" -#include "or/node_st.h" -#include "or/routerinfo_st.h" -#include "or/routerlist_st.h" -#include "or/routerstatus_st.h" +#include "feature/dirclient/dir_server_st.h" +#include "feature/nodelist/microdesc_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/node_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerlist_st.h" +#include "feature/nodelist/routerstatus_st.h" static void nodelist_drop_node(node_t *node, int remove_from_ht); #define node_free(val) \ diff --git a/src/feature/nodelist/parsecommon.c b/src/feature/nodelist/parsecommon.c index 4340f2822..4f1c3fd42 100644 --- a/src/feature/nodelist/parsecommon.c +++ b/src/feature/nodelist/parsecommon.c @@ -6,7 +6,7 @@ * \brief Common code to parse and validate various type of descriptors. **/ -#include "or/parsecommon.h" +#include "feature/nodelist/parsecommon.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" #include "lib/encoding/binascii.h" diff --git a/src/feature/nodelist/routerinfo_st.h b/src/feature/nodelist/routerinfo_st.h index 89a7702b3..ca8fd40e3 100644 --- a/src/feature/nodelist/routerinfo_st.h +++ b/src/feature/nodelist/routerinfo_st.h @@ -7,7 +7,7 @@ #ifndef ROUTERINFO_ST_H #define ROUTERINFO_ST_H -#include "or/signed_descriptor_st.h" +#include "feature/nodelist/signed_descriptor_st.h" struct curve25519_public_key_t; diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index 76a236ff2..0ff38f56e 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -91,53 +91,53 @@ **/ #define ROUTERLIST_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "lib/err/backtrace.h" -#include "or/bridges.h" +#include "feature/client/bridges.h" #include "lib/crypt_ops/crypto_ed25519.h" #include "lib/crypt_ops/crypto_format.h" -#include "or/circuitstats.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/control.h" +#include "core/or/circuitstats.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/directory.h" -#include "or/dirserv.h" -#include "or/entrynodes.h" -#include "or/fp_pair.h" -#include "or/geoip.h" -#include "or/hibernate.h" -#include "or/main.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/reasons.h" -#include "or/rendcommon.h" -#include "or/rendservice.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/routerset.h" +#include "feature/dircache/directory.h" +#include "feature/dircache/dirserv.h" +#include "feature/client/entrynodes.h" +#include "feature/dircommon/fp_pair.h" +#include "feature/stats/geoip.h" +#include "feature/hibernate/hibernate.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "core/or/reasons.h" +#include "feature/rend/rendcommon.h" +#include "feature/rend/rendservice.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/routerset.h" #include "lib/sandbox/sandbox.h" -#include "or/torcert.h" +#include "feature/nodelist/torcert.h" #include "lib/math/fp.h" -#include "or/dirauth/dirvote.h" -#include "or/dirauth/mode.h" - -#include "or/authority_cert_st.h" -#include "or/dir_connection_st.h" -#include "or/dir_server_st.h" -#include "or/document_signature_st.h" -#include "or/extrainfo_st.h" -#include "or/networkstatus_st.h" -#include "or/networkstatus_voter_info_st.h" -#include "or/node_st.h" -#include "or/routerinfo_st.h" -#include "or/routerlist_st.h" -#include "or/vote_routerstatus_st.h" +#include "feature/dirauth/dirvote.h" +#include "feature/dirauth/mode.h" + +#include "feature/nodelist/authority_cert_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "feature/dirclient/dir_server_st.h" +#include "feature/nodelist/document_signature_st.h" +#include "feature/nodelist/extrainfo_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/networkstatus_voter_info_st.h" +#include "feature/nodelist/node_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerlist_st.h" +#include "feature/nodelist/vote_routerstatus_st.h" #include "lib/crypt_ops/digestset.h" diff --git a/src/feature/nodelist/routerlist_st.h b/src/feature/nodelist/routerlist_st.h index 0b94a4dfc..26cc66138 100644 --- a/src/feature/nodelist/routerlist_st.h +++ b/src/feature/nodelist/routerlist_st.h @@ -7,7 +7,7 @@ #ifndef ROUTERLIST_ST_H #define ROUTERLIST_ST_H -#include "or/desc_store_st.h" +#include "feature/nodelist/desc_store_st.h" /** Contents of a directory of onion routers. */ struct routerlist_t { diff --git a/src/feature/nodelist/routerparse.c b/src/feature/nodelist/routerparse.c index 273666046..e1dfe972d 100644 --- a/src/feature/nodelist/routerparse.c +++ b/src/feature/nodelist/routerparse.c @@ -55,50 +55,50 @@ #define ROUTERPARSE_PRIVATE -#include "or/or.h" -#include "or/circuitstats.h" -#include "or/config.h" +#include "core/or/or.h" +#include "core/or/circuitstats.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_format.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/dirauth/shared_random.h" -#include "or/dirserv.h" -#include "or/entrynodes.h" +#include "feature/dirauth/shared_random.h" +#include "feature/dircache/dirserv.h" +#include "feature/client/entrynodes.h" #include "lib/memarea/memarea.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/parsecommon.h" -#include "or/policies.h" -#include "or/protover.h" -#include "or/rendcommon.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerkeys.h" -#include "or/routerlist.h" -#include "or/routerparse.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/parsecommon.h" +#include "core/or/policies.h" +#include "core/proto/protover.h" +#include "feature/rend/rendcommon.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/relay/routerkeys.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" #include "lib/sandbox/sandbox.h" -#include "or/shared_random_client.h" -#include "or/torcert.h" -#include "or/voting_schedule.h" - -#include "or/dirauth/dirvote.h" - -#include "or/addr_policy_st.h" -#include "or/authority_cert_st.h" -#include "or/document_signature_st.h" -#include "or/extend_info_st.h" -#include "or/extrainfo_st.h" -#include "or/microdesc_st.h" -#include "or/networkstatus_st.h" -#include "or/networkstatus_voter_info_st.h" -#include "or/ns_detached_signatures_st.h" -#include "or/rend_authorized_client_st.h" -#include "or/rend_intro_point_st.h" -#include "or/rend_service_descriptor_st.h" -#include "or/routerinfo_st.h" -#include "or/routerlist_st.h" -#include "or/tor_version_st.h" -#include "or/vote_microdesc_hash_st.h" -#include "or/vote_routerstatus_st.h" +#include "feature/hs_common/shared_random_client.h" +#include "feature/nodelist/torcert.h" +#include "feature/dircommon/voting_schedule.h" + +#include "feature/dirauth/dirvote.h" + +#include "core/or/addr_policy_st.h" +#include "feature/nodelist/authority_cert_st.h" +#include "feature/nodelist/document_signature_st.h" +#include "core/or/extend_info_st.h" +#include "feature/nodelist/extrainfo_st.h" +#include "feature/nodelist/microdesc_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/networkstatus_voter_info_st.h" +#include "feature/dirauth/ns_detached_signatures_st.h" +#include "feature/rend/rend_authorized_client_st.h" +#include "feature/rend/rend_intro_point_st.h" +#include "feature/rend/rend_service_descriptor_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerlist_st.h" +#include "core/or/tor_version_st.h" +#include "feature/dirauth/vote_microdesc_hash_st.h" +#include "feature/nodelist/vote_routerstatus_st.h" #include "lib/container/bloomfilt.h" diff --git a/src/feature/nodelist/routerset.c b/src/feature/nodelist/routerset.c index 285ef9d82..cd4269774 100644 --- a/src/feature/nodelist/routerset.c +++ b/src/feature/nodelist/routerset.c @@ -27,20 +27,20 @@ n * Copyright (c) 2001-2004, Roger Dingledine. #define ROUTERSET_PRIVATE -#include "or/or.h" -#include "or/bridges.h" -#include "or/geoip.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/router.h" -#include "or/routerparse.h" -#include "or/routerset.h" - -#include "or/addr_policy_st.h" -#include "or/extend_info_st.h" -#include "or/node_st.h" -#include "or/routerinfo_st.h" -#include "or/routerstatus_st.h" +#include "core/or/or.h" +#include "feature/client/bridges.h" +#include "feature/stats/geoip.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/routerset.h" + +#include "core/or/addr_policy_st.h" +#include "core/or/extend_info_st.h" +#include "feature/nodelist/node_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerstatus_st.h" /** Return a new empty routerset. */ routerset_t * diff --git a/src/feature/nodelist/routerstatus_st.h b/src/feature/nodelist/routerstatus_st.h index 3de4a40ae..714aa2743 100644 --- a/src/feature/nodelist/routerstatus_st.h +++ b/src/feature/nodelist/routerstatus_st.h @@ -7,7 +7,7 @@ #ifndef ROUTERSTATUS_ST_H #define ROUTERSTATUS_ST_H -#include "or/download_status_st.h" +#include "feature/dirclient/download_status_st.h" /** Contents of a single router entry in a network status object. */ diff --git a/src/feature/nodelist/signed_descriptor_st.h b/src/feature/nodelist/signed_descriptor_st.h index 90cd4a270..bffad6289 100644 --- a/src/feature/nodelist/signed_descriptor_st.h +++ b/src/feature/nodelist/signed_descriptor_st.h @@ -7,7 +7,7 @@ #ifndef SIGNED_DESCRIPTOR_ST_H #define SIGNED_DESCRIPTOR_ST_H -#include "or/download_status_st.h" +#include "feature/dirclient/download_status_st.h" /** Information need to cache an onion router's descriptor. */ struct signed_descriptor_t { diff --git a/src/feature/nodelist/torcert.c b/src/feature/nodelist/torcert.c index 39c6605c6..172d4f9de 100644 --- a/src/feature/nodelist/torcert.c +++ b/src/feature/nodelist/torcert.c @@ -25,16 +25,16 @@ * that one is authority_cert_t, and it's mostly handled in routerlist.c. */ -#include "or/or.h" -#include "or/config.h" +#include "core/or/or.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/torcert.h" +#include "feature/nodelist/torcert.h" #include "trunnel/ed25519_cert.h" #include "lib/log/torlog.h" #include "trunnel/link_handshake.h" #include "lib/tls/tortls.h" -#include "or/or_handshake_certs_st.h" +#include "core/or/or_handshake_certs_st.h" /** Helper for tor_cert_create(): signs any 32 bytes, not just an ed25519 * key. diff --git a/src/feature/nodelist/vote_routerstatus_st.h b/src/feature/nodelist/vote_routerstatus_st.h index 1b85737df..ad0d35b4e 100644 --- a/src/feature/nodelist/vote_routerstatus_st.h +++ b/src/feature/nodelist/vote_routerstatus_st.h @@ -7,7 +7,7 @@ #ifndef VOTE_ROUTERSTATUS_ST_H #define VOTE_ROUTERSTATUS_ST_H -#include "or/routerstatus_st.h" +#include "feature/nodelist/routerstatus_st.h" #include "lib/defs/x25519_sizes.h" /** The claim about a single router, made in a vote. */ diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 4ac58552f..f4e39dfd3 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -49,25 +49,25 @@ #define DNS_PRIVATE -#include "or/or.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/control.h" +#include "core/or/or.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/dns.h" -#include "or/main.h" -#include "or/policies.h" -#include "or/relay.h" -#include "or/router.h" +#include "feature/relay/dns.h" +#include "core/mainloop/main.h" +#include "core/or/policies.h" +#include "core/or/relay.h" +#include "feature/relay/router.h" #include "ht.h" #include "lib/sandbox/sandbox.h" #include "lib/evloop/compat_libevent.h" -#include "or/edge_connection_st.h" -#include "or/or_circuit_st.h" +#include "core/or/edge_connection_st.h" +#include "core/or/or_circuit_st.h" #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> diff --git a/src/feature/relay/dns.h b/src/feature/relay/dns.h index 12853205f..69c1764b7 100644 --- a/src/feature/relay/dns.h +++ b/src/feature/relay/dns.h @@ -41,7 +41,7 @@ void dns_reset_correctness_checks(void); void dump_dns_mem_usage(int severity); #ifdef DNS_PRIVATE -#include "or/dns_structs.h" +#include "feature/relay/dns_structs.h" MOCK_DECL(STATIC int,dns_resolve_impl,(edge_connection_t *exitconn, int is_resolve,or_circuit_t *oncirc, char **hostname_out, diff --git a/src/feature/relay/ext_orport.c b/src/feature/relay/ext_orport.c index 7342a66e0..7de57ac65 100644 --- a/src/feature/relay/ext_orport.c +++ b/src/feature/relay/ext_orport.c @@ -17,18 +17,18 @@ */ #define EXT_ORPORT_PRIVATE -#include "or/or.h" -#include "or/connection.h" -#include "or/connection_or.h" -#include "or/control.h" -#include "or/config.h" +#include "core/or/or.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_or.h" +#include "feature/control/control.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/ext_orport.h" -#include "or/main.h" -#include "or/proto_ext_or.h" +#include "feature/relay/ext_orport.h" +#include "core/mainloop/main.h" +#include "core/proto/proto_ext_or.h" -#include "or/or_connection_st.h" +#include "core/or/or_connection_st.h" /** Allocate and return a structure capable of holding an Extended * ORPort message of body length <b>len</b>. */ diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 44af1e310..c52ac1f9c 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -6,50 +6,50 @@ #define ROUTER_PRIVATE -#include "or/or.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/control.h" +#include "core/or/or.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_curve25519.h" -#include "or/directory.h" -#include "or/dirserv.h" -#include "or/dns.h" -#include "or/geoip.h" -#include "or/hibernate.h" -#include "or/main.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/protover.h" -#include "or/relay.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerkeys.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/statefile.h" -#include "or/torcert.h" -#include "or/transports.h" -#include "or/routerset.h" - -#include "or/dirauth/mode.h" - -#include "or/authority_cert_st.h" -#include "or/crypt_path_st.h" -#include "or/dir_connection_st.h" -#include "or/dir_server_st.h" -#include "or/extend_info_st.h" -#include "or/extrainfo_st.h" -#include "or/node_st.h" -#include "or/origin_circuit_st.h" -#include "or/or_state_st.h" -#include "or/port_cfg_st.h" -#include "or/routerinfo_st.h" +#include "feature/dircache/directory.h" +#include "feature/dircache/dirserv.h" +#include "feature/relay/dns.h" +#include "feature/stats/geoip.h" +#include "feature/hibernate/hibernate.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "core/proto/protover.h" +#include "core/or/relay.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/relay/routerkeys.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "app/config/statefile.h" +#include "feature/nodelist/torcert.h" +#include "feature/client/transports.h" +#include "feature/nodelist/routerset.h" + +#include "feature/dirauth/mode.h" + +#include "feature/nodelist/authority_cert_st.h" +#include "core/or/crypt_path_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "feature/dirclient/dir_server_st.h" +#include "core/or/extend_info_st.h" +#include "feature/nodelist/extrainfo_st.h" +#include "feature/nodelist/node_st.h" +#include "core/or/origin_circuit_st.h" +#include "app/config/or_state_st.h" +#include "core/or/port_cfg_st.h" +#include "feature/nodelist/routerinfo_st.h" #include "lib/osinfo/uname.h" #include "lib/tls/tortls.h" diff --git a/src/feature/relay/routerkeys.c b/src/feature/relay/routerkeys.c index bb04a8b22..f12eb3d33 100644 --- a/src/feature/relay/routerkeys.c +++ b/src/feature/relay/routerkeys.c @@ -14,11 +14,11 @@ * (TODO: The keys in router.c should go here too.) */ -#include "or/or.h" -#include "or/config.h" -#include "or/router.h" -#include "or/routerkeys.h" -#include "or/torcert.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "feature/relay/router.h" +#include "feature/relay/routerkeys.h" +#include "feature/nodelist/torcert.h" #include "lib/crypt_ops/crypto_pwbox.h" #include "lib/crypt_ops/crypto_util.h" diff --git a/src/feature/rend/rendcache.c b/src/feature/rend/rendcache.c index c18920154..7af5063ba 100644 --- a/src/feature/rend/rendcache.c +++ b/src/feature/rend/rendcache.c @@ -7,17 +7,17 @@ **/ #define RENDCACHE_PRIVATE -#include "or/rendcache.h" +#include "feature/rend/rendcache.h" -#include "or/config.h" -#include "or/rephist.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/rendcommon.h" +#include "app/config/config.h" +#include "feature/stats/rephist.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "feature/rend/rendcommon.h" -#include "or/extend_info_st.h" -#include "or/rend_intro_point_st.h" -#include "or/rend_service_descriptor_st.h" +#include "core/or/extend_info_st.h" +#include "feature/rend/rend_intro_point_st.h" +#include "feature/rend/rend_service_descriptor_st.h" /** Map from service id (as generated by rend_get_service_id) to * rend_cache_entry_t. */ diff --git a/src/feature/rend/rendcache.h b/src/feature/rend/rendcache.h index bb075409e..455e51645 100644 --- a/src/feature/rend/rendcache.h +++ b/src/feature/rend/rendcache.h @@ -9,8 +9,8 @@ #ifndef TOR_RENDCACHE_H #define TOR_RENDCACHE_H -#include "or/or.h" -#include "or/rendcommon.h" +#include "core/or/or.h" +#include "feature/rend/rendcommon.h" /** How old do we let hidden service descriptors get before discarding * them as too old? */ diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c index d4262f2f3..9f62156eb 100644 --- a/src/feature/rend/rendclient.c +++ b/src/feature/rend/rendclient.c @@ -7,43 +7,43 @@ * \brief Client code to access location-hidden services. **/ -#include "or/or.h" -#include "or/circpathbias.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/control.h" +#include "core/or/or.h" +#include "feature/client/circpathbias.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_dh.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/directory.h" -#include "or/hs_circuit.h" -#include "or/hs_client.h" -#include "or/hs_common.h" -#include "or/main.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/relay.h" -#include "or/rendclient.h" -#include "or/rendcommon.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerset.h" +#include "feature/dircache/directory.h" +#include "feature/hs/hs_circuit.h" +#include "feature/hs/hs_client.h" +#include "feature/hs/hs_common.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/relay.h" +#include "feature/rend/rendclient.h" +#include "feature/rend/rendcommon.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerset.h" #include "lib/encoding/confline.h" -#include "or/cpath_build_state_st.h" -#include "or/crypt_path_st.h" -#include "or/dir_connection_st.h" -#include "or/entry_connection_st.h" -#include "or/extend_info_st.h" -#include "or/origin_circuit_st.h" -#include "or/rend_intro_point_st.h" -#include "or/rend_service_descriptor_st.h" -#include "or/routerstatus_st.h" +#include "core/or/cpath_build_state_st.h" +#include "core/or/crypt_path_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "core/or/entry_connection_st.h" +#include "core/or/extend_info_st.h" +#include "core/or/origin_circuit_st.h" +#include "feature/rend/rend_intro_point_st.h" +#include "feature/rend/rend_service_descriptor_st.h" +#include "feature/nodelist/routerstatus_st.h" static extend_info_t *rend_client_get_random_intro_impl( const rend_cache_entry_t *rend_query, diff --git a/src/feature/rend/rendclient.h b/src/feature/rend/rendclient.h index 77395d6cb..e41faa493 100644 --- a/src/feature/rend/rendclient.h +++ b/src/feature/rend/rendclient.h @@ -12,7 +12,7 @@ #ifndef TOR_RENDCLIENT_H #define TOR_RENDCLIENT_H -#include "or/rendcache.h" +#include "feature/rend/rendcache.h" void rend_client_purge_state(void); diff --git a/src/feature/rend/rendcommon.c b/src/feature/rend/rendcommon.c index 928dda012..5bf947744 100644 --- a/src/feature/rend/rendcommon.c +++ b/src/feature/rend/rendcommon.c @@ -10,37 +10,37 @@ #define RENDCOMMON_PRIVATE -#include "or/or.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/config.h" -#include "or/control.h" +#include "core/or/or.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/hs_client.h" -#include "or/hs_common.h" -#include "or/hs_intropoint.h" -#include "or/networkstatus.h" -#include "or/rendclient.h" -#include "or/rendcommon.h" -#include "or/rendmid.h" -#include "or/rendservice.h" -#include "or/rephist.h" -#include "or/replaycache.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerparse.h" - -#include "or/cpath_build_state_st.h" -#include "or/crypt_path_st.h" -#include "or/extend_info_st.h" -#include "or/networkstatus_st.h" -#include "or/origin_circuit_st.h" -#include "or/rend_encoded_v2_service_descriptor_st.h" -#include "or/rend_intro_point_st.h" -#include "or/rend_service_descriptor_st.h" -#include "or/routerstatus_st.h" +#include "feature/hs/hs_client.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_intropoint.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/rend/rendclient.h" +#include "feature/rend/rendcommon.h" +#include "feature/rend/rendmid.h" +#include "feature/rend/rendservice.h" +#include "feature/stats/rephist.h" +#include "feature/hs_common/replaycache.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" + +#include "core/or/cpath_build_state_st.h" +#include "core/or/crypt_path_st.h" +#include "core/or/extend_info_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "core/or/origin_circuit_st.h" +#include "feature/rend/rend_encoded_v2_service_descriptor_st.h" +#include "feature/rend/rend_intro_point_st.h" +#include "feature/rend/rend_service_descriptor_st.h" +#include "feature/nodelist/routerstatus_st.h" /** Return 0 if one and two are the same service ids, else -1 or 1 */ int diff --git a/src/feature/rend/rendmid.c b/src/feature/rend/rendmid.c index 38c1c52e4..22cd6c343 100644 --- a/src/feature/rend/rendmid.c +++ b/src/feature/rend/rendmid.c @@ -7,20 +7,20 @@ * \brief Implement introductions points and rendezvous points. **/ -#include "or/or.h" -#include "or/channel.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/config.h" +#include "core/or/or.h" +#include "core/or/channel.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto.h" -#include "or/dos.h" -#include "or/relay.h" -#include "or/rendmid.h" -#include "or/rephist.h" -#include "or/hs_circuitmap.h" -#include "or/hs_intropoint.h" - -#include "or/or_circuit_st.h" +#include "core/or/dos.h" +#include "core/or/relay.h" +#include "feature/rend/rendmid.h" +#include "feature/stats/rephist.h" +#include "feature/hs/hs_circuitmap.h" +#include "feature/hs/hs_intropoint.h" + +#include "core/or/or_circuit_st.h" /** Respond to an ESTABLISH_INTRO cell by checking the signed data and * setting the circuit's purpose and service pk digest. diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 8e094b593..da4a98b3d 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -9,47 +9,47 @@ #define RENDSERVICE_PRIVATE -#include "or/or.h" -#include "or/circpathbias.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/config.h" -#include "or/control.h" +#include "core/or/or.h" +#include "feature/client/circpathbias.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_dh.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/directory.h" -#include "or/hs_common.h" -#include "or/hs_config.h" -#include "or/main.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/rendclient.h" -#include "or/rendcommon.h" -#include "or/rendservice.h" -#include "or/router.h" -#include "or/relay.h" -#include "or/rephist.h" -#include "or/replaycache.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/routerset.h" +#include "feature/dircache/directory.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_config.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "feature/rend/rendclient.h" +#include "feature/rend/rendcommon.h" +#include "feature/rend/rendservice.h" +#include "feature/relay/router.h" +#include "core/or/relay.h" +#include "feature/stats/rephist.h" +#include "feature/hs_common/replaycache.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/routerset.h" #include "lib/encoding/confline.h" -#include "or/cpath_build_state_st.h" -#include "or/crypt_path_st.h" -#include "or/crypt_path_reference_st.h" -#include "or/edge_connection_st.h" -#include "or/extend_info_st.h" -#include "or/networkstatus_st.h" -#include "or/origin_circuit_st.h" -#include "or/rend_authorized_client_st.h" -#include "or/rend_encoded_v2_service_descriptor_st.h" -#include "or/rend_intro_point_st.h" -#include "or/rend_service_descriptor_st.h" -#include "or/routerstatus_st.h" +#include "core/or/cpath_build_state_st.h" +#include "core/or/crypt_path_st.h" +#include "core/or/crypt_path_reference_st.h" +#include "core/or/edge_connection_st.h" +#include "core/or/extend_info_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "core/or/origin_circuit_st.h" +#include "feature/rend/rend_authorized_client_st.h" +#include "feature/rend/rend_encoded_v2_service_descriptor_st.h" +#include "feature/rend/rend_intro_point_st.h" +#include "feature/rend/rend_service_descriptor_st.h" +#include "feature/nodelist/routerstatus_st.h" #ifdef HAVE_FCNTL_H #include <fcntl.h> diff --git a/src/feature/rend/rendservice.h b/src/feature/rend/rendservice.h index 35962df7f..709678962 100644 --- a/src/feature/rend/rendservice.h +++ b/src/feature/rend/rendservice.h @@ -12,8 +12,8 @@ #ifndef TOR_RENDSERVICE_H #define TOR_RENDSERVICE_H -#include "or/or.h" -#include "or/hs_service.h" +#include "core/or/or.h" +#include "feature/hs/hs_service.h" typedef struct rend_intro_cell_t rend_intro_cell_t; struct config_line_t; diff --git a/src/feature/stats/geoip.c b/src/feature/stats/geoip.c index 3e6f20ea3..d891bd80e 100644 --- a/src/feature/stats/geoip.c +++ b/src/feature/stats/geoip.c @@ -28,15 +28,15 @@ */ #define GEOIP_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "ht.h" #include "lib/container/buffers.h" -#include "or/config.h" -#include "or/control.h" -#include "or/dnsserv.h" -#include "or/dos.h" -#include "or/geoip.h" -#include "or/routerlist.h" +#include "app/config/config.h" +#include "feature/control/control.h" +#include "feature/client/dnsserv.h" +#include "core/or/dos.h" +#include "feature/stats/geoip.h" +#include "feature/nodelist/routerlist.h" #include "lib/container/order.h" #include "lib/time/tvdiff.h" diff --git a/src/feature/stats/geoip.h b/src/feature/stats/geoip.h index fd19b7560..a2175c01e 100644 --- a/src/feature/stats/geoip.h +++ b/src/feature/stats/geoip.h @@ -13,7 +13,7 @@ #define TOR_GEOIP_H #include "lib/testsupport/testsupport.h" -#include "or/dos.h" +#include "core/or/dos.h" /** Indicates an action that we might be noting geoip statistics on. * Note that if we're noticing CONNECT, we're a bridge, and if we're noticing diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c index 6607c2596..6bb680c5d 100644 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@ -74,24 +74,24 @@ * (The "rephist" name originally stood for "reputation and history". ) **/ -#include "or/or.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/config.h" +#include "core/or/or.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerlist.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" #include "ht.h" -#include "or/channelpadding.h" -#include "or/connection_or.h" -#include "or/statefile.h" +#include "core/or/channelpadding.h" +#include "core/or/connection_or.h" +#include "app/config/statefile.h" -#include "or/networkstatus_st.h" -#include "or/or_circuit_st.h" -#include "or/or_state_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "core/or/or_circuit_st.h" +#include "app/config/or_state_st.h" #include "lib/container/bloomfilt.h" #include "lib/container/order.h" diff --git a/src/test/bench.c b/src/test/bench.c index ced04fffd..7919a4224 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -10,27 +10,27 @@ #include "orconfig.h" -#include "or/or.h" -#include "or/onion_tap.h" -#include "or/relay_crypto.h" +#include "core/or/or.h" +#include "core/crypto/onion_tap.h" +#include "core/crypto/relay_crypto.h" #include <openssl/opensslv.h> #include <openssl/evp.h> #include <openssl/ec.h> #include <openssl/ecdh.h> #include <openssl/obj_mac.h> -#include "or/circuitlist.h" -#include "or/config.h" +#include "core/or/circuitlist.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_dh.h" -#include "or/onion_ntor.h" +#include "core/crypto/onion_ntor.h" #include "lib/crypt_ops/crypto_ed25519.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/consdiff.h" +#include "feature/dircommon/consdiff.h" #include "lib/compress/compress.h" -#include "or/cell_st.h" -#include "or/or_circuit_st.h" +#include "core/or/cell_st.h" +#include "core/or/or_circuit_st.h" #include "lib/crypt_ops/digestset.h" diff --git a/src/test/fuzz/fuzz_consensus.c b/src/test/fuzz/fuzz_consensus.c index 81a310154..b170fd33d 100644 --- a/src/test/fuzz/fuzz_consensus.c +++ b/src/test/fuzz/fuzz_consensus.c @@ -1,11 +1,11 @@ /* Copyright (c) 2016-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ #define ROUTERPARSE_PRIVATE -#include "or/or.h" -#include "or/routerparse.h" -#include "or/networkstatus.h" +#include "core/or/or.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/networkstatus.h" #include "lib/crypt_ops/crypto_ed25519.h" -#include "or/networkstatus_st.h" +#include "feature/nodelist/networkstatus_st.h" #include "test/fuzz/fuzzing.h" static void diff --git a/src/test/fuzz/fuzz_descriptor.c b/src/test/fuzz/fuzz_descriptor.c index d28793fdf..5a56f4081 100644 --- a/src/test/fuzz/fuzz_descriptor.c +++ b/src/test/fuzz/fuzz_descriptor.c @@ -1,10 +1,10 @@ /* Copyright (c) 2016-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ #define ROUTERPARSE_PRIVATE -#include "or/or.h" -#include "or/routerparse.h" -#include "or/routerlist.h" -#include "or/routerkeys.h" +#include "core/or/or.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/routerlist.h" +#include "feature/relay/routerkeys.h" #include "test/fuzz/fuzzing.h" static int diff --git a/src/test/fuzz/fuzz_diff.c b/src/test/fuzz/fuzz_diff.c index eb5fc27e0..1079856fd 100644 --- a/src/test/fuzz/fuzz_diff.c +++ b/src/test/fuzz/fuzz_diff.c @@ -4,8 +4,8 @@ #define CONSDIFF_PRIVATE #include "orconfig.h" -#include "or/or.h" -#include "or/consdiff.h" +#include "core/or/or.h" +#include "feature/dircommon/consdiff.h" #include "test/fuzz/fuzzing.h" diff --git a/src/test/fuzz/fuzz_diff_apply.c b/src/test/fuzz/fuzz_diff_apply.c index 76789fabc..165d0e612 100644 --- a/src/test/fuzz/fuzz_diff_apply.c +++ b/src/test/fuzz/fuzz_diff_apply.c @@ -4,8 +4,8 @@ #define CONSDIFF_PRIVATE #include "orconfig.h" -#include "or/or.h" -#include "or/consdiff.h" +#include "core/or/or.h" +#include "feature/dircommon/consdiff.h" #include "test/fuzz/fuzzing.h" diff --git a/src/test/fuzz/fuzz_extrainfo.c b/src/test/fuzz/fuzz_extrainfo.c index 274ecc786..6c88f8012 100644 --- a/src/test/fuzz/fuzz_extrainfo.c +++ b/src/test/fuzz/fuzz_extrainfo.c @@ -1,10 +1,10 @@ /* Copyright (c) 2016-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ #define ROUTERPARSE_PRIVATE -#include "or/or.h" -#include "or/routerparse.h" -#include "or/routerlist.h" -#include "or/routerkeys.h" +#include "core/or/or.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/routerlist.h" +#include "feature/relay/routerkeys.h" #include "test/fuzz/fuzzing.h" static void diff --git a/src/test/fuzz/fuzz_hsdescv2.c b/src/test/fuzz/fuzz_hsdescv2.c index 7fd86f40b..fd5da4163 100644 --- a/src/test/fuzz/fuzz_hsdescv2.c +++ b/src/test/fuzz/fuzz_hsdescv2.c @@ -1,9 +1,9 @@ /* Copyright (c) 2016-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ #define ROUTERPARSE_PRIVATE -#include "or/or.h" -#include "or/routerparse.h" -#include "or/rendcommon.h" +#include "core/or/or.h" +#include "feature/nodelist/routerparse.h" +#include "feature/rend/rendcommon.h" #include "lib/crypt_ops/crypto_ed25519.h" #include "test/fuzz/fuzzing.h" diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c index de574ac26..4ec8db0a8 100644 --- a/src/test/fuzz/fuzz_hsdescv3.c +++ b/src/test/fuzz/fuzz_hsdescv3.c @@ -4,11 +4,11 @@ #define ROUTERPARSE_PRIVATE #define HS_DESCRIPTOR_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "trunnel/ed25519_cert.h" /* Trunnel interface. */ #include "lib/crypt_ops/crypto_ed25519.h" -#include "or/hs_descriptor.h" -#include "or/routerparse.h" +#include "feature/hs/hs_descriptor.h" +#include "feature/nodelist/routerparse.h" #include "test/fuzz/fuzzing.h" diff --git a/src/test/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c index 772f2099b..61dc2144b 100644 --- a/src/test/fuzz/fuzz_http.c +++ b/src/test/fuzz/fuzz_http.c @@ -6,15 +6,15 @@ #define BUFFERS_PRIVATE #define DIRECTORY_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "lib/err/backtrace.h" #include "lib/container/buffers.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/directory.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "feature/dircache/directory.h" #include "lib/log/torlog.h" -#include "or/dir_connection_st.h" +#include "feature/dircommon/dir_connection_st.h" #include "test/fuzz/fuzzing.h" diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c index bf0a9deba..184bb52ee 100644 --- a/src/test/fuzz/fuzz_http_connect.c +++ b/src/test/fuzz/fuzz_http_connect.c @@ -6,17 +6,17 @@ #define BUFFERS_PRIVATE #define CONNECTION_EDGE_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "lib/err/backtrace.h" #include "lib/container/buffers.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/proto_socks.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "core/proto/proto_socks.h" #include "lib/log/torlog.h" -#include "or/entry_connection_st.h" -#include "or/socks_request_st.h" +#include "core/or/entry_connection_st.h" +#include "core/or/socks_request_st.h" #include "test/fuzz/fuzzing.h" diff --git a/src/test/fuzz/fuzz_iptsv2.c b/src/test/fuzz/fuzz_iptsv2.c index e4ec7fffc..a3082f4d0 100644 --- a/src/test/fuzz/fuzz_iptsv2.c +++ b/src/test/fuzz/fuzz_iptsv2.c @@ -1,12 +1,12 @@ /* Copyright (c) 2016-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ #define ROUTERPARSE_PRIVATE -#include "or/or.h" -#include "or/routerparse.h" -#include "or/rendcommon.h" +#include "core/or/or.h" +#include "feature/nodelist/routerparse.h" +#include "feature/rend/rendcommon.h" #include "lib/crypt_ops/crypto_ed25519.h" -#include "or/rend_service_descriptor_st.h" +#include "feature/rend/rend_service_descriptor_st.h" #include "test/fuzz/fuzzing.h" diff --git a/src/test/fuzz/fuzz_microdesc.c b/src/test/fuzz/fuzz_microdesc.c index a7fe1bb66..fa9676372 100644 --- a/src/test/fuzz/fuzz_microdesc.c +++ b/src/test/fuzz/fuzz_microdesc.c @@ -1,9 +1,9 @@ /* Copyright (c) 2016-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ #define ROUTERPARSE_PRIVATE -#include "or/or.h" -#include "or/routerparse.h" -#include "or/microdesc.h" +#include "core/or/or.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/microdesc.h" #include "lib/crypt_ops/crypto_ed25519.h" #include "test/fuzz/fuzzing.h" diff --git a/src/test/fuzz/fuzz_vrs.c b/src/test/fuzz/fuzz_vrs.c index 7d28ef1c7..8c96851b1 100644 --- a/src/test/fuzz/fuzz_vrs.c +++ b/src/test/fuzz/fuzz_vrs.c @@ -2,14 +2,14 @@ /* See LICENSE for licensing information */ #define ROUTERPARSE_PRIVATE #define NETWORKSTATUS_PRIVATE -#include "or/or.h" -#include "or/routerparse.h" +#include "core/or/or.h" +#include "feature/nodelist/routerparse.h" #include "lib/memarea/memarea.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" -#include "or/networkstatus_st.h" -#include "or/vote_routerstatus_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/vote_routerstatus_st.h" #include "lib/crypt_ops/crypto_ed25519.h" #include "test/fuzz/fuzzing.h" diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c index c947ebfce..0b3483bf6 100644 --- a/src/test/fuzz/fuzzing_common.c +++ b/src/test/fuzz/fuzzing_common.c @@ -2,9 +2,9 @@ /* See LICENSE for licensing information */ #define CRYPTO_ED25519_PRIVATE #include "orconfig.h" -#include "or/or.h" +#include "core/or/or.h" #include "lib/err/backtrace.h" -#include "or/config.h" +#include "app/config/config.h" #include "test/fuzz/fuzzing.h" #include "lib/compress/compress.h" #include "lib/crypt_ops/crypto.h" diff --git a/src/test/hs_test_helpers.c b/src/test/hs_test_helpers.c index cb7b1fe1b..afe3eafa2 100644 --- a/src/test/hs_test_helpers.c +++ b/src/test/hs_test_helpers.c @@ -1,12 +1,12 @@ /* Copyright (c) 2017-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" #include "lib/crypt_ops/crypto_ed25519.h" #include "test/test.h" -#include "or/torcert.h" +#include "feature/nodelist/torcert.h" -#include "or/hs_common.h" +#include "feature/hs/hs_common.h" #include "test/hs_test_helpers.h" hs_desc_intro_point_t * diff --git a/src/test/hs_test_helpers.h b/src/test/hs_test_helpers.h index 5c0262207..b7c271476 100644 --- a/src/test/hs_test_helpers.h +++ b/src/test/hs_test_helpers.h @@ -5,7 +5,7 @@ #define TOR_HS_TEST_HELPERS_H #include "trunnel/ed25519_cert.h" -#include "or/hs_descriptor.h" +#include "feature/hs/hs_descriptor.h" /* Set of functions to help build and test descriptors. */ hs_desc_intro_point_t *hs_helper_build_intro_point( diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index 7c3850452..fc9768c12 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -1,7 +1,7 @@ /* Copyright (c) 2014-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" #ifndef TOR_LOG_TEST_HELPERS_H #define TOR_LOG_TEST_HELPERS_H diff --git a/src/test/rend_test_helpers.c b/src/test/rend_test_helpers.c index 31af58c27..85a679a96 100644 --- a/src/test/rend_test_helpers.c +++ b/src/test/rend_test_helpers.c @@ -1,15 +1,15 @@ /* Copyright (c) 2014-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" #include "lib/crypt_ops/crypto_rand.h" #include "test/test.h" -#include "or/rendcommon.h" +#include "feature/rend/rendcommon.h" #include "test/rend_test_helpers.h" -#include "or/extend_info_st.h" -#include "or/rend_intro_point_st.h" -#include "or/rend_service_descriptor_st.h" +#include "core/or/extend_info_st.h" +#include "feature/rend/rend_intro_point_st.h" +#include "feature/rend/rend_service_descriptor_st.h" void generate_desc(int time_diff, rend_encoded_v2_service_descriptor_t **desc, diff --git a/src/test/rend_test_helpers.h b/src/test/rend_test_helpers.h index aca675b2a..103e143ec 100644 --- a/src/test/rend_test_helpers.h +++ b/src/test/rend_test_helpers.h @@ -1,7 +1,7 @@ /* Copyright (c) 2014-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" #ifndef TOR_REND_TEST_HELPERS_H #define TOR_REND_TEST_HELPERS_H diff --git a/src/test/test.c b/src/test/test.c index d6be5ea2e..2addeec96 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -12,7 +12,7 @@ #include "lib/crypt_ops/crypto_dh.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/or_state_st.h" +#include "app/config/or_state_st.h" #include <stdio.h> #ifdef HAVE_FCNTL_H @@ -42,34 +42,34 @@ long int lround(double x); double fabs(double x); -#include "or/or.h" +#include "core/or/or.h" #include "lib/err/backtrace.h" #include "lib/container/buffers.h" -#include "or/circuitlist.h" -#include "or/circuitstats.h" +#include "core/or/circuitlist.h" +#include "core/or/circuitstats.h" #include "lib/compress/compress.h" -#include "or/config.h" -#include "or/connection_edge.h" -#include "or/rendcommon.h" -#include "or/rendcache.h" +#include "app/config/config.h" +#include "core/or/connection_edge.h" +#include "feature/rend/rendcommon.h" +#include "feature/rend/rendcache.h" #include "test/test.h" -#include "or/main.h" +#include "core/mainloop/main.h" #include "lib/memarea/memarea.h" -#include "or/onion.h" -#include "or/onion_ntor.h" -#include "or/onion_fast.h" -#include "or/onion_tap.h" -#include "or/policies.h" -#include "or/rephist.h" -#include "or/routerparse.h" -#include "or/statefile.h" +#include "core/crypto/onion.h" +#include "core/crypto/onion_ntor.h" +#include "core/crypto/onion_fast.h" +#include "core/crypto/onion_tap.h" +#include "core/or/policies.h" +#include "feature/stats/rephist.h" +#include "feature/nodelist/routerparse.h" +#include "app/config/statefile.h" #include "lib/crypt_ops/crypto_curve25519.h" -#include "or/extend_info_st.h" -#include "or/or_circuit_st.h" -#include "or/rend_encoded_v2_service_descriptor_st.h" -#include "or/rend_intro_point_st.h" -#include "or/rend_service_descriptor_st.h" +#include "core/or/extend_info_st.h" +#include "core/or/or_circuit_st.h" +#include "feature/rend/rend_encoded_v2_service_descriptor_st.h" +#include "feature/rend/rend_intro_point_st.h" +#include "feature/rend/rend_service_descriptor_st.h" /** Run unit tests for the onion handshake code. */ static void diff --git a/src/test/test_accounting.c b/src/test/test_accounting.c index 7b9511dc2..7721a9eb9 100644 --- a/src/test/test_accounting.c +++ b/src/test/test_accounting.c @@ -1,15 +1,15 @@ /* Copyright (c) 2014-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" #define HIBERNATE_PRIVATE -#include "or/hibernate.h" -#include "or/config.h" +#include "feature/hibernate/hibernate.h" +#include "app/config/config.h" #define STATEFILE_PRIVATE -#include "or/statefile.h" +#include "app/config/statefile.h" -#include "or/or_state_st.h" +#include "app/config/or_state_st.h" #define NS_MODULE accounting diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 1069e25b4..9ab921c5b 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -5,10 +5,10 @@ #define ADDRESSMAP_PRIVATE #include "orconfig.h" -#include "or/or.h" +#include "core/or/or.h" #include "lib/crypt_ops/crypto_rand.h" #include "test/test.h" -#include "or/addressmap.h" +#include "feature/client/addressmap.h" #include "test/log_test_helpers.h" #ifdef HAVE_SYS_UN_H diff --git a/src/test/test_address.c b/src/test/test_address.c index 52ca5137e..abe7c2c0a 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -23,7 +23,7 @@ #include <net/if.h> #endif /* defined(HAVE_IFCONF_TO_SMARTLIST) */ -#include "or/or.h" +#include "core/or/or.h" #include "lib/net/address.h" #include "test/test.h" #include "test/log_test_helpers.h" diff --git a/src/test/test_address_set.c b/src/test/test_address_set.c index ec4e6b7e8..f23174001 100644 --- a/src/test/test_address_set.c +++ b/src/test/test_address_set.c @@ -1,19 +1,19 @@ /* Copyright (c) 2017-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/address_set.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/routerlist.h" -#include "or/torcert.h" - -#include "or/microdesc_st.h" -#include "or/networkstatus_st.h" -#include "or/routerinfo_st.h" -#include "or/routerstatus_st.h" +#include "core/or/address_set.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/torcert.h" + +#include "feature/nodelist/microdesc_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerstatus_st.h" #include "test/test.h" diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c index 685027c0e..bdab14890 100644 --- a/src/test/test_bridges.c +++ b/src/test/test_bridges.c @@ -11,11 +11,11 @@ #include <stdbool.h> -#include "or/or.h" +#include "core/or/or.h" #include "lib/net/address.h" -#include "or/bridges.h" -#include "or/config.h" -#include "or/transports.h" +#include "feature/client/bridges.h" +#include "app/config/config.h" +#include "feature/client/transports.h" /* Test suite stuff */ #include "test/test.h" diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c index 3f7b0a203..716cff36e 100644 --- a/src/test/test_bt_cl.c +++ b/src/test/test_bt_cl.c @@ -7,7 +7,7 @@ /* To prevent 'assert' from going away. */ #undef TOR_COVERAGE -#include "or/or.h" +#include "core/or/or.h" #include "lib/err/backtrace.h" #include "lib/log/torlog.h" diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index 604f1422c..477066f69 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -5,14 +5,14 @@ #define BUFFERS_PRIVATE #define PROTO_HTTP_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "lib/container/buffers.h" #include "lib/tls/buffers_tls.h" #include "lib/tls/tortls.h" #include "lib/compress/compress.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/proto_http.h" -#include "or/proto_socks.h" +#include "core/proto/proto_http.h" +#include "core/proto/proto_socks.h" #include "test/test.h" /** Run unit tests for buffers.c */ diff --git a/src/test/test_bwmgt.c b/src/test/test_bwmgt.c index 4cfca6c77..7aa053f6c 100644 --- a/src/test/test_bwmgt.c +++ b/src/test/test_bwmgt.c @@ -8,7 +8,7 @@ #define TOKEN_BUCKET_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" #include "lib/evloop/token_bucket.h" diff --git a/src/test/test_cell_formats.c b/src/test/test_cell_formats.c index da5e5defd..2753c4219 100644 --- a/src/test/test_cell_formats.c +++ b/src/test/test_cell_formats.c @@ -7,21 +7,21 @@ #define CONNECTION_EDGE_PRIVATE #define RELAY_PRIVATE -#include "or/or.h" -#include "or/channel.h" -#include "or/connection_edge.h" -#include "or/connection_or.h" -#include "or/config.h" +#include "core/or/or.h" +#include "core/or/channel.h" +#include "core/or/connection_edge.h" +#include "core/or/connection_or.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/onion.h" -#include "or/onion_tap.h" -#include "or/onion_fast.h" -#include "or/onion_ntor.h" -#include "or/relay.h" - -#include "or/cell_st.h" -#include "or/cell_queue_st.h" -#include "or/var_cell_st.h" +#include "core/crypto/onion.h" +#include "core/crypto/onion_tap.h" +#include "core/crypto/onion_fast.h" +#include "core/crypto/onion_ntor.h" +#include "core/or/relay.h" + +#include "core/or/cell_st.h" +#include "core/or/cell_queue_st.h" +#include "core/or/var_cell_st.h" #include "test/test.h" diff --git a/src/test/test_cell_queue.c b/src/test/test_cell_queue.c index 3369511af..d74bb9c62 100644 --- a/src/test/test_cell_queue.c +++ b/src/test/test_cell_queue.c @@ -3,15 +3,15 @@ #define CIRCUITLIST_PRIVATE #define RELAY_PRIVATE -#include "or/or.h" -#include "or/circuitlist.h" -#include "or/relay.h" +#include "core/or/or.h" +#include "core/or/circuitlist.h" +#include "core/or/relay.h" #include "test/test.h" -#include "or/cell_st.h" -#include "or/cell_queue_st.h" -#include "or/or_circuit_st.h" -#include "or/origin_circuit_st.h" +#include "core/or/cell_st.h" +#include "core/or/cell_queue_st.h" +#include "core/or/or_circuit_st.h" +#include "core/or/origin_circuit_st.h" static void test_cq_manip(void *arg) diff --git a/src/test/test_channel.c b/src/test/test_channel.c index 53c133ecb..26af8de91 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -3,28 +3,28 @@ #define TOR_CHANNEL_INTERNAL_ #define CHANNEL_PRIVATE_ -#include "or/or.h" -#include "or/channel.h" +#include "core/or/or.h" +#include "core/or/channel.h" /* For channel_note_destroy_not_pending */ #define CIRCUITLIST_PRIVATE -#include "or/circuitlist.h" -#include "or/circuitmux.h" -#include "or/circuitmux_ewma.h" +#include "core/or/circuitlist.h" +#include "core/or/circuitmux.h" +#include "core/or/circuitmux_ewma.h" /* For var_cell_free */ -#include "or/connection_or.h" +#include "core/or/connection_or.h" #include "lib/crypt_ops/crypto_rand.h" /* For packed_cell stuff */ #define RELAY_PRIVATE -#include "or/relay.h" +#include "core/or/relay.h" /* For init/free stuff */ -#include "or/scheduler.h" -#include "or/networkstatus.h" - -#include "or/cell_st.h" -#include "or/networkstatus_st.h" -#include "or/origin_circuit_st.h" -#include "or/routerstatus_st.h" -#include "or/var_cell_st.h" +#include "core/or/scheduler.h" +#include "feature/nodelist/networkstatus.h" + +#include "core/or/cell_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "core/or/origin_circuit_st.h" +#include "feature/nodelist/routerstatus_st.h" +#include "core/or/var_cell_st.h" /* Test suite stuff */ #include "test/log_test_helpers.h" diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index ff2ab8daa..5d696b8b8 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -5,28 +5,28 @@ #define MAIN_PRIVATE #define NETWORKSTATUS_PRIVATE #define TOR_TIMERS_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" #include "lib/testsupport/testsupport.h" -#include "or/connection.h" -#include "or/connection_or.h" -#include "or/channel.h" -#include "or/channeltls.h" -#include "or/channelpadding.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_or.h" +#include "core/or/channel.h" +#include "core/or/channeltls.h" +#include "core/or/channelpadding.h" #include "lib/evloop/compat_libevent.h" -#include "or/config.h" +#include "app/config/config.h" #include "lib/time/compat_time.h" -#include "or/main.h" -#include "or/networkstatus.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/networkstatus.h" #include "test/log_test_helpers.h" #include "lib/tls/tortls.h" #include "lib/evloop/timers.h" #include "lib/container/buffers.h" -#include "or/cell_st.h" -#include "or/networkstatus_st.h" -#include "or/or_connection_st.h" -#include "or/routerstatus_st.h" +#include "core/or/cell_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "core/or/or_connection_st.h" +#include "feature/nodelist/routerstatus_st.h" int channelpadding_get_netflow_inactive_timeout_ms(channel_t *chan); int64_t channelpadding_compute_time_until_pad_for_netflow(channel_t *chan); diff --git a/src/test/test_channeltls.c b/src/test/test_channeltls.c index ad2b443cf..787a30a85 100644 --- a/src/test/test_channeltls.c +++ b/src/test/test_channeltls.c @@ -6,19 +6,19 @@ #include <math.h> #define TOR_CHANNEL_INTERNAL_ -#include "or/or.h" +#include "core/or/or.h" #include "lib/net/address.h" #include "lib/container/buffers.h" -#include "or/channel.h" -#include "or/channeltls.h" -#include "or/connection.h" -#include "or/connection_or.h" -#include "or/config.h" +#include "core/or/channel.h" +#include "core/or/channeltls.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_or.h" +#include "app/config/config.h" /* For init/free stuff */ -#include "or/scheduler.h" +#include "core/or/scheduler.h" #include "lib/tls/tortls.h" -#include "or/or_connection_st.h" +#include "core/or/or_connection_st.h" /* Test suite stuff */ #include "test/test.h" diff --git a/src/test/test_checkdir.c b/src/test/test_checkdir.c index a80c6ebd3..652e308ed 100644 --- a/src/test/test_checkdir.c +++ b/src/test/test_checkdir.c @@ -2,7 +2,7 @@ /* See LICENSE for licensing information */ #include "orconfig.h" -#include "or/or.h" +#include "core/or/or.h" #ifdef _WIN32 #include <direct.h> @@ -10,7 +10,7 @@ #include <dirent.h> #endif -#include "or/config.h" +#include "app/config/config.h" #include "test/test.h" #ifdef HAVE_SYS_STAT_H diff --git a/src/test/test_circuitbuild.c b/src/test/test_circuitbuild.c index c09133c54..02eadecd9 100644 --- a/src/test/test_circuitbuild.c +++ b/src/test/test_circuitbuild.c @@ -5,15 +5,15 @@ #define CIRCUITBUILD_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" #include "test/test_helpers.h" #include "test/log_test_helpers.h" -#include "or/config.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" +#include "app/config/config.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" -#include "or/extend_info_st.h" +#include "core/or/extend_info_st.h" /* Dummy nodes smartlist for testing */ static smartlist_t dummy_nodes; diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c index 4aa7c596e..8dd7f5f5a 100644 --- a/src/test/test_circuitlist.c +++ b/src/test/test_circuitlist.c @@ -5,17 +5,17 @@ #define CIRCUITBUILD_PRIVATE #define CIRCUITLIST_PRIVATE #define HS_CIRCUITMAP_PRIVATE -#include "or/or.h" -#include "or/channel.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuitmux_ewma.h" -#include "or/hs_circuitmap.h" +#include "core/or/or.h" +#include "core/or/channel.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuitmux_ewma.h" +#include "feature/hs/hs_circuitmap.h" #include "test/test.h" #include "test/log_test_helpers.h" -#include "or/or_circuit_st.h" -#include "or/origin_circuit_st.h" +#include "core/or/or_circuit_st.h" +#include "core/or/origin_circuit_st.h" #include "lib/container/bitarray.h" diff --git a/src/test/test_circuitmux.c b/src/test/test_circuitmux.c index c2fd1ae68..1d46f8de0 100644 --- a/src/test/test_circuitmux.c +++ b/src/test/test_circuitmux.c @@ -5,15 +5,15 @@ #define CIRCUITMUX_PRIVATE #define CIRCUITMUX_EWMA_PRIVATE #define RELAY_PRIVATE -#include "or/or.h" -#include "or/channel.h" -#include "or/circuitmux.h" -#include "or/circuitmux_ewma.h" -#include "or/relay.h" -#include "or/scheduler.h" +#include "core/or/or.h" +#include "core/or/channel.h" +#include "core/or/circuitmux.h" +#include "core/or/circuitmux_ewma.h" +#include "core/or/relay.h" +#include "core/or/scheduler.h" #include "test/test.h" -#include "or/destroy_cell_queue_st.h" +#include "core/or/destroy_cell_queue_st.h" /* XXXX duplicated function from test_circuitlist.c */ static channel_t * diff --git a/src/test/test_circuitstats.c b/src/test/test_circuitstats.c index 94ba6ed44..c3cfad88d 100644 --- a/src/test/test_circuitstats.c +++ b/src/test/test_circuitstats.c @@ -6,21 +6,21 @@ #define CIRCUITLIST_PRIVATE #define CHANNEL_PRIVATE_ -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" #include "test/test_helpers.h" #include "test/log_test_helpers.h" -#include "or/config.h" -#include "or/circuitlist.h" -#include "or/circuitbuild.h" -#include "or/circuitstats.h" -#include "or/circuituse.h" -#include "or/channel.h" - -#include "or/cpath_build_state_st.h" -#include "or/crypt_path_st.h" -#include "or/extend_info_st.h" -#include "or/origin_circuit_st.h" +#include "app/config/config.h" +#include "core/or/circuitlist.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitstats.h" +#include "core/or/circuituse.h" +#include "core/or/channel.h" + +#include "core/or/cpath_build_state_st.h" +#include "core/or/crypt_path_st.h" +#include "core/or/extend_info_st.h" +#include "core/or/origin_circuit_st.h" void test_circuitstats_timeout(void *arg); void test_circuitstats_hoplen(void *arg); diff --git a/src/test/test_circuituse.c b/src/test/test_circuituse.c index 2524e43c6..720adeac8 100644 --- a/src/test/test_circuituse.c +++ b/src/test/test_circuituse.c @@ -5,17 +5,17 @@ #define CIRCUITLIST_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" #include "test/test_helpers.h" -#include "or/config.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/circuitbuild.h" -#include "or/nodelist.h" - -#include "or/cpath_build_state_st.h" -#include "or/origin_circuit_st.h" +#include "app/config/config.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "core/or/circuitbuild.h" +#include "feature/nodelist/nodelist.h" + +#include "core/or/cpath_build_state_st.h" +#include "core/or/origin_circuit_st.h" static void test_circuit_is_available_for_use_ret_false_when_marked_for_close(void *arg) diff --git a/src/test/test_compat_libevent.c b/src/test/test_compat_libevent.c index 1262a3140..3f505d013 100644 --- a/src/test/test_compat_libevent.c +++ b/src/test/test_compat_libevent.c @@ -3,7 +3,7 @@ #define COMPAT_LIBEVENT_PRIVATE #include "orconfig.h" -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" diff --git a/src/test/test_config.c b/src/test/test_config.c index c7623d0c8..f7d3a6fbb 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -8,44 +8,44 @@ #define CONFIG_PRIVATE #define PT_PRIVATE #define ROUTERSET_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "lib/net/address.h" -#include "or/addressmap.h" -#include "or/bridges.h" -#include "or/circuitmux_ewma.h" -#include "or/circuitbuild.h" -#include "or/config.h" -#include "or/confparse.h" -#include "or/connection.h" -#include "or/connection_edge.h" +#include "feature/client/addressmap.h" +#include "feature/client/bridges.h" +#include "core/or/circuitmux_ewma.h" +#include "core/or/circuitbuild.h" +#include "app/config/config.h" +#include "app/config/confparse.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" #include "test/test.h" -#include "or/connection_or.h" -#include "or/control.h" -#include "or/cpuworker.h" -#include "or/dirserv.h" -#include "or/dirauth/dirvote.h" -#include "or/dns.h" -#include "or/entrynodes.h" -#include "or/transports.h" -#include "or/ext_orport.h" -#include "or/geoip.h" -#include "or/hibernate.h" -#include "or/main.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/rendclient.h" -#include "or/rendservice.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerset.h" -#include "or/statefile.h" +#include "core/or/connection_or.h" +#include "feature/control/control.h" +#include "core/mainloop/cpuworker.h" +#include "feature/dircache/dirserv.h" +#include "feature/dirauth/dirvote.h" +#include "feature/relay/dns.h" +#include "feature/client/entrynodes.h" +#include "feature/client/transports.h" +#include "feature/relay/ext_orport.h" +#include "feature/stats/geoip.h" +#include "feature/hibernate/hibernate.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "feature/rend/rendclient.h" +#include "feature/rend/rendservice.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerset.h" +#include "app/config/statefile.h" #include "test/test_helpers.h" -#include "or/dir_server_st.h" -#include "or/port_cfg_st.h" -#include "or/routerinfo_st.h" +#include "feature/dirclient/dir_server_st.h" +#include "core/or/port_cfg_st.h" +#include "feature/nodelist/routerinfo_st.h" #include "lib/fs/conffile.h" #include "lib/meminfo/meminfo.h" diff --git a/src/test/test_connection.c b/src/test/test_connection.c index 674e2284e..c423c6573 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -7,29 +7,29 @@ #define MAIN_PRIVATE #define CONNECTION_OR_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/hs_common.h" -#include "or/main.h" -#include "or/microdesc.h" -#include "or/nodelist.h" -#include "or/networkstatus.h" -#include "or/rendcache.h" -#include "or/directory.h" -#include "or/connection_or.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "feature/hs/hs_common.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/nodelist.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/rend/rendcache.h" +#include "feature/dircache/directory.h" +#include "core/or/connection_or.h" #include "test/test_connection.h" #include "test/test_helpers.h" -#include "or/dir_connection_st.h" -#include "or/entry_connection_st.h" -#include "or/node_st.h" -#include "or/or_connection_st.h" -#include "or/routerinfo_st.h" -#include "or/socks_request_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "core/or/entry_connection_st.h" +#include "feature/nodelist/node_st.h" +#include "core/or/or_connection_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "core/or/socks_request_st.h" static void * test_conn_get_basic_setup(const struct testcase_t *tc); static int test_conn_get_basic_teardown(const struct testcase_t *tc, diff --git a/src/test/test_conscache.c b/src/test/test_conscache.c index 3d3a50297..b5cbd7251 100644 --- a/src/test/test_conscache.c +++ b/src/test/test_conscache.c @@ -1,9 +1,9 @@ /* Copyright (c) 2017-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" -#include "or/config.h" -#include "or/conscache.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "feature/dircache/conscache.h" #include "lib/encoding/confline.h" #include "test/test.h" diff --git a/src/test/test_consdiff.c b/src/test/test_consdiff.c index 38947a225..b836befd2 100644 --- a/src/test/test_consdiff.c +++ b/src/test/test_consdiff.c @@ -4,10 +4,10 @@ #define CONSDIFF_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" -#include "or/consdiff.h" +#include "feature/dircommon/consdiff.h" #include "lib/memarea/memarea.h" #include "test/log_test_helpers.h" diff --git a/src/test/test_consdiffmgr.c b/src/test/test_consdiffmgr.c index 959075903..6c0601b50 100644 --- a/src/test/test_consdiffmgr.c +++ b/src/test/test_consdiffmgr.c @@ -3,20 +3,20 @@ #define CONSDIFFMGR_PRIVATE -#include "or/or.h" -#include "or/config.h" -#include "or/conscache.h" -#include "or/consdiff.h" -#include "or/consdiffmgr.h" -#include "or/cpuworker.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "feature/dircache/conscache.h" +#include "feature/dircommon/consdiff.h" +#include "feature/dircache/consdiffmgr.h" +#include "core/mainloop/cpuworker.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/networkstatus.h" -#include "or/routerparse.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/routerparse.h" #include "lib/evloop/workqueue.h" #include "lib/compress/compress.h" #include "lib/encoding/confline.h" -#include "or/networkstatus_st.h" +#include "feature/nodelist/networkstatus_st.h" #include "test/test.h" #include "test/log_test_helpers.h" diff --git a/src/test/test_containers.c b/src/test/test_containers.c index 5c712a9b1..717eb0892 100644 --- a/src/test/test_containers.c +++ b/src/test/test_containers.c @@ -4,9 +4,9 @@ /* See LICENSE for licensing information */ #include "orconfig.h" -#include "or/or.h" +#include "core/or/or.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/fp_pair.h" +#include "feature/dircommon/fp_pair.h" #include "test/test.h" #include "lib/container/bitarray.h" diff --git a/src/test/test_controller.c b/src/test/test_controller.c index 54c2e0a2e..2ded04619 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -2,23 +2,23 @@ /* See LICENSE for licensing information */ #define CONTROL_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "lib/crypt_ops/crypto_ed25519.h" -#include "or/bridges.h" -#include "or/control.h" -#include "or/entrynodes.h" -#include "or/hs_common.h" -#include "or/networkstatus.h" -#include "or/rendservice.h" -#include "or/routerlist.h" -#include "or/nodelist.h" +#include "feature/client/bridges.h" +#include "feature/control/control.h" +#include "feature/client/entrynodes.h" +#include "feature/hs/hs_common.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/rend/rendservice.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/nodelist.h" #include "test/test.h" #include "test/test_helpers.h" -#include "or/control_connection_st.h" -#include "or/download_status_st.h" -#include "or/microdesc_st.h" -#include "or/node_st.h" +#include "feature/control/control_connection_st.h" +#include "feature/dirclient/download_status_st.h" +#include "feature/nodelist/microdesc_st.h" +#include "feature/nodelist/node_st.h" static void test_add_onion_helper_keyarg_v3(void *arg) diff --git a/src/test/test_controller_events.c b/src/test/test_controller_events.c index 33a45a99c..e935b7042 100644 --- a/src/test/test_controller_events.c +++ b/src/test/test_controller_events.c @@ -4,16 +4,16 @@ #define CONNECTION_PRIVATE #define TOR_CHANNEL_INTERNAL_ #define CONTROL_PRIVATE -#include "or/or.h" -#include "or/channel.h" -#include "or/channeltls.h" -#include "or/circuitlist.h" -#include "or/connection.h" -#include "or/control.h" +#include "core/or/or.h" +#include "core/or/channel.h" +#include "core/or/channeltls.h" +#include "core/or/circuitlist.h" +#include "core/mainloop/connection.h" +#include "feature/control/control.h" #include "test/test.h" -#include "or/or_circuit_st.h" -#include "or/origin_circuit_st.h" +#include "core/or/or_circuit_st.h" +#include "core/or/origin_circuit_st.h" static void add_testing_cell_stats_entry(circuit_t *circ, uint8_t command, diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 2e38dfc27..2124e2219 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -6,7 +6,7 @@ #include "orconfig.h" #define CRYPTO_CURVE25519_PRIVATE #define CRYPTO_RAND_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" #include "lib/crypt_ops/aes.h" #include "siphash.h" diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c index 7c1dfa0a9..88b31ad9a 100644 --- a/src/test/test_crypto_slow.c +++ b/src/test/test_crypto_slow.c @@ -5,7 +5,7 @@ #include "orconfig.h" #define CRYPTO_S2K_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_ed25519.h" diff --git a/src/test/test_dir.c b/src/test/test_dir.c index a86b2a9f6..bda56b3a8 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -17,51 +17,51 @@ #define NETWORKSTATUS_PRIVATE #define RELAY_PRIVATE -#include "or/or.h" -#include "or/bridges.h" -#include "or/connection.h" -#include "or/confparse.h" -#include "or/config.h" -#include "or/control.h" +#include "core/or/or.h" +#include "feature/client/bridges.h" +#include "core/mainloop/connection.h" +#include "app/config/confparse.h" +#include "app/config/config.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_ed25519.h" #include "lib/crypt_ops/crypto_format.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/directory.h" -#include "or/dirserv.h" -#include "or/dirauth/dirvote.h" -#include "or/entrynodes.h" -#include "or/fp_pair.h" -#include "or/hibernate.h" +#include "feature/dircache/directory.h" +#include "feature/dircache/dirserv.h" +#include "feature/dirauth/dirvote.h" +#include "feature/client/entrynodes.h" +#include "feature/dircommon/fp_pair.h" +#include "feature/hibernate/hibernate.h" #include "lib/memarea/memarea.h" #include "lib/osinfo/uname.h" -#include "or/networkstatus.h" -#include "or/router.h" -#include "or/routerkeys.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/routerset.h" -#include "or/dirauth/shared_random_state.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/relay/router.h" +#include "feature/relay/routerkeys.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/routerset.h" +#include "feature/dirauth/shared_random_state.h" #include "test/test.h" #include "test/test_dir_common.h" -#include "or/torcert.h" -#include "or/relay.h" +#include "feature/nodelist/torcert.h" +#include "core/or/relay.h" #include "test/log_test_helpers.h" -#include "or/voting_schedule.h" +#include "feature/dircommon/voting_schedule.h" #include "lib/compress/compress.h" -#include "or/addr_policy_st.h" -#include "or/authority_cert_st.h" -#include "or/document_signature_st.h" -#include "or/extrainfo_st.h" -#include "or/networkstatus_st.h" -#include "or/networkstatus_voter_info_st.h" -#include "or/ns_detached_signatures_st.h" -#include "or/port_cfg_st.h" -#include "or/routerinfo_st.h" -#include "or/routerlist_st.h" -#include "or/tor_version_st.h" -#include "or/vote_microdesc_hash_st.h" -#include "or/vote_routerstatus_st.h" +#include "core/or/addr_policy_st.h" +#include "feature/nodelist/authority_cert_st.h" +#include "feature/nodelist/document_signature_st.h" +#include "feature/nodelist/extrainfo_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/networkstatus_voter_info_st.h" +#include "feature/dirauth/ns_detached_signatures_st.h" +#include "core/or/port_cfg_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerlist_st.h" +#include "core/or/tor_version_st.h" +#include "feature/dirauth/vote_microdesc_hash_st.h" +#include "feature/nodelist/vote_routerstatus_st.h" #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> diff --git a/src/test/test_dir_common.c b/src/test/test_dir_common.c index a758421cd..e65e2b011 100644 --- a/src/test/test_dir_common.c +++ b/src/test/test_dir_common.c @@ -6,19 +6,19 @@ #include "orconfig.h" #define DIRVOTE_PRIVATE #include "test/test.h" -#include "or/or.h" -#include "or/dirauth/dirvote.h" -#include "or/nodelist.h" -#include "or/routerlist.h" +#include "core/or/or.h" +#include "feature/dirauth/dirvote.h" +#include "feature/nodelist/nodelist.h" +#include "feature/nodelist/routerlist.h" #include "test/test_dir_common.h" -#include "or/voting_schedule.h" +#include "feature/dircommon/voting_schedule.h" -#include "or/authority_cert_st.h" -#include "or/networkstatus_st.h" -#include "or/networkstatus_voter_info_st.h" -#include "or/routerinfo_st.h" -#include "or/vote_microdesc_hash_st.h" -#include "or/vote_routerstatus_st.h" +#include "feature/nodelist/authority_cert_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/networkstatus_voter_info_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/dirauth/vote_microdesc_hash_st.h" +#include "feature/nodelist/vote_routerstatus_st.h" void dir_common_setup_vote(networkstatus_t **vote, time_t now); networkstatus_t * dir_common_add_rs_and_parse(networkstatus_t *vote, diff --git a/src/test/test_dir_common.h b/src/test/test_dir_common.h index 7d5f55afe..1e90228ed 100644 --- a/src/test/test_dir_common.h +++ b/src/test/test_dir_common.h @@ -3,9 +3,9 @@ * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" -#include "or/networkstatus.h" -#include "or/routerparse.h" +#include "core/or/or.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/routerparse.h" #define TEST_DIR_ROUTER_ID_1 3 #define TEST_DIR_ROUTER_ID_2 5 diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 90ca7d357..571b0386e 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -9,37 +9,37 @@ #define CONFIG_PRIVATE #define RENDCACHE_PRIVATE -#include "or/or.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/consdiffmgr.h" -#include "or/directory.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "feature/dircache/consdiffmgr.h" +#include "feature/dircache/directory.h" #include "test/test.h" #include "lib/compress/compress.h" -#include "or/rendcommon.h" -#include "or/rendcache.h" -#include "or/router.h" -#include "or/routerlist.h" +#include "feature/rend/rendcommon.h" +#include "feature/rend/rendcache.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" #include "test/rend_test_helpers.h" -#include "or/microdesc.h" +#include "feature/nodelist/microdesc.h" #include "test/test_helpers.h" -#include "or/nodelist.h" -#include "or/entrynodes.h" -#include "or/routerparse.h" -#include "or/networkstatus.h" -#include "or/proto_http.h" -#include "or/geoip.h" -#include "or/dirserv.h" -#include "or/dirauth/dirvote.h" +#include "feature/nodelist/nodelist.h" +#include "feature/client/entrynodes.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/networkstatus.h" +#include "core/proto/proto_http.h" +#include "feature/stats/geoip.h" +#include "feature/dircache/dirserv.h" +#include "feature/dirauth/dirvote.h" #include "test/log_test_helpers.h" -#include "or/voting_schedule.h" - -#include "or/dir_connection_st.h" -#include "or/dir_server_st.h" -#include "or/networkstatus_st.h" -#include "or/rend_encoded_v2_service_descriptor_st.h" -#include "or/routerinfo_st.h" -#include "or/routerlist_st.h" +#include "feature/dircommon/voting_schedule.h" + +#include "feature/dircommon/dir_connection_st.h" +#include "feature/dirclient/dir_server_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/rend/rend_encoded_v2_service_descriptor_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerlist_st.h" #ifdef _WIN32 /* For mkdir() */ diff --git a/src/test/test_dns.c b/src/test/test_dns.c index 1407a5c47..8369f844f 100644 --- a/src/test/test_dns.c +++ b/src/test/test_dns.c @@ -1,18 +1,18 @@ /* Copyright (c) 2015-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" #define DNS_PRIVATE -#include "or/dns.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/router.h" +#include "feature/relay/dns.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "feature/relay/router.h" -#include "or/edge_connection_st.h" -#include "or/or_circuit_st.h" +#include "core/or/edge_connection_st.h" +#include "core/or/or_circuit_st.h" #define NS_MODULE dns diff --git a/src/test/test_dos.c b/src/test/test_dos.c index 4ba24292c..b411e7b38 100644 --- a/src/test/test_dos.c +++ b/src/test/test_dos.c @@ -5,20 +5,20 @@ #define TOR_CHANNEL_INTERNAL_ #define CIRCUITLIST_PRIVATE -#include "or/or.h" -#include "or/dos.h" -#include "or/circuitlist.h" +#include "core/or/or.h" +#include "core/or/dos.h" +#include "core/or/circuitlist.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/geoip.h" -#include "or/channel.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/routerlist.h" - -#include "or/networkstatus_st.h" -#include "or/or_connection_st.h" -#include "or/routerstatus_st.h" +#include "feature/stats/geoip.h" +#include "core/or/channel.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "feature/nodelist/routerlist.h" + +#include "feature/nodelist/networkstatus_st.h" +#include "core/or/or_connection_st.h" +#include "feature/nodelist/routerstatus_st.h" #include "test/test.h" #include "test/log_test_helpers.h" diff --git a/src/test/test_entryconn.c b/src/test/test_entryconn.c index b23f12087..bec70090e 100644 --- a/src/test/test_entryconn.c +++ b/src/test/test_entryconn.c @@ -6,21 +6,21 @@ #define CONNECTION_PRIVATE #define CONNECTION_EDGE_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" -#include "or/addressmap.h" -#include "or/config.h" -#include "or/confparse.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/nodelist.h" +#include "feature/client/addressmap.h" +#include "app/config/config.h" +#include "app/config/confparse.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "feature/nodelist/nodelist.h" -#include "or/hs_cache.h" -#include "or/rendcache.h" +#include "feature/hs/hs_cache.h" +#include "feature/rend/rendcache.h" -#include "or/entry_connection_st.h" -#include "or/socks_request_st.h" +#include "core/or/entry_connection_st.h" +#include "core/or/socks_request_st.h" #include "lib/encoding/confline.h" diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 9c35cdaaf..cafdeb686 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -10,35 +10,35 @@ #define ROUTERLIST_PRIVATE #define DIRECTORY_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" -#include "or/bridges.h" -#include "or/circuitlist.h" -#include "or/circuitbuild.h" -#include "or/config.h" -#include "or/confparse.h" +#include "feature/client/bridges.h" +#include "core/or/circuitlist.h" +#include "core/or/circuitbuild.h" +#include "app/config/config.h" +#include "app/config/confparse.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/directory.h" -#include "or/entrynodes.h" -#include "or/nodelist.h" -#include "or/networkstatus.h" -#include "or/policies.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/routerset.h" -#include "or/statefile.h" - -#include "or/cpath_build_state_st.h" -#include "or/crypt_path_st.h" -#include "or/dir_connection_st.h" -#include "or/microdesc_st.h" -#include "or/networkstatus_st.h" -#include "or/node_st.h" -#include "or/origin_circuit_st.h" -#include "or/or_state_st.h" -#include "or/routerinfo_st.h" -#include "or/routerstatus_st.h" +#include "feature/dircache/directory.h" +#include "feature/client/entrynodes.h" +#include "feature/nodelist/nodelist.h" +#include "feature/nodelist/networkstatus.h" +#include "core/or/policies.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/routerset.h" +#include "app/config/statefile.h" + +#include "core/or/cpath_build_state_st.h" +#include "core/or/crypt_path_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "feature/nodelist/microdesc_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/node_st.h" +#include "core/or/origin_circuit_st.h" +#include "app/config/or_state_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerstatus_st.h" #include "test/test_helpers.h" #include "test/log_test_helpers.h" diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c index 4ddef4e43..ff987563c 100644 --- a/src/test/test_extorport.c +++ b/src/test/test_extorport.c @@ -4,17 +4,17 @@ #define CONNECTION_PRIVATE #define EXT_ORPORT_PRIVATE #define MAIN_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "lib/container/buffers.h" -#include "or/connection.h" -#include "or/connection_or.h" -#include "or/config.h" -#include "or/control.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_or.h" +#include "app/config/config.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/ext_orport.h" -#include "or/main.h" +#include "feature/relay/ext_orport.h" +#include "core/mainloop/main.h" -#include "or/or_connection_st.h" +#include "core/or/or_connection_st.h" #include "test/test.h" diff --git a/src/test/test_geoip.c b/src/test/test_geoip.c index 9aa46786e..9df8ea798 100644 --- a/src/test/test_geoip.c +++ b/src/test/test_geoip.c @@ -8,9 +8,9 @@ /* These macros pull in declarations for some functions and structures that * are typically file-private. */ #define GEOIP_PRIVATE -#include "or/or.h" -#include "or/config.h" -#include "or/geoip.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "feature/stats/geoip.h" #include "test/test.h" /* Record odd numbered fake-IPs using ipv6, even numbered fake-IPs diff --git a/src/test/test_guardfraction.c b/src/test/test_guardfraction.c index 3c293e378..f45a72329 100644 --- a/src/test/test_guardfraction.c +++ b/src/test/test_guardfraction.c @@ -6,16 +6,16 @@ #define NETWORKSTATUS_PRIVATE #include "orconfig.h" -#include "or/or.h" -#include "or/config.h" -#include "or/dirserv.h" -#include "or/entrynodes.h" -#include "or/routerparse.h" -#include "or/networkstatus.h" - -#include "or/networkstatus_st.h" -#include "or/vote_microdesc_hash_st.h" -#include "or/vote_routerstatus_st.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "feature/dircache/dirserv.h" +#include "feature/client/entrynodes.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/networkstatus.h" + +#include "feature/nodelist/networkstatus_st.h" +#include "feature/dirauth/vote_microdesc_hash_st.h" +#include "feature/nodelist/vote_routerstatus_st.h" #include "test/test.h" #include "test/test_helpers.h" diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c index 6d410af52..c666bca59 100644 --- a/src/test/test_helpers.c +++ b/src/test/test_helpers.c @@ -12,24 +12,24 @@ #define MAIN_PRIVATE #include "orconfig.h" -#include "or/or.h" +#include "core/or/or.h" #include "lib/container/buffers.h" -#include "or/config.h" -#include "or/confparse.h" -#include "or/connection.h" +#include "app/config/config.h" +#include "app/config/confparse.h" +#include "core/mainloop/connection.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/main.h" -#include "or/nodelist.h" -#include "or/relay.h" -#include "or/routerlist.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/relay.h" +#include "feature/nodelist/routerlist.h" #include "lib/encoding/confline.h" -#include "or/cell_st.h" -#include "or/connection_st.h" -#include "or/node_st.h" -#include "or/origin_circuit_st.h" -#include "or/routerlist_st.h" +#include "core/or/cell_st.h" +#include "core/or/connection_st.h" +#include "feature/nodelist/node_st.h" +#include "core/or/origin_circuit_st.h" +#include "feature/nodelist/routerlist_st.h" #include "test/test.h" #include "test/test_helpers.h" @@ -41,7 +41,7 @@ DISABLE_GCC_WARNING(overlength-strings) * at large. */ #endif #include "test_descriptors.inc" -#include "or/circuitlist.h" +#include "core/or/circuitlist.h" #ifdef HAVE_CFLAG_WOVERLENGTH_STRINGS ENABLE_GCC_WARNING(overlength-strings) #endif diff --git a/src/test/test_helpers.h b/src/test/test_helpers.h index c6339d97f..3196c93e6 100644 --- a/src/test/test_helpers.h +++ b/src/test/test_helpers.h @@ -4,7 +4,7 @@ #ifndef TOR_TEST_HELPERS_H #define TOR_TEST_HELPERS_H -#include "or/or.h" +#include "core/or/or.h" const char *get_yesterday_date_str(void); diff --git a/src/test/test_hs.c b/src/test/test_hs.c index b17e8cf21..135df8e9f 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -12,21 +12,21 @@ #define RENDSERVICE_PRIVATE #define HS_SERVICE_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" -#include "or/control.h" -#include "or/config.h" -#include "or/hs_common.h" -#include "or/rendcommon.h" -#include "or/rendservice.h" -#include "or/routerlist.h" -#include "or/routerset.h" -#include "or/circuitbuild.h" - -#include "or/node_st.h" -#include "or/rend_encoded_v2_service_descriptor_st.h" -#include "or/rend_intro_point_st.h" -#include "or/routerinfo_st.h" +#include "feature/control/control.h" +#include "app/config/config.h" +#include "feature/hs/hs_common.h" +#include "feature/rend/rendcommon.h" +#include "feature/rend/rendservice.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerset.h" +#include "core/or/circuitbuild.h" + +#include "feature/nodelist/node_st.h" +#include "feature/rend/rend_encoded_v2_service_descriptor_st.h" +#include "feature/rend/rend_intro_point_st.h" +#include "feature/nodelist/routerinfo_st.h" #include "test/test_helpers.h" diff --git a/src/test/test_hs_cache.c b/src/test/test_hs_cache.c index c22cc4638..c1a69af82 100644 --- a/src/test/test_hs_cache.c +++ b/src/test/test_hs_cache.c @@ -11,16 +11,16 @@ #define HS_CACHE_PRIVATE #include "trunnel/ed25519_cert.h" -#include "or/hs_cache.h" -#include "or/rendcache.h" -#include "or/directory.h" -#include "or/networkstatus.h" -#include "or/connection.h" -#include "or/proto_http.h" +#include "feature/hs/hs_cache.h" +#include "feature/rend/rendcache.h" +#include "feature/dircache/directory.h" +#include "feature/nodelist/networkstatus.h" +#include "core/mainloop/connection.h" +#include "core/proto/proto_http.h" #include "lib/crypt_ops/crypto_format.h" -#include "or/dir_connection_st.h" -#include "or/networkstatus_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "feature/nodelist/networkstatus_st.h" #include "test/hs_test_helpers.h" #include "test/test_helpers.h" diff --git a/src/test/test_hs_cell.c b/src/test/test_hs_cell.c index 4bb3c3f77..b47929e8e 100644 --- a/src/test/test_hs_cell.c +++ b/src/test/test_hs_cell.c @@ -15,9 +15,9 @@ #include "lib/crypt_ops/crypto_ed25519.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/hs_cell.h" -#include "or/hs_intropoint.h" -#include "or/hs_service.h" +#include "feature/hs/hs_cell.h" +#include "feature/hs/hs_intropoint.h" +#include "feature/hs/hs_service.h" /* Trunnel. */ #include "trunnel/hs/cell_establish_intro.h" diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c index 1458c358d..57da03ca2 100644 --- a/src/test/test_hs_client.c +++ b/src/test/test_hs_client.c @@ -20,34 +20,34 @@ #include "test/rend_test_helpers.h" #include "test/hs_test_helpers.h" -#include "or/config.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto_dh.h" -#include "or/channeltls.h" -#include "or/directory.h" -#include "or/main.h" -#include "or/nodelist.h" -#include "or/routerset.h" - -#include "or/hs_circuit.h" -#include "or/hs_circuitmap.h" -#include "or/hs_client.h" -#include "or/hs_ident.h" -#include "or/hs_cache.h" -#include "or/circuitlist.h" -#include "or/circuitbuild.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/networkstatus.h" - -#include "or/cpath_build_state_st.h" -#include "or/crypt_path_st.h" -#include "or/dir_connection_st.h" -#include "or/entry_connection_st.h" -#include "or/extend_info_st.h" -#include "or/networkstatus_st.h" -#include "or/origin_circuit_st.h" -#include "or/socks_request_st.h" +#include "core/or/channeltls.h" +#include "feature/dircache/directory.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/nodelist.h" +#include "feature/nodelist/routerset.h" + +#include "feature/hs/hs_circuit.h" +#include "feature/hs/hs_circuitmap.h" +#include "feature/hs/hs_client.h" +#include "feature/hs/hs_ident.h" +#include "feature/hs/hs_cache.h" +#include "core/or/circuitlist.h" +#include "core/or/circuitbuild.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "feature/nodelist/networkstatus.h" + +#include "core/or/cpath_build_state_st.h" +#include "core/or/crypt_path_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "core/or/entry_connection_st.h" +#include "core/or/extend_info_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "core/or/origin_circuit_st.h" +#include "core/or/socks_request_st.h" static int mock_connection_ap_handshake_send_begin(entry_connection_t *ap_conn) diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index 4c39570e3..f17cc8aeb 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -16,29 +16,29 @@ #include "test/log_test_helpers.h" #include "test/hs_test_helpers.h" -#include "or/connection_edge.h" +#include "core/or/connection_edge.h" #include "lib/crypt_ops/crypto_format.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/hs_common.h" -#include "or/hs_client.h" -#include "or/hs_service.h" -#include "or/config.h" -#include "or/networkstatus.h" -#include "or/directory.h" -#include "or/dirauth/dirvote.h" -#include "or/nodelist.h" -#include "or/routerlist.h" -#include "or/statefile.h" -#include "or/circuitlist.h" -#include "or/dirauth/shared_random.h" -#include "or/voting_schedule.h" - -#include "or/microdesc_st.h" -#include "or/networkstatus_st.h" -#include "or/node_st.h" -#include "or/or_state_st.h" -#include "or/routerinfo_st.h" -#include "or/routerstatus_st.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_client.h" +#include "feature/hs/hs_service.h" +#include "app/config/config.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/dircache/directory.h" +#include "feature/dirauth/dirvote.h" +#include "feature/nodelist/nodelist.h" +#include "feature/nodelist/routerlist.h" +#include "app/config/statefile.h" +#include "core/or/circuitlist.h" +#include "feature/dirauth/shared_random.h" +#include "feature/dircommon/voting_schedule.h" + +#include "feature/nodelist/microdesc_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/node_st.h" +#include "app/config/or_state_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerstatus_st.h" /** Test the validation of HS v3 addresses */ static void diff --git a/src/test/test_hs_config.c b/src/test/test_hs_config.c index 33ad09313..498d2df19 100644 --- a/src/test/test_hs_config.c +++ b/src/test/test_hs_config.c @@ -13,11 +13,11 @@ #include "test/test_helpers.h" #include "test/log_test_helpers.h" -#include "or/config.h" -#include "or/hs_common.h" -#include "or/hs_config.h" -#include "or/hs_service.h" -#include "or/rendservice.h" +#include "app/config/config.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_config.h" +#include "feature/hs/hs_service.h" +#include "feature/rend/rendservice.h" static int helper_config_service(const char *conf, int validate_only) diff --git a/src/test/test_hs_control.c b/src/test/test_hs_control.c index 6e5e78337..48402030b 100644 --- a/src/test/test_hs_control.c +++ b/src/test/test_hs_control.c @@ -8,16 +8,16 @@ #define CONTROL_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" -#include "or/control.h" -#include "or/config.h" -#include "or/hs_common.h" -#include "or/hs_control.h" -#include "or/nodelist.h" - -#include "or/node_st.h" -#include "or/routerstatus_st.h" +#include "feature/control/control.h" +#include "app/config/config.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_control.h" +#include "feature/nodelist/nodelist.h" + +#include "feature/nodelist/node_st.h" +#include "feature/nodelist/routerstatus_st.h" #include "lib/crypt_ops/crypto_format.h" #include "test/test_helpers.h" diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index a017facd2..9a7e66eae 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -13,10 +13,10 @@ #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_rand.h" #include "trunnel/ed25519_cert.h" -#include "or/or.h" -#include "or/hs_descriptor.h" +#include "core/or/or.h" +#include "feature/hs/hs_descriptor.h" #include "test/test.h" -#include "or/torcert.h" +#include "feature/nodelist/torcert.h" #include "test/hs_test_helpers.h" #include "test/test_helpers.h" diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c index 2445a8fcf..7da376471 100644 --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@ -15,20 +15,20 @@ #include "test/log_test_helpers.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/or.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" +#include "core/or/or.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" #include "ht.h" -#include "or/relay.h" -#include "or/rendservice.h" +#include "core/or/relay.h" +#include "feature/rend/rendservice.h" -#include "or/hs_cell.h" -#include "or/hs_circuitmap.h" -#include "or/hs_common.h" -#include "or/hs_intropoint.h" -#include "or/hs_service.h" +#include "feature/hs/hs_cell.h" +#include "feature/hs/hs_circuitmap.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_intropoint.h" +#include "feature/hs/hs_service.h" -#include "or/or_circuit_st.h" +#include "core/or/or_circuit_st.h" /* Trunnel. */ #include "trunnel/hs/cell_establish_intro.h" diff --git a/src/test/test_hs_ntor.c b/src/test/test_hs_ntor.c index c52440900..eeb049165 100644 --- a/src/test/test_hs_ntor.c +++ b/src/test/test_hs_ntor.c @@ -12,7 +12,7 @@ #include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_ed25519.h" -#include "or/hs_ntor.h" +#include "core/crypto/hs_ntor.h" /* Test the HS ntor handshake. Simulate the sending of an encrypted INTRODUCE1 * cell, and verify the proper derivation of decryption keys on the other end. diff --git a/src/test/test_hs_ntor_cl.c b/src/test/test_hs_ntor_cl.c index 8643897db..03e34968b 100644 --- a/src/test/test_hs_ntor_cl.c +++ b/src/test/test_hs_ntor_cl.c @@ -13,13 +13,13 @@ #include <stdlib.h> #define ONION_NTOR_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_ed25519.h" #include "lib/crypt_ops/crypto_format.h" -#include "or/hs_ntor.h" -#include "or/onion_ntor.h" +#include "core/crypto/hs_ntor.h" +#include "core/crypto/onion_ntor.h" #define N_ARGS(n) STMT_BEGIN { \ if (argc < (n)) { \ diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index e81a5eff4..8074d260a 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -28,39 +28,39 @@ #include "test/rend_test_helpers.h" #include "test/hs_test_helpers.h" -#include "or/or.h" -#include "or/config.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/dirauth/dirvote.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/relay.h" -#include "or/routerparse.h" -#include "or/hs_common.h" -#include "or/hs_config.h" -#include "or/hs_ident.h" -#include "or/hs_intropoint.h" -#include "or/hs_ntor.h" -#include "or/hs_circuit.h" -#include "or/hs_circuitmap.h" -#include "or/hs_service.h" -#include "or/hs_client.h" -#include "or/main.h" -#include "or/rendservice.h" -#include "or/statefile.h" -#include "or/dirauth/shared_random_state.h" -#include "or/voting_schedule.h" - -#include "or/cpath_build_state_st.h" -#include "or/crypt_path_st.h" -#include "or/networkstatus_st.h" -#include "or/node_st.h" -#include "or/origin_circuit_st.h" -#include "or/or_state_st.h" -#include "or/routerinfo_st.h" +#include "feature/dirauth/dirvote.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/relay.h" +#include "feature/nodelist/routerparse.h" +#include "feature/hs/hs_common.h" +#include "feature/hs/hs_config.h" +#include "feature/hs/hs_ident.h" +#include "feature/hs/hs_intropoint.h" +#include "core/crypto/hs_ntor.h" +#include "feature/hs/hs_circuit.h" +#include "feature/hs/hs_circuitmap.h" +#include "feature/hs/hs_service.h" +#include "feature/hs/hs_client.h" +#include "core/mainloop/main.h" +#include "feature/rend/rendservice.h" +#include "app/config/statefile.h" +#include "feature/dirauth/shared_random_state.h" +#include "feature/dircommon/voting_schedule.h" + +#include "core/or/cpath_build_state_st.h" +#include "core/or/crypt_path_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/node_st.h" +#include "core/or/origin_circuit_st.h" +#include "app/config/or_state_st.h" +#include "feature/nodelist/routerinfo_st.h" /* Trunnel */ #include "trunnel/hs/cell_establish_intro.h" diff --git a/src/test/test_introduce.c b/src/test/test_introduce.c index f62c7f880..cdfb70bdf 100644 --- a/src/test/test_introduce.c +++ b/src/test/test_introduce.c @@ -3,11 +3,11 @@ #include "orconfig.h" #include "lib/crypt_ops/crypto.h" -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" #define RENDSERVICE_PRIVATE -#include "or/rendservice.h" +#include "feature/rend/rendservice.h" static uint8_t v0_test_plaintext[] = /* 20 bytes of rendezvous point nickname */ diff --git a/src/test/test_keypin.c b/src/test/test_keypin.c index e7897a847..9af12ff54 100644 --- a/src/test/test_keypin.c +++ b/src/test/test_keypin.c @@ -3,8 +3,8 @@ #include "orconfig.h" #define KEYPIN_PRIVATE -#include "or/or.h" -#include "or/keypin.h" +#include "core/or/or.h" +#include "feature/dirauth/keypin.h" #include "test/test.h" diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c index 515fdc50a..e0d12fb47 100644 --- a/src/test/test_link_handshake.c +++ b/src/test/test_link_handshake.c @@ -8,21 +8,21 @@ #define TOR_CHANNEL_INTERNAL_ #define TORTLS_PRIVATE -#include "or/or.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_or.h" -#include "or/channeltls.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_or.h" +#include "core/or/channeltls.h" #include "trunnel/link_handshake.h" -#include "or/router.h" -#include "or/routerkeys.h" -#include "or/scheduler.h" -#include "or/torcert.h" - -#include "or/or_connection_st.h" -#include "or/or_handshake_certs_st.h" -#include "or/or_handshake_state_st.h" -#include "or/var_cell_st.h" +#include "feature/relay/router.h" +#include "feature/relay/routerkeys.h" +#include "core/or/scheduler.h" +#include "feature/nodelist/torcert.h" + +#include "core/or/or_connection_st.h" +#include "core/or/or_handshake_certs_st.h" +#include "core/or/or_handshake_state_st.h" +#include "core/or/var_cell_st.h" #include "lib/tls/tortls.h" diff --git a/src/test/test_logging.c b/src/test/test_logging.c index 48cdf2e6b..2e3b8800a 100644 --- a/src/test/test_logging.c +++ b/src/test/test_logging.c @@ -4,8 +4,8 @@ #define CONFIG_PRIVATE #include "orconfig.h" -#include "or/or.h" -#include "or/config.h" +#include "core/or/or.h" +#include "app/config/config.h" #include "lib/err/torerr.h" #include "lib/log/torlog.h" #include "test/test.h" diff --git a/src/test/test_mainloop.c b/src/test/test_mainloop.c index 469820b59..f85c224ae 100644 --- a/src/test/test_mainloop.c +++ b/src/test/test_mainloop.c @@ -9,8 +9,8 @@ #include "test/test.h" #include "test/log_test_helpers.h" -#include "or/or.h" -#include "or/main.h" +#include "core/or/or.h" +#include "core/mainloop/main.h" static const uint64_t BILLION = 1000000000; diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index 2038f5498..ec4779ead 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -2,21 +2,21 @@ /* See LICENSE for licensing information */ #include "orconfig.h" -#include "or/or.h" +#include "core/or/or.h" -#include "or/config.h" +#include "app/config/config.h" #define DIRVOTE_PRIVATE -#include "or/dirauth/dirvote.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/torcert.h" - -#include "or/microdesc_st.h" -#include "or/networkstatus_st.h" -#include "or/routerinfo_st.h" -#include "or/routerstatus_st.h" +#include "feature/dirauth/dirvote.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/torcert.h" + +#include "feature/nodelist/microdesc_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerstatus_st.h" #include "test/test.h" diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c index 1dc8bc2d2..cdd5e95cf 100644 --- a/src/test/test_nodelist.c +++ b/src/test/test_nodelist.c @@ -6,17 +6,17 @@ * \brief Unit tests for nodelist related functions. **/ -#include "or/or.h" +#include "core/or/or.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/torcert.h" - -#include "or/microdesc_st.h" -#include "or/networkstatus_st.h" -#include "or/node_st.h" -#include "or/routerinfo_st.h" -#include "or/routerstatus_st.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "feature/nodelist/torcert.h" + +#include "feature/nodelist/microdesc_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/node_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerstatus_st.h" #include "test/test.h" diff --git a/src/test/test_ntor_cl.c b/src/test/test_ntor_cl.c index 5711a9116..744b42c9d 100644 --- a/src/test/test_ntor_cl.c +++ b/src/test/test_ntor_cl.c @@ -6,10 +6,10 @@ #include <stdlib.h> #define ONION_NTOR_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto_curve25519.h" -#include "or/onion_ntor.h" +#include "core/crypto/onion_ntor.h" #define N_ARGS(n) STMT_BEGIN { \ if (argc < (n)) { \ diff --git a/src/test/test_oom.c b/src/test/test_oom.c index 6c3ee1a27..313a6b311 100644 --- a/src/test/test_oom.c +++ b/src/test/test_oom.c @@ -7,21 +7,21 @@ #define BUFFERS_PRIVATE #define CIRCUITLIST_PRIVATE #define CONNECTION_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "lib/container/buffers.h" -#include "or/circuitlist.h" +#include "core/or/circuitlist.h" #include "lib/evloop/compat_libevent.h" -#include "or/connection.h" -#include "or/config.h" +#include "core/mainloop/connection.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/relay.h" +#include "core/or/relay.h" #include "test/test.h" #include "test/test_helpers.h" -#include "or/cell_st.h" -#include "or/entry_connection_st.h" -#include "or/or_circuit_st.h" -#include "or/origin_circuit_st.h" +#include "core/or/cell_st.h" +#include "core/or/entry_connection_st.h" +#include "core/or/or_circuit_st.h" +#include "core/or/origin_circuit_st.h" /* small replacement mock for circuit_mark_for_close_ to avoid doing all * the other bookkeeping that comes with marking circuits. */ diff --git a/src/test/test_oos.c b/src/test/test_oos.c index f101390d6..5f9942d8a 100644 --- a/src/test/test_oos.c +++ b/src/test/test_oos.c @@ -5,16 +5,16 @@ #define CONNECTION_PRIVATE -#include "or/or.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_or.h" -#include "or/directory.h" -#include "or/main.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_or.h" +#include "feature/dircache/directory.h" +#include "core/mainloop/main.h" #include "test/test.h" -#include "or/dir_connection_st.h" -#include "or/or_connection_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "core/or/or_connection_st.h" static or_options_t mock_options; diff --git a/src/test/test_options.c b/src/test/test_options.c index f2aaf30c2..396965401 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -4,22 +4,22 @@ /* See LICENSE for licensing information */ #define CONFIG_PRIVATE -#include "or/or.h" -#include "or/confparse.h" -#include "or/config.h" +#include "core/or/or.h" +#include "app/config/confparse.h" +#include "app/config/config.h" #include "test/test.h" -#include "or/geoip.h" +#include "feature/stats/geoip.h" #define ROUTERSET_PRIVATE -#include "or/routerset.h" -#include "or/main.h" +#include "feature/nodelist/routerset.h" +#include "core/mainloop/main.h" #include "test/log_test_helpers.h" #include "lib/sandbox/sandbox.h" #include "lib/memarea/memarea.h" #include "lib/osinfo/uname.h" #include "lib/encoding/confline.h" -#include "or/policies.h" +#include "core/or/policies.h" #include "test/test_helpers.h" #define NS_MODULE test_options diff --git a/src/test/test_periodic_event.c b/src/test/test_periodic_event.c index b353cf87a..03ba3df79 100644 --- a/src/test/test_periodic_event.c +++ b/src/test/test_periodic_event.c @@ -14,12 +14,12 @@ #include "test/test.h" #include "test/test_helpers.h" -#include "or/or.h" -#include "or/config.h" -#include "or/hibernate.h" -#include "or/hs_service.h" -#include "or/main.h" -#include "or/periodic.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "feature/hibernate/hibernate.h" +#include "feature/hs/hs_service.h" +#include "core/mainloop/main.h" +#include "core/mainloop/periodic.h" /** Helper function: This is replaced in some tests for the event callbacks so * we don't actually go into the code path of those callbacks. */ diff --git a/src/test/test_policy.c b/src/test/test_policy.c index a6906af41..4b1adc91f 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -1,21 +1,21 @@ /* Copyright (c) 2013-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" #define CONFIG_PRIVATE -#include "or/config.h" -#include "or/router.h" -#include "or/routerparse.h" +#include "app/config/config.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerparse.h" #define POLICIES_PRIVATE -#include "or/policies.h" +#include "core/or/policies.h" #include "lib/encoding/confline.h" #include "test/test.h" -#include "or/addr_policy_st.h" -#include "or/node_st.h" -#include "or/port_cfg_st.h" -#include "or/routerinfo_st.h" -#include "or/routerstatus_st.h" +#include "core/or/addr_policy_st.h" +#include "feature/nodelist/node_st.h" +#include "core/or/port_cfg_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerstatus_st.h" /* Helper: assert that short_policy parses and writes back out as itself, or as <b>expected</b> if that's provided. */ diff --git a/src/test/test_procmon.c b/src/test/test_procmon.c index e2915d0fb..2c7918f58 100644 --- a/src/test/test_procmon.c +++ b/src/test/test_procmon.c @@ -3,7 +3,7 @@ #define PROCMON_PRIVATE #include "orconfig.h" -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" #include "lib/evloop/procmon.h" diff --git a/src/test/test_proto_http.c b/src/test/test_proto_http.c index 57bfe2463..1cfa0a752 100644 --- a/src/test/test_proto_http.c +++ b/src/test/test_proto_http.c @@ -6,10 +6,10 @@ * \brief Tests for our HTTP protocol parser code */ -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" #include "lib/container/buffers.h" -#include "or/proto_http.h" +#include "core/proto/proto_http.h" #include "test/log_test_helpers.h" #define S(str) str, sizeof(str)-1 diff --git a/src/test/test_proto_misc.c b/src/test/test_proto_misc.c index 7f066e14a..1fcb76342 100644 --- a/src/test/test_proto_misc.c +++ b/src/test/test_proto_misc.c @@ -6,16 +6,16 @@ * \brief Test our smaller buffer-based protocol functions */ -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" #include "lib/container/buffers.h" -#include "or/connection_or.h" -#include "or/ext_orport.h" -#include "or/proto_cell.h" -#include "or/proto_control0.h" -#include "or/proto_ext_or.h" +#include "core/or/connection_or.h" +#include "feature/relay/ext_orport.h" +#include "core/proto/proto_cell.h" +#include "core/proto/proto_control0.h" +#include "core/proto/proto_ext_or.h" -#include "or/var_cell_st.h" +#include "core/or/var_cell_st.h" static void test_proto_var_cell(void *arg) diff --git a/src/test/test_protover.c b/src/test/test_protover.c index f17f68ced..a90ff5a08 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -6,10 +6,10 @@ #include "orconfig.h" #include "test/test.h" -#include "or/protover.h" +#include "core/proto/protover.h" -#include "or/or.h" -#include "or/connection_or.h" +#include "core/or/or.h" +#include "core/or/connection_or.h" static void test_protover_parse(void *arg) diff --git a/src/test/test_pt.c b/src/test/test_pt.c index 189cb2584..dea3791da 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -9,18 +9,18 @@ #define STATEFILE_PRIVATE #define CONTROL_PRIVATE #define SUBPROCESS_PRIVATE -#include "or/or.h" -#include "or/config.h" -#include "or/confparse.h" -#include "or/control.h" -#include "or/transports.h" -#include "or/circuitbuild.h" -#include "or/statefile.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "app/config/confparse.h" +#include "feature/control/control.h" +#include "feature/client/transports.h" +#include "core/or/circuitbuild.h" +#include "app/config/statefile.h" #include "test/test.h" #include "lib/process/subprocess.h" #include "lib/encoding/confline.h" -#include "or/or_state_st.h" +#include "app/config/or_state_st.h" static void reset_mp(managed_proxy_t *mp) diff --git a/src/test/test_relay.c b/src/test/test_relay.c index fe5795d11..25084fab3 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -1,17 +1,17 @@ /* Copyright (c) 2014-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" #define CIRCUITBUILD_PRIVATE -#include "or/circuitbuild.h" -#include "or/circuitlist.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" #define RELAY_PRIVATE -#include "or/relay.h" +#include "core/or/relay.h" /* For init/free stuff */ -#include "or/scheduler.h" +#include "core/or/scheduler.h" -#include "or/cell_st.h" -#include "or/or_circuit_st.h" +#include "core/or/cell_st.h" +#include "core/or/or_circuit_st.h" /* Test suite stuff */ #include "test/test.h" diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c index 9f314b770..eb30cab0e 100644 --- a/src/test/test_relaycell.c +++ b/src/test/test_relaycell.c @@ -5,22 +5,22 @@ #define RELAY_PRIVATE #define CIRCUITLIST_PRIVATE -#include "or/or.h" -#include "or/main.h" -#include "or/config.h" -#include "or/connection.h" +#include "core/or/or.h" +#include "core/mainloop/main.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" #include "lib/crypt_ops/crypto.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/connection_edge.h" -#include "or/relay.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/connection_edge.h" +#include "core/or/relay.h" #include "test/test.h" -#include "or/cell_st.h" -#include "or/crypt_path_st.h" -#include "or/entry_connection_st.h" -#include "or/origin_circuit_st.h" -#include "or/socks_request_st.h" +#include "core/or/cell_st.h" +#include "core/or/crypt_path_st.h" +#include "core/or/entry_connection_st.h" +#include "core/or/origin_circuit_st.h" +#include "core/or/socks_request_st.h" static int srm_ncalls; static entry_connection_t *srm_conn; diff --git a/src/test/test_relaycrypt.c b/src/test/test_relaycrypt.c index 7f0ca0698..c3cfb7d10 100644 --- a/src/test/test_relaycrypt.c +++ b/src/test/test_relaycrypt.c @@ -3,17 +3,17 @@ * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" -#include "or/circuitbuild.h" +#include "core/or/or.h" +#include "core/or/circuitbuild.h" #define CIRCUITLIST_PRIVATE -#include "or/circuitlist.h" +#include "core/or/circuitlist.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/relay.h" -#include "or/relay_crypto.h" +#include "core/or/relay.h" +#include "core/crypto/relay_crypto.h" -#include "or/cell_st.h" -#include "or/or_circuit_st.h" -#include "or/origin_circuit_st.h" +#include "core/or/cell_st.h" +#include "core/or/or_circuit_st.h" +#include "core/or/origin_circuit_st.h" #include "test/test.h" diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 3d606aac0..394e28d78 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -2,21 +2,21 @@ /* See LICENSE for licensing information */ #include "orconfig.h" -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" #define RENDCACHE_PRIVATE -#include "or/rendcache.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/config.h" -#include "or/hs_common.h" - -#include "or/extend_info_st.h" -#include "or/rend_encoded_v2_service_descriptor_st.h" -#include "or/rend_intro_point_st.h" -#include "or/rend_service_descriptor_st.h" -#include "or/routerinfo_st.h" +#include "feature/rend/rendcache.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "app/config/config.h" +#include "feature/hs/hs_common.h" + +#include "core/or/extend_info_st.h" +#include "feature/rend/rend_encoded_v2_service_descriptor_st.h" +#include "feature/rend/rend_intro_point_st.h" +#include "feature/rend/rend_service_descriptor_st.h" +#include "feature/nodelist/routerinfo_st.h" #include "test/rend_test_helpers.h" #include "test/log_test_helpers.h" diff --git a/src/test/test_replay.c b/src/test/test_replay.c index 7f9c0b09e..bca3a6660 100644 --- a/src/test/test_replay.c +++ b/src/test/test_replay.c @@ -4,8 +4,8 @@ #define REPLAYCACHE_PRIVATE #include "orconfig.h" -#include "or/or.h" -#include "or/replaycache.h" +#include "core/or/or.h" +#include "feature/hs_common/replaycache.h" #include "test/test.h" static const char *test_buffer = diff --git a/src/test/test_router.c b/src/test/test_router.c index 6e9424a3a..a398c7497 100644 --- a/src/test/test_router.c +++ b/src/test/test_router.c @@ -7,14 +7,14 @@ * \brief Unittests for code in src/or/router.c **/ -#include "or/or.h" -#include "or/config.h" +#include "core/or/or.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_ed25519.h" -#include "or/router.h" -#include "or/routerlist.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" -#include "or/routerinfo_st.h" +#include "feature/nodelist/routerinfo_st.h" /* Test suite stuff */ #include "test/test.h" diff --git a/src/test/test_routerkeys.c b/src/test/test_routerkeys.c index 2a761ad6e..1a1bf63ba 100644 --- a/src/test/test_routerkeys.c +++ b/src/test/test_routerkeys.c @@ -5,13 +5,13 @@ #include "orconfig.h" #define ROUTER_PRIVATE -#include "or/or.h" -#include "or/config.h" -#include "or/router.h" -#include "or/routerkeys.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "feature/relay/router.h" +#include "feature/relay/routerkeys.h" #include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto_format.h" -#include "or/torcert.h" +#include "feature/nodelist/torcert.h" #include "test/test.h" #ifdef _WIN32 diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index b25a0be9a..89d1f4f90 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -13,32 +13,32 @@ #define NETWORKSTATUS_PRIVATE #define ROUTERLIST_PRIVATE #define TOR_UNIT_TESTING -#include "or/or.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/control.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/directory.h" -#include "or/dirauth/dirvote.h" -#include "or/entrynodes.h" -#include "or/hibernate.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerset.h" -#include "or/routerparse.h" -#include "or/dirauth/shared_random.h" -#include "or/statefile.h" - -#include "or/authority_cert_st.h" -#include "or/dir_connection_st.h" -#include "or/networkstatus_st.h" -#include "or/node_st.h" -#include "or/or_state_st.h" -#include "or/routerstatus_st.h" +#include "feature/dircache/directory.h" +#include "feature/dirauth/dirvote.h" +#include "feature/client/entrynodes.h" +#include "feature/hibernate/hibernate.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerset.h" +#include "feature/nodelist/routerparse.h" +#include "feature/dirauth/shared_random.h" +#include "app/config/statefile.h" + +#include "feature/nodelist/authority_cert_st.h" +#include "feature/dircommon/dir_connection_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/node_st.h" +#include "app/config/or_state_st.h" +#include "feature/nodelist/routerstatus_st.h" #include "lib/encoding/confline.h" #include "lib/container/buffers.h" diff --git a/src/test/test_routerset.c b/src/test/test_routerset.c index ea8b43498..2017ef005 100644 --- a/src/test/test_routerset.c +++ b/src/test/test_routerset.c @@ -3,18 +3,18 @@ #define ROUTERSET_PRIVATE -#include "or/or.h" -#include "or/geoip.h" -#include "or/routerset.h" -#include "or/routerparse.h" -#include "or/policies.h" -#include "or/nodelist.h" - -#include "or/addr_policy_st.h" -#include "or/extend_info_st.h" -#include "or/node_st.h" -#include "or/routerinfo_st.h" -#include "or/routerstatus_st.h" +#include "core/or/or.h" +#include "feature/stats/geoip.h" +#include "feature/nodelist/routerset.h" +#include "feature/nodelist/routerparse.h" +#include "core/or/policies.h" +#include "feature/nodelist/nodelist.h" + +#include "core/or/addr_policy_st.h" +#include "core/or/extend_info_st.h" +#include "feature/nodelist/node_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerstatus_st.h" #include "test/test.h" diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c index 555a2a6bf..2d562299a 100644 --- a/src/test/test_scheduler.c +++ b/src/test/test_scheduler.c @@ -8,15 +8,15 @@ #define SCHEDULER_KIST_PRIVATE #define TOR_CHANNEL_INTERNAL_ #define CHANNEL_PRIVATE_ -#include "or/or.h" -#include "or/config.h" +#include "core/or/or.h" +#include "app/config/config.h" #include "lib/evloop/compat_libevent.h" -#include "or/channel.h" -#include "or/channeltls.h" -#include "or/connection.h" -#include "or/networkstatus.h" +#include "core/or/channel.h" +#include "core/or/channeltls.h" +#include "core/mainloop/connection.h" +#include "feature/nodelist/networkstatus.h" #define SCHEDULER_PRIVATE_ -#include "or/scheduler.h" +#include "core/or/scheduler.h" /* Test suite stuff */ #include "test/test.h" diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 1b4fdc899..ccf051606 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -6,25 +6,25 @@ #define CONFIG_PRIVATE #define DIRVOTE_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" -#include "or/config.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/dirauth/dirvote.h" -#include "or/dirauth/shared_random.h" -#include "or/dirauth/shared_random_state.h" +#include "feature/dirauth/dirvote.h" +#include "feature/dirauth/shared_random.h" +#include "feature/dirauth/shared_random_state.h" #include "test/log_test_helpers.h" -#include "or/networkstatus.h" -#include "or/router.h" -#include "or/routerkeys.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/shared_random_client.h" -#include "or/voting_schedule.h" - -#include "or/dir_server_st.h" -#include "or/networkstatus_st.h" -#include "or/or_state_st.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/relay/router.h" +#include "feature/relay/routerkeys.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "feature/hs_common/shared_random_client.h" +#include "feature/dircommon/voting_schedule.h" + +#include "feature/dirclient/dir_server_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "app/config/or_state_st.h" #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> diff --git a/src/test/test_slow.c b/src/test/test_slow.c index 951851ec0..0b665363a 100644 --- a/src/test/test_slow.c +++ b/src/test/test_slow.c @@ -15,7 +15,7 @@ #include <fcntl.h> #endif -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" struct testgroup_t testgroups[] = { diff --git a/src/test/test_socks.c b/src/test/test_socks.c index 0a01bf643..e064cc8db 100644 --- a/src/test/test_socks.c +++ b/src/test/test_socks.c @@ -3,14 +3,14 @@ * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" #include "lib/container/buffers.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/proto_socks.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/proto/proto_socks.h" #include "test/test.h" #include "test/log_test_helpers.h" -#include "or/socks_request_st.h" +#include "core/or/socks_request_st.h" #include "lib/net/socks5_status.h" typedef struct socks_test_data_t { diff --git a/src/test/test_status.c b/src/test/test_status.c index c92ba48e2..3cc23955a 100644 --- a/src/test/test_status.c +++ b/src/test/test_status.c @@ -11,24 +11,24 @@ #include <float.h> #include <math.h> -#include "or/or.h" +#include "core/or/or.h" #include "lib/log/torlog.h" #include "tor_queue.h" -#include "or/status.h" -#include "or/circuitlist.h" -#include "or/config.h" -#include "or/hibernate.h" -#include "or/rephist.h" -#include "or/relay.h" -#include "or/router.h" -#include "or/main.h" -#include "or/nodelist.h" -#include "or/statefile.h" +#include "core/or/status.h" +#include "core/or/circuitlist.h" +#include "app/config/config.h" +#include "feature/hibernate/hibernate.h" +#include "feature/stats/rephist.h" +#include "core/or/relay.h" +#include "feature/relay/router.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/nodelist.h" +#include "app/config/statefile.h" #include "lib/tls/tortls.h" -#include "or/origin_circuit_st.h" -#include "or/or_state_st.h" -#include "or/routerinfo_st.h" +#include "core/or/origin_circuit_st.h" +#include "app/config/or_state_st.h" +#include "feature/nodelist/routerinfo_st.h" #include "test/test.h" diff --git a/src/test/test_storagedir.c b/src/test/test_storagedir.c index efb6a0027..68cee418a 100644 --- a/src/test/test_storagedir.c +++ b/src/test/test_storagedir.c @@ -1,7 +1,7 @@ /* Copyright (c) 2017-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/fs/storagedir.h" #include "lib/encoding/confline.h" diff --git a/src/test/test_switch_id.c b/src/test/test_switch_id.c index 95801822f..d8a1d15e4 100644 --- a/src/test/test_switch_id.c +++ b/src/test/test_switch_id.c @@ -1,7 +1,7 @@ /* Copyright (c) 2015-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" #include "lib/process/setuid.h" #ifdef HAVE_SYS_CAPABILITY_H diff --git a/src/test/test_threads.c b/src/test/test_threads.c index e698e4f61..f0a4dd205 100644 --- a/src/test/test_threads.c +++ b/src/test/test_threads.c @@ -4,7 +4,7 @@ /* See LICENSE for licensing information */ #include "orconfig.h" -#include "or/or.h" +#include "core/or/or.h" #include "lib/thread/threads.h" #include "test/test.h" diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 9ae9d4dfb..2b40ed72d 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -30,11 +30,11 @@ DISABLE_GCC_WARNING(redundant-decls) ENABLE_GCC_WARNING(redundant-decls) -#include "or/or.h" +#include "core/or/or.h" #include "lib/log/torlog.h" -#include "or/config.h" +#include "app/config/config.h" #include "lib/tls/tortls.h" -#include "or/or_state_st.h" +#include "app/config/or_state_st.h" #include "test/test.h" #include "test/log_test_helpers.h" diff --git a/src/test/test_util.c b/src/test/test_util.c index 60cd7ad66..99fee4c5a 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -12,11 +12,11 @@ #define SOCKET_PRIVATE #define SUBPROCESS_PRIVATE #include "lib/testsupport/testsupport.h" -#include "or/or.h" +#include "core/or/or.h" #include "lib/container/buffers.h" -#include "or/config.h" -#include "or/control.h" -#include "or/transports.h" +#include "app/config/config.h" +#include "feature/control/control.h" +#include "feature/client/transports.h" #include "lib/crypt_ops/crypto_format.h" #include "lib/crypt_ops/crypto_rand.h" #include "test/test.h" diff --git a/src/test/test_util_format.c b/src/test/test_util_format.c index ea42d8dd5..85d8a8e62 100644 --- a/src/test/test_util_format.c +++ b/src/test/test_util_format.c @@ -2,7 +2,7 @@ /* See LICENSE for licensing information */ #include "orconfig.h" -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" diff --git a/src/test/test_util_process.c b/src/test/test_util_process.c index 9dce520d0..44c4da916 100644 --- a/src/test/test_util_process.c +++ b/src/test/test_util_process.c @@ -3,7 +3,7 @@ #define UTIL_PROCESS_PRIVATE #include "orconfig.h" -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" diff --git a/src/test/test_voting_schedule.c b/src/test/test_voting_schedule.c index b5df59643..c3a581cf2 100644 --- a/src/test/test_voting_schedule.c +++ b/src/test/test_voting_schedule.c @@ -3,8 +3,8 @@ #include "orconfig.h" -#include "or/or.h" -#include "or/voting_schedule.h" +#include "core/or/or.h" +#include "feature/dircommon/voting_schedule.h" #include "test/test.h" diff --git a/src/test/test_workqueue.c b/src/test/test_workqueue.c index 2cb42734c..4550bad1f 100644 --- a/src/test/test_workqueue.c +++ b/src/test/test_workqueue.c @@ -3,9 +3,9 @@ * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" +#include "core/or/or.h" #include "lib/thread/threads.h" -#include "or/onion.h" +#include "core/crypto/onion.h" #include "lib/evloop/workqueue.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_rand.h" diff --git a/src/test/testing_common.c b/src/test/testing_common.c index b0514f85e..3880bca9c 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -10,17 +10,17 @@ #define MAIN_PRIVATE #include "orconfig.h" -#include "or/or.h" -#include "or/control.h" -#include "or/config.h" +#include "core/or/or.h" +#include "feature/control/control.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_dh.h" #include "lib/crypt_ops/crypto_ed25519.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/rephist.h" +#include "feature/stats/rephist.h" #include "lib/err/backtrace.h" #include "test/test.h" -#include "or/channelpadding.h" -#include "or/main.h" +#include "core/or/channelpadding.h" +#include "core/mainloop/main.h" #include "lib/compress/compress.h" #include "lib/evloop/compat_libevent.h" diff --git a/src/test/testing_rsakeys.c b/src/test/testing_rsakeys.c index 087a14e64..a8c9ce4ce 100644 --- a/src/test/testing_rsakeys.c +++ b/src/test/testing_rsakeys.c @@ -5,7 +5,7 @@ #include "lib/crypt_ops/crypto_rand.h" #include "orconfig.h" -#include "or/or.h" +#include "core/or/or.h" #include "test/test.h" /** Define this if unit tests spend too much time generating public keys. diff --git a/src/tools/tor_runner.c b/src/tools/tor_runner.c index 8e74a06cd..dd90af3df 100644 --- a/src/tools/tor_runner.c +++ b/src/tools/tor_runner.c @@ -23,8 +23,8 @@ * functions. Don't add more dependencies! */ -#include "or/tor_api.h" -#include "or/tor_api_internal.h" +#include "feature/api/tor_api.h" +#include "feature/api/tor_api_internal.h" #include "orconfig.h" #ifdef HAVE_UNISTD_H

1 0

[tor/master] Fix our build system to know the new locations of the src/or stuff
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 5f51c2de8bf27c1c5eba8c27d32273284d41a3d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 16:52:12 2018 -0400 Fix our build system to know the new locations of the src/or stuff --- Makefile.am | 6 +- src/core/include.am | 526 ++++++++++++++++++++++++------------------------- src/test/test_config.c | 2 +- src/tools/include.am | 4 +- 4 files changed, 268 insertions(+), 270 deletions(-) diff --git a/Makefile.am b/Makefile.am index e7c46f3cc..c74b0e30a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -302,10 +302,10 @@ coverage-html-full: all check-spaces: if USE_PERL $(PERL) $(top_srcdir)/scripts/maint/checkSpace.pl -C \ - $(top_srcdir)/src/common/*.[ch] \ $(top_srcdir)/src/lib/*/*.[ch] \ - $(top_srcdir)/src/or/*.[ch] \ - $(top_srcdir)/src/or/*/*.[ch] \ + $(top_srcdir)/src/core/*/*.[ch] \ + $(top_srcdir)/src/feature/*/*.[ch] \ + $(top_srcdir)/src/app/*/*.[ch] \ $(top_srcdir)/src/test/*.[ch] \ $(top_srcdir)/src/test/*/*.[ch] \ $(top_srcdir)/src/tools/*.[ch] diff --git a/src/core/include.am b/src/core/include.am index d6162196f..111a1e013 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -6,100 +6,100 @@ noinst_LIBRARIES += \ src/core/libtor-app-testing.a endif -LIBTOR_APP_A_SOURCES = \ - src/or/addressmap.c \ - src/or/address_set.c \ - src/or/bridges.c \ - src/or/channel.c \ - src/or/channelpadding.c \ - src/or/channeltls.c \ - src/or/circpathbias.c \ - src/or/circuitbuild.c \ - src/or/circuitlist.c \ - src/or/circuitmux.c \ - src/or/circuitmux_ewma.c \ - src/or/circuitstats.c \ - src/or/circuituse.c \ - src/or/command.c \ - src/or/config.c \ - src/or/confparse.c \ - src/or/connection.c \ - src/or/connection_edge.c \ - src/or/connection_or.c \ - src/or/conscache.c \ - src/or/consdiff.c \ - src/or/consdiffmgr.c \ - src/or/control.c \ - src/or/cpuworker.c \ - src/or/directory.c \ - src/or/dirserv.c \ - src/or/dns.c \ - src/or/dnsserv.c \ - src/or/dos.c \ - src/or/fp_pair.c \ - src/or/geoip.c \ - src/or/entrynodes.c \ - src/or/ext_orport.c \ - src/or/git_revision.c \ - src/or/hibernate.c \ - src/or/hs_cache.c \ - src/or/hs_cell.c \ - src/or/hs_circuit.c \ - src/or/hs_circuitmap.c \ - src/or/hs_client.c \ - src/or/hs_common.c \ - src/or/hs_config.c \ - src/or/hs_control.c \ - src/or/hs_descriptor.c \ - src/or/hs_ident.c \ - src/or/hs_intropoint.c \ - src/or/hs_ntor.c \ - src/or/hs_service.c \ - src/or/hs_stats.c \ - src/or/keypin.c \ - src/or/main.c \ - src/or/microdesc.c \ - src/or/networkstatus.c \ - src/or/nodelist.c \ - src/or/onion.c \ - src/or/onion_fast.c \ - src/or/onion_tap.c \ - src/or/transports.c \ - src/or/parsecommon.c \ - src/or/periodic.c \ - src/or/protover.c \ - src/or/protover_rust.c \ - src/or/proto_cell.c \ - src/or/proto_control0.c \ - src/or/proto_ext_or.c \ - src/or/proto_http.c \ - src/or/proto_socks.c \ - src/or/policies.c \ - src/or/reasons.c \ - src/or/relay.c \ - src/or/relay_crypto.c \ - src/or/rendcache.c \ - src/or/rendclient.c \ - src/or/rendcommon.c \ - src/or/rendmid.c \ - src/or/rendservice.c \ - src/or/rephist.c \ - src/or/replaycache.c \ - src/or/router.c \ - src/or/routerkeys.c \ - src/or/routerlist.c \ - src/or/routerparse.c \ - src/or/routerset.c \ - src/or/scheduler.c \ - src/or/scheduler_kist.c \ - src/or/scheduler_vanilla.c \ - src/or/shared_random_client.c \ - src/or/statefile.c \ - src/or/status.c \ - src/or/torcert.c \ - src/or/tor_api.c \ - src/or/voting_schedule.c \ - src/or/onion_ntor.c +LIBTOR_APP_A_SOURCES = \ + src/app/config/config.c \ + src/app/config/confparse.c \ + src/app/config/statefile.c \ + src/core/proto/proto_socks.c \ + src/core/proto/protover_rust.c \ + src/core/proto/protover.c \ + src/core/proto/proto_ext_or.c \ + src/core/proto/proto_cell.c \ + src/core/proto/proto_http.c \ + src/core/proto/proto_control0.c \ + src/core/mainloop/cpuworker.c \ + src/core/mainloop/main.c \ + src/core/mainloop/periodic.c \ + src/core/mainloop/connection.c \ + src/core/crypto/onion.c \ + src/core/crypto/onion_ntor.c \ + src/core/crypto/relay_crypto.c \ + src/core/crypto/onion_fast.c \ + src/core/crypto/hs_ntor.c \ + src/core/crypto/onion_tap.c \ + src/core/or/scheduler_kist.c \ + src/core/or/circuitbuild.c \ + src/core/or/reasons.c \ + src/core/or/circuitstats.c \ + src/core/or/circuituse.c \ + src/core/or/scheduler.c \ + src/core/or/circuitmux_ewma.c \ + src/core/or/channelpadding.c \ + src/core/or/git_revision.c \ + src/core/or/circuitlist.c \ + src/core/or/circuitmux.c \ + src/core/or/policies.c \ + src/core/or/channeltls.c \ + src/core/or/relay.c \ + src/core/or/scheduler_vanilla.c \ + src/core/or/connection_edge.c \ + src/core/or/dos.c \ + src/core/or/address_set.c \ + src/core/or/command.c \ + src/core/or/channel.c \ + src/core/or/connection_or.c \ + src/core/or/status.c \ + src/feature/dircommon/consdiff.c \ + src/feature/dircommon/fp_pair.c \ + src/feature/dircommon/voting_schedule.c \ + src/feature/stats/geoip.c \ + src/feature/stats/rephist.c \ + src/feature/hibernate/hibernate.c \ + src/feature/hs_common/shared_random_client.c \ + src/feature/hs_common/replaycache.c \ + src/feature/client/circpathbias.c \ + src/feature/client/bridges.c \ + src/feature/client/entrynodes.c \ + src/feature/client/transports.c \ + src/feature/client/addressmap.c \ + src/feature/client/dnsserv.c \ + src/feature/api/tor_api.c \ + src/feature/nodelist/microdesc.c \ + src/feature/nodelist/routerparse.c \ + src/feature/nodelist/networkstatus.c \ + src/feature/nodelist/nodelist.c \ + src/feature/nodelist/routerset.c \ + src/feature/nodelist/torcert.c \ + src/feature/nodelist/routerlist.c \ + src/feature/nodelist/parsecommon.c \ + src/feature/hs/hs_circuitmap.c \ + src/feature/hs/hs_cell.c \ + src/feature/hs/hs_cache.c \ + src/feature/hs/hs_common.c \ + src/feature/hs/hs_control.c \ + src/feature/hs/hs_client.c \ + src/feature/hs/hs_intropoint.c \ + src/feature/hs/hs_ident.c \ + src/feature/hs/hs_config.c \ + src/feature/hs/hs_service.c \ + src/feature/hs/hs_stats.c \ + src/feature/hs/hs_descriptor.c \ + src/feature/hs/hs_circuit.c \ + src/feature/dirauth/keypin.c \ + src/feature/relay/ext_orport.c \ + src/feature/relay/router.c \ + src/feature/relay/dns.c \ + src/feature/relay/routerkeys.c \ + src/feature/control/control.c \ + src/feature/rend/rendcommon.c \ + src/feature/rend/rendmid.c \ + src/feature/rend/rendservice.c \ + src/feature/rend/rendcache.c \ + src/feature/rend/rendclient.c \ + src/feature/dircache/directory.c \ + src/feature/dircache/conscache.c \ + src/feature/dircache/consdiffmgr.c \ + src/feature/dircache/dirserv.c # # Modules are conditionnally compiled in tor starting here. We add the C files @@ -110,11 +110,12 @@ LIBTOR_APP_A_SOURCES = \ LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES) # The Directory Authority module. -MODULE_DIRAUTH_SOURCES = \ - src/or/dirauth/dircollate.c \ - src/or/dirauth/dirvote.c \ - src/or/dirauth/shared_random.c \ - src/or/dirauth/shared_random_state.c +MODULE_DIRAUTH_SOURCES = \ + src/feature/dirauth/dircollate.c \ + src/feature/dirauth/dirvote.c \ + src/feature/dirauth/shared_random.c \ + src/feature/dirauth/shared_random_state.c + if BUILD_MODULE_DIRAUTH LIBTOR_APP_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) endif @@ -130,8 +131,9 @@ else src_core_libtor_app_testing_a_SOURCES = endif -src/or/git_revision.$(OBJEXT) \ - src/or/src_core_libtor_app_testing_a-git_revision.$(OBJEXT): micro-revision.i +src/core/or/git_revision.$(OBJEXT) \ + src/core/or/src_core_libtor_app_testing_a-git_revision.$(OBJEXT): \ + micro-revision.i AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \ -DLOCALSTATEDIR="\"$(localstatedir)\"" \ @@ -140,172 +142,166 @@ AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \ src_core_libtor_app_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_core_libtor_app_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) -ORHEADERS = \ - src/or/addressmap.h \ - src/or/address_set.h \ - src/or/addr_policy_st.h \ - src/or/authority_cert_st.h \ - src/or/auth_dirs.inc \ - src/or/bridges.h \ - src/or/cell_st.h \ - src/or/cell_queue_st.h \ - src/or/channel.h \ - src/or/channelpadding.h \ - src/or/channeltls.h \ - src/or/circpathbias.h \ - src/or/circuitbuild.h \ - src/or/circuitlist.h \ - src/or/circuitmux.h \ - src/or/circuitmux_ewma.h \ - src/or/circuitstats.h \ - src/or/circuituse.h \ - src/or/circuit_st.h \ - src/or/cached_dir_st.h \ - src/or/command.h \ - src/or/config.h \ - src/or/confparse.h \ - src/or/connection.h \ - src/or/connection_st.h \ - src/or/connection_edge.h \ - src/or/connection_or.h \ - src/or/conscache.h \ - src/or/consdiff.h \ - src/or/consdiffmgr.h \ - src/or/control_connection_st.h \ - src/or/control.h \ - src/or/cpath_build_state_st.h \ - src/or/crypt_path_st.h \ - src/or/crypt_path_reference_st.h \ - src/or/cpuworker.h \ - src/or/desc_store_st.h \ - src/or/destroy_cell_queue_st.h \ - src/or/directory.h \ - src/or/dirserv.h \ - src/or/dir_connection_st.h \ - src/or/dir_server_st.h \ - src/or/document_signature_st.h \ - src/or/download_status_st.h \ - src/or/dns.h \ - src/or/dns_structs.h \ - src/or/dnsserv.h \ - src/or/dos.h \ - src/or/edge_connection_st.h \ - src/or/entry_connection_st.h \ - src/or/entry_port_cfg_st.h \ - src/or/ext_orport.h \ - src/or/extend_info_st.h \ - src/or/extrainfo_st.h \ - src/or/fallback_dirs.inc \ - src/or/fp_pair.h \ - src/or/geoip.h \ - src/or/entrynodes.h \ - src/or/git_revision.h \ - src/or/hibernate.h \ - src/or/hs_cache.h \ - src/or/hs_cell.h \ - src/or/hs_circuit.h \ - src/or/hs_circuitmap.h \ - src/or/hs_client.h \ - src/or/hs_common.h \ - src/or/hs_config.h \ - src/or/hs_control.h \ - src/or/hs_descriptor.h \ - src/or/hs_ident.h \ - src/or/hs_intropoint.h \ - src/or/hs_ntor.h \ - src/or/hs_stats.h \ - src/or/hs_service.h \ - src/or/hsdir_index_st.h \ - src/or/keypin.h \ - src/or/listener_connection_st.h \ - src/or/main.h \ - src/or/microdesc.h \ - src/or/microdesc_st.h \ - src/or/networkstatus.h \ - src/or/networkstatus_st.h \ - src/or/networkstatus_sr_info_st.h \ - src/or/networkstatus_voter_info_st.h \ - src/or/nodelist.h \ - src/or/node_st.h \ - src/or/ns_detached_signatures_st.h \ - src/or/onion.h \ - src/or/onion_fast.h \ - src/or/onion_ntor.h \ - src/or/onion_tap.h \ - src/or/or.h \ - src/or/or_circuit_st.h \ - src/or/or_connection_st.h \ - src/or/or_handshake_certs_st.h \ - src/or/or_handshake_state_st.h \ - src/or/or_options_st.h \ - src/or/or_state_st.h \ - src/or/origin_circuit_st.h \ - src/or/transports.h \ - src/or/parsecommon.h \ - src/or/periodic.h \ - src/or/port_cfg_st.h \ - src/or/policies.h \ - src/or/protover.h \ - src/or/proto_cell.h \ - src/or/proto_control0.h \ - src/or/proto_ext_or.h \ - src/or/proto_http.h \ - src/or/proto_socks.h \ - src/or/reasons.h \ - src/or/relay.h \ - src/or/relay_crypto.h \ - src/or/relay_crypto_st.h \ - src/or/rendcache.h \ - src/or/rendclient.h \ - src/or/rendcommon.h \ - src/or/rendmid.h \ - src/or/rendservice.h \ - src/or/rend_authorized_client_st.h \ - src/or/rend_encoded_v2_service_descriptor_st.h \ - src/or/rend_intro_point_st.h \ - src/or/rend_service_descriptor_st.h \ - src/or/rephist.h \ - src/or/replaycache.h \ - src/or/router.h \ - src/or/routerinfo_st.h \ - src/or/routerkeys.h \ - src/or/routerlist.h \ - src/or/routerlist_st.h \ - src/or/routerkeys.h \ - src/or/routerset.h \ - src/or/routerparse.h \ - src/or/routerstatus_st.h \ - src/or/scheduler.h \ - src/or/server_port_cfg_st.h \ - src/or/shared_random_client.h \ - src/or/signed_descriptor_st.h \ - src/or/socks_request_st.h \ - src/or/statefile.h \ - src/or/status.h \ - src/or/torcert.h \ - src/or/tor_api_internal.h \ - src/or/tor_version_st.h \ - src/or/var_cell_st.h \ - src/or/vote_microdesc_hash_st.h \ - src/or/vote_routerstatus_st.h \ - src/or/vote_timing_st.h \ - src/or/voting_schedule.h - -# We add the headers of the modules even though they are disabled so we can -# properly compiled the entry points stub. +noinst_HEADERS += \ + src/app/config/config.h \ + src/app/config/statefile.h \ + src/app/config/or_options_st.h \ + src/app/config/or_state_st.h \ + src/app/config/confparse.h \ + src/app/main/ntmain.h \ + src/core/proto/protover.h \ + src/core/proto/proto_ext_or.h \ + src/core/proto/proto_http.h \ + src/core/proto/proto_cell.h \ + src/core/proto/proto_socks.h \ + src/core/proto/proto_control0.h \ + src/core/mainloop/cpuworker.h \ + src/core/mainloop/connection.h \ + src/core/mainloop/periodic.h \ + src/core/mainloop/main.h \ + src/core/crypto/onion_ntor.h \ + src/core/crypto/onion_tap.h \ + src/core/crypto/onion.h \ + src/core/crypto/hs_ntor.h \ + src/core/crypto/onion_fast.h \ + src/core/crypto/relay_crypto.h \ + src/core/or/edge_connection_st.h \ + src/core/or/connection_edge.h \ + src/core/or/cpath_build_state_st.h \ + src/core/or/circuitstats.h \ + src/core/or/connection_or.h \ + src/core/or/or.h \ + src/core/or/command.h \ + src/core/or/server_port_cfg_st.h \ + src/core/or/port_cfg_st.h \ + src/core/or/scheduler.h \ + src/core/or/connection_st.h \ + src/core/or/address_set.h \ + src/core/or/circuitmux.h \ + src/core/or/circuitlist.h \ + src/core/or/crypt_path_reference_st.h \ + src/core/or/crypt_path_st.h \ + src/core/or/circuitbuild.h \ + src/core/or/circuit_st.h \ + src/core/or/var_cell_st.h \ + src/core/or/entry_connection_st.h \ + src/core/or/cell_st.h \ + src/core/or/socks_request_st.h \ + src/core/or/or_handshake_certs_st.h \ + src/core/or/dos.h \ + src/core/or/or_connection_st.h \ + src/core/or/channel.h \ + src/core/or/or_circuit_st.h \ + src/core/or/entry_port_cfg_st.h \ + src/core/or/channelpadding.h \ + src/core/or/relay_crypto_st.h \ + src/core/or/cell_queue_st.h \ + src/core/or/circuituse.h \ + src/core/or/channeltls.h \ + src/core/or/or_handshake_state_st.h \ + src/core/or/addr_policy_st.h \ + src/core/or/status.h \ + src/core/or/relay.h \ + src/core/or/circuitmux_ewma.h \ + src/core/or/policies.h \ + src/core/or/reasons.h \ + src/core/or/listener_connection_st.h \ + src/core/or/origin_circuit_st.h \ + src/core/or/destroy_cell_queue_st.h \ + src/core/or/tor_version_st.h \ + src/core/or/git_revision.h \ + src/core/or/extend_info_st.h \ + src/feature/dircommon/consdiff.h \ + src/feature/dircommon/voting_schedule.h \ + src/feature/dircommon/dir_connection_st.h \ + src/feature/dircommon/fp_pair.h \ + src/feature/dircommon/vote_timing_st.h \ + src/feature/stats/rephist.h \ + src/feature/stats/geoip.h \ + src/feature/hibernate/hibernate.h \ + src/feature/hs_common/shared_random_client.h \ + src/feature/hs_common/replaycache.h \ + src/feature/dirclient/dir_server_st.h \ + src/feature/dirclient/download_status_st.h \ + src/feature/client/transports.h \ + src/feature/client/circpathbias.h \ + src/feature/client/entrynodes.h \ + src/feature/client/addressmap.h \ + src/feature/client/bridges.h \ + src/feature/client/dnsserv.h \ + src/feature/api/tor_api_internal.h \ + src/feature/nodelist/routerparse.h \ + src/feature/nodelist/routerlist.h \ + src/feature/nodelist/signed_descriptor_st.h \ + src/feature/nodelist/routerstatus_st.h \ + src/feature/nodelist/torcert.h \ + src/feature/nodelist/parsecommon.h \ + src/feature/nodelist/networkstatus_sr_info_st.h \ + src/feature/nodelist/microdesc_st.h \ + src/feature/nodelist/nodelist.h \ + src/feature/nodelist/microdesc.h \ + src/feature/nodelist/node_st.h \ + src/feature/nodelist/desc_store_st.h \ + src/feature/nodelist/routerlist_st.h \ + src/feature/nodelist/routerinfo_st.h \ + src/feature/nodelist/document_signature_st.h \ + src/feature/nodelist/vote_routerstatus_st.h \ + src/feature/nodelist/extrainfo_st.h \ + src/feature/nodelist/networkstatus_voter_info_st.h \ + src/feature/nodelist/networkstatus_st.h \ + src/feature/nodelist/authority_cert_st.h \ + src/feature/nodelist/routerset.h \ + src/feature/nodelist/networkstatus.h \ + src/feature/hs/hs_cell.h \ + src/feature/hs/hs_cache.h \ + src/feature/hs/hs_client.h \ + src/feature/hs/hs_intropoint.h \ + src/feature/hs/hs_config.h \ + src/feature/hs/hs_ident.h \ + src/feature/hs/hs_stats.h \ + src/feature/hs/hs_circuitmap.h \ + src/feature/hs/hs_descriptor.h \ + src/feature/hs/hs_service.h \ + src/feature/hs/hs_circuit.h \ + src/feature/hs/hs_control.h \ + src/feature/hs/hsdir_index_st.h \ + src/feature/hs/hs_common.h \ + src/feature/dirauth/mode.h \ + src/feature/dirauth/ns_detached_signatures_st.h \ + src/feature/dirauth/shared_random_state.h \ + src/feature/dirauth/shared_random.h \ + src/feature/dirauth/vote_microdesc_hash_st.h \ + src/feature/dirauth/keypin.h \ + src/feature/dirauth/dircollate.h \ + src/feature/dirauth/dirvote.h \ + src/feature/relay/dns_structs.h \ + src/feature/relay/dns.h \ + src/feature/relay/ext_orport.h \ + src/feature/relay/router.h \ + src/feature/relay/routerkeys.h \ + src/feature/control/control_connection_st.h \ + src/feature/control/control.h \ + src/feature/rend/rendcommon.h \ + src/feature/rend/rendservice.h \ + src/feature/rend/rendcache.h \ + src/feature/rend/rendmid.h \ + src/feature/rend/rend_intro_point_st.h \ + src/feature/rend/rend_authorized_client_st.h \ + src/feature/rend/rend_encoded_v2_service_descriptor_st.h \ + src/feature/rend/rend_service_descriptor_st.h \ + src/feature/rend/rendclient.h \ + src/feature/dircache/conscache.h \ + src/feature/dircache/cached_dir_st.h \ + src/feature/dircache/dirserv.h \ + src/feature/dircache/directory.h \ + src/feature/dircache/consdiffmgr.h -# The Directory Authority module headers. -ORHEADERS += \ - src/or/dirauth/dircollate.h \ - src/or/dirauth/dirvote.h \ - src/or/dirauth/mode.h \ - src/or/dirauth/shared_random.h \ - src/or/dirauth/shared_random_state.h +noinst_HEADERS += \ + src/app/config/auth_dirs.inc \ + src/app/config/fallback_dirs.inc # This may someday want to be an installed file? -noinst_HEADERS += src/or/tor_api.h - -noinst_HEADERS += $(ORHEADERS) micro-revision.i +noinst_HEADERS += src/feature/api/tor_api.h micro-revision.i: FORCE $(AM_V_at)rm -f micro-revision.tmp; \ @@ -325,6 +321,6 @@ micro-revision.i: FORCE rm -f micro-revision.tmp; \ true -CLEANFILES+= micro-revision.i src/or/micro-revision.i micro-revision.tmp +CLEANFILES+= micro-revision.i micro-revision.tmp FORCE: diff --git a/src/test/test_config.c b/src/test/test_config.c index f7d3a6fbb..596ae0448 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -3739,7 +3739,7 @@ static void test_config_default_fallback_dirs(void *arg) { const char *fallback[] = { -#include "../or/fallback_dirs.inc" +#include "app/config/fallback_dirs.inc" NULL }; diff --git a/src/tools/include.am b/src/tools/include.am index 900154f96..8a2ecb23c 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -43,5 +43,7 @@ endif if BUILD_LIBTORRUNNER noinst_LIBRARIES += src/tools/libtorrunner.a -src_tools_libtorrunner_a_SOURCES = src/tools/tor_runner.c src/or/tor_api.c +src_tools_libtorrunner_a_SOURCES = \ + src/tools/tor_runner.c \ + src/feature/api/tor_api.c endif

1 0

[tor/master] Whoops. Protover.[ch] belong in src/core/or
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 667a6e8fe9b8169e86f3ab889c4ea8af845d6939 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 17:08:26 2018 -0400 Whoops. Protover.[ch] belong in src/core/or --- src/core/include.am | 4 ++-- src/core/mainloop/main.c | 2 +- src/core/{proto => or}/protover.c | 2 +- src/core/{proto => or}/protover.h | 0 src/core/proto/protover_rust.c | 2 +- src/feature/dirauth/dirvote.c | 2 +- src/feature/dircache/dirserv.c | 2 +- src/feature/nodelist/networkstatus.c | 2 +- src/feature/nodelist/nodelist.c | 2 +- src/feature/nodelist/routerparse.c | 2 +- src/feature/relay/router.c | 2 +- src/test/test_protover.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/core/include.am b/src/core/include.am index 111a1e013..23c283d8d 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -12,7 +12,6 @@ LIBTOR_APP_A_SOURCES = \ src/app/config/statefile.c \ src/core/proto/proto_socks.c \ src/core/proto/protover_rust.c \ - src/core/proto/protover.c \ src/core/proto/proto_ext_or.c \ src/core/proto/proto_cell.c \ src/core/proto/proto_http.c \ @@ -44,6 +43,7 @@ LIBTOR_APP_A_SOURCES = \ src/core/or/scheduler_vanilla.c \ src/core/or/connection_edge.c \ src/core/or/dos.c \ + src/core/or/protover.c \ src/core/or/address_set.c \ src/core/or/command.c \ src/core/or/channel.c \ @@ -149,7 +149,6 @@ noinst_HEADERS += \ src/app/config/or_state_st.h \ src/app/config/confparse.h \ src/app/main/ntmain.h \ - src/core/proto/protover.h \ src/core/proto/proto_ext_or.h \ src/core/proto/proto_http.h \ src/core/proto/proto_cell.h \ @@ -190,6 +189,7 @@ noinst_HEADERS += \ src/core/or/or_handshake_certs_st.h \ src/core/or/dos.h \ src/core/or/or_connection_st.h \ + src/core/or/protover.h \ src/core/or/channel.h \ src/core/or/or_circuit_st.h \ src/core/or/entry_port_cfg_st.h \ diff --git a/src/core/mainloop/main.c b/src/core/mainloop/main.c index bad949097..447936778 100644 --- a/src/core/mainloop/main.c +++ b/src/core/mainloop/main.c @@ -92,7 +92,7 @@ #include "core/crypto/onion.h" #include "core/mainloop/periodic.h" #include "core/or/policies.h" -#include "core/proto/protover.h" +#include "core/or/protover.h" #include "feature/client/transports.h" #include "core/or/relay.h" #include "feature/rend/rendclient.h" diff --git a/src/core/proto/protover.c b/src/core/or/protover.c similarity index 99% rename from src/core/proto/protover.c rename to src/core/or/protover.c index 3ae91688d..362a5beca 100644 --- a/src/core/proto/protover.c +++ b/src/core/or/protover.c @@ -24,7 +24,7 @@ #define PROTOVER_PRIVATE #include "core/or/or.h" -#include "core/proto/protover.h" +#include "core/or/protover.h" #include "feature/nodelist/routerparse.h" #ifndef HAVE_RUST diff --git a/src/core/proto/protover.h b/src/core/or/protover.h similarity index 100% rename from src/core/proto/protover.h rename to src/core/or/protover.h diff --git a/src/core/proto/protover_rust.c b/src/core/proto/protover_rust.c index 55b0ebedf..dbdd5c823 100644 --- a/src/core/proto/protover_rust.c +++ b/src/core/proto/protover_rust.c @@ -8,7 +8,7 @@ */ #include "core/or/or.h" -#include "core/proto/protover.h" +#include "core/or/protover.h" #ifdef HAVE_RUST diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 282546567..ce67c1bb9 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -14,7 +14,7 @@ #include "feature/nodelist/nodelist.h" #include "feature/nodelist/parsecommon.h" #include "core/or/policies.h" -#include "core/proto/protover.h" +#include "core/or/protover.h" #include "feature/stats/rephist.h" #include "feature/relay/router.h" #include "feature/relay/routerkeys.h" diff --git a/src/feature/dircache/dirserv.c b/src/feature/dircache/dirserv.c index 0e1d0645e..c5286b0cb 100644 --- a/src/feature/dircache/dirserv.c +++ b/src/feature/dircache/dirserv.c @@ -25,7 +25,7 @@ #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodelist.h" #include "core/or/policies.h" -#include "core/proto/protover.h" +#include "core/or/protover.h" #include "feature/stats/rephist.h" #include "feature/relay/router.h" #include "feature/nodelist/routerlist.h" diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 366410d68..e9d36cbdc 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -60,7 +60,7 @@ #include "feature/nodelist/microdesc.h" #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodelist.h" -#include "core/proto/protover.h" +#include "core/or/protover.h" #include "core/or/relay.h" #include "feature/relay/router.h" #include "feature/nodelist/routerlist.h" diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index e434dd2d1..03122ba0f 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -56,7 +56,7 @@ #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodelist.h" #include "core/or/policies.h" -#include "core/proto/protover.h" +#include "core/or/protover.h" #include "feature/rend/rendservice.h" #include "feature/relay/router.h" #include "feature/nodelist/routerlist.h" diff --git a/src/feature/nodelist/routerparse.c b/src/feature/nodelist/routerparse.c index e1dfe972d..166806e9c 100644 --- a/src/feature/nodelist/routerparse.c +++ b/src/feature/nodelist/routerparse.c @@ -68,7 +68,7 @@ #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/parsecommon.h" #include "core/or/policies.h" -#include "core/proto/protover.h" +#include "core/or/protover.h" #include "feature/rend/rendcommon.h" #include "feature/stats/rephist.h" #include "feature/relay/router.h" diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index c52ac1f9c..25afbe9f3 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -25,7 +25,7 @@ #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodelist.h" #include "core/or/policies.h" -#include "core/proto/protover.h" +#include "core/or/protover.h" #include "core/or/relay.h" #include "feature/stats/rephist.h" #include "feature/relay/router.h" diff --git a/src/test/test_protover.c b/src/test/test_protover.c index a90ff5a08..5bbf997fd 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -6,7 +6,7 @@ #include "orconfig.h" #include "test/test.h" -#include "core/proto/protover.h" +#include "core/or/protover.h" #include "core/or/or.h" #include "core/or/connection_or.h"

1 0

[tor/master] Fix everything that previously referred to src/or
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit f720a5a439b6fd3e9a283891c15f41f93532d81c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 17:05:54 2018 -0400 Fix everything that previously referred to src/or --- Doxyfile.in | 1156 ++++++++++++++++++----------------- configure.ac | 2 +- doc/HACKING/Module.md | 26 +- doc/HACKING/Tracing.md | 2 +- scripts/maint/fallback.whitelist | 3 +- scripts/maint/updateFallbackDirs.py | 8 +- scripts/test/coverage | 2 +- src/core/or/git_revision.c | 3 +- src/rust/external/external.rs | 2 +- src/rust/protover/ffi.rs | 4 +- src/rust/protover/protover.rs | 12 +- src/rust/tor_log/tor_log.rs | 2 +- src/test/test-network.sh | 4 +- src/test/test_bridges.c | 3 +- src/test/test_router.c | 3 +- 15 files changed, 616 insertions(+), 616 deletions(-) diff --git a/Doxyfile.in b/Doxyfile.in index 4cf9c30de..8d8b959fb 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -14,211 +14,211 @@ # Project related configuration options #--------------------------------------------------------------------------- -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See # http://www.gnu.org/software/libiconv for the list of possible encodings. DOXYFILE_ENCODING = UTF-8 -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. PROJECT_NAME = tor -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or # if some version control system is used. PROJECT_NUMBER = @VERSION@ -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. OUTPUT_DIRECTORY = @top_builddir@/doc/doxygen -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would # otherwise cause performance problems for the file system. CREATE_SUBDIRS = NO -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, -# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, -# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, +# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, +# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, # and Ukrainian. OUTPUT_LANGUAGE = English -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). # Set to NO to disable this. BRIEF_MEMBER_DESC = NO -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the # brief descriptions will be completely suppressed. REPEAT_BRIEF = YES -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" # "represents" "a" "an" "the" -ABBREVIATE_BRIEF = +ABBREVIATE_BRIEF = -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief # description. ALWAYS_DETAILED_SEC = NO -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment # operators of the base classes will not be shown. INLINE_INHERITED_MEMB = NO -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set # to NO the shortest path that makes the file name unique will be used. FULL_PATH_NAMES = NO -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the # path to strip. -STRIP_FROM_PATH = +STRIP_FROM_PATH = -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that # are normally passed to the compiler using the -I flag. -STRIP_FROM_INC_PATH = +STRIP_FROM_INC_PATH = -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems # doesn't support long names like on DOS, Mac, or CD-ROM. SHORT_NAMES = NO -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments # (thus requiring an explicit @brief command for a brief description.) JAVADOC_AUTOBRIEF = NO -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring # an explicit \brief command for a brief description.) QT_AUTOBRIEF = NO -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed # description. Set this tag to YES if you prefer the old behaviour instead. MULTILINE_CPP_IS_BRIEF = NO -# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# If the DETAILS_AT_TOP tag is set to YES then Doxygen # will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member +# If set to NO, the detailed description appears after the member # documentation. # DETAILS_AT_TOP = NO -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it # re-implements. INHERIT_DOCS = YES -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will # be part of the file/class/namespace that contains it. SEPARATE_MEMBER_PAGES = NO -# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# The TAB_SIZE tag can be used to set the number of spaces in a tab. # Doxygen uses this value to replace tabs by spaces in code fragments. TAB_SIZE = 8 -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". # You can put \n's in the value part of an alias to insert newlines. -ALIASES = +ALIASES = -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list # of all members will be omitted, etc. OPTIMIZE_OUTPUT_FOR_C = YES -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified # scopes will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for # Fortran. OPTIMIZE_FOR_FORTRAN = NO -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for # VHDL. OPTIMIZE_OUTPUT_VHDL = NO -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. BUILTIN_STL_SUPPORT = NO @@ -228,42 +228,42 @@ BUILTIN_STL_SUPPORT = NO CPP_CLI_SUPPORT = NO -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public # instead of private inheritance when no explicit protection keyword is present. SIP_SUPPORT = NO -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the # methods anyway, you should set this option to NO. IDL_PROPERTY_SUPPORT = NO -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. DISTRIBUTE_GROUP_DOC = NO -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using # the \nosubgrouping command. SUBGROUPING = YES -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound # types are typedef'ed and only the typedef is referenced, never the tag name. TYPEDEF_HIDES_STRUCT = NO @@ -272,364 +272,366 @@ TYPEDEF_HIDES_STRUCT = NO # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES EXTRACT_ALL = NO -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. EXTRACT_PRIVATE = NO -# If the EXTRACT_STATIC tag is set to YES all static members of a file +# If the EXTRACT_STATIC tag is set to YES all static members of a file # will be included in the documentation. EXTRACT_STATIC = YES -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. # If set to NO only classes defined in header files are included. EXTRACT_LOCAL_CLASSES = YES -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. # If set to NO (the default) only methods in the interface are included. EXTRACT_LOCAL_METHODS = NO -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default # anonymous namespace are hidden. EXTRACT_ANON_NSPACES = NO -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. # This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_MEMBERS = NO -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various # overviews. This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_CLASSES = NO -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the # documentation. HIDE_FRIEND_COMPOUNDS = NO -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the # function's detailed documentation block. HIDE_IN_BODY_DOCS = NO -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. # Set it to YES to include the internal documentation. INTERNAL_DOCS = NO -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. CASE_SENSE_NAMES = YES -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the # documentation. If set to YES the scope will be hidden. HIDE_SCOPE_NAMES = NO -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation # of that file. SHOW_INCLUDE_FILES = YES -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] # is inserted in the documentation for inline members. INLINE_INFO = YES -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in # declaration order. SORT_MEMBER_DOCS = YES -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in # declaration order. SORT_BRIEF_DOCS = NO -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) # the group names will appear in their defined order. SORT_GROUP_NAMES = NO -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the +# Note: This option applies only to the class list, not to the # alphabetical list. SORT_BY_SCOPE_NAME = NO -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo # commands in the documentation. GENERATE_TODOLIST = YES -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test # commands in the documentation. GENERATE_TESTLIST = YES -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug # commands in the documentation. GENERATE_BUGLIST = YES -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting # \deprecated commands in the documentation. GENERATE_DEPRECATEDLIST= YES -# The ENABLED_SECTIONS tag can be used to enable conditional +# The ENABLED_SECTIONS tag can be used to enable conditional # documentation sections, marked by \if sectionname ... \endif. -ENABLED_SECTIONS = +ENABLED_SECTIONS = -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer # command in the documentation regardless of this setting. MAX_INITIALIZER_LINES = 30 -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the # list will mention the files that were used to generate the documentation. SHOW_USED_FILES = YES # Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the +# This will remove the Files entry from the Quick Index and from the # Folder Tree View (if specified). The default is YES. SHOW_FILES = YES -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the # Namespaces page. This will remove the Namespaces entry from the Quick Index # and from the Folder Tree View (if specified). The default is YES. SHOW_NAMESPACES = YES -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command <command> <input-file>, where <command> is the value of -# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file -# provided by doxygen. Whatever the program writes to standard output +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command <command> <input-file>, where <command> is the value of +# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file +# provided by doxygen. Whatever the program writes to standard output # is used as the file version. See the manual for examples. -FILE_VERSION_FILTER = +FILE_VERSION_FILTER = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated +# The QUIET tag can be used to turn on/off the messages that are generated # by doxygen. Possible values are YES and NO. If left blank NO is used. QUIET = NO -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank # NO is used. WARNINGS = YES -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will # automatically be disabled. WARN_IF_UNDOCUMENTED = YES -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that # don't exist or using markup commands wrongly. WARN_IF_DOC_ERROR = YES -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of # documentation. WARN_NO_PARAMDOC = NO -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could # be obtained via FILE_VERSION_FILTER) WARN_FORMAT = "$file:$line: $text" -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written # to stderr. -WARN_LOGFILE = +WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = @top_srcdir@/src/common \ - @top_srcdir@/src/or +INPUT = @top_srcdir@/src/lib \ + @top_srcdir@/src/core \ + @top_srcdir@/src/feature \ + @top_srcdir@/src/app -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for # the list of possible encodings. INPUT_ENCODING = UTF-8 -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 FILE_PATTERNS = *.c \ *.h -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. # If left blank NO is used. RECURSIVE = NO -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. EXCLUDE = tree.h -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded # from the input. EXCLUDE_SYMLINKS = NO -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* -EXCLUDE_PATTERNS = +EXCLUDE_PATTERNS = -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, # AClass::ANamespace, ANamespace::*Test -EXCLUDE_SYMBOLS = +EXCLUDE_SYMBOLS = -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = +EXAMPLE_PATH = -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left # blank all files are included. -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. # Possible values are YES and NO. If left blank NO is used. EXAMPLE_RECURSIVE = NO -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see # the \image command). -IMAGE_PATH = +IMAGE_PATH = -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command <filter> <input-file>, where <filter> -# is the value of the INPUT_FILTER tag, and <input-file> is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command <filter> <input-file>, where <filter> +# is the value of the INPUT_FILTER tag, and <input-file> is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be # ignored. -INPUT_FILTER = +INPUT_FILTER = -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER # is applied to all files. -FILTER_PATTERNS = +FILTER_PATTERNS = -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source # files to browse (i.e. when SOURCE_BROWSER is set to YES). FILTER_SOURCE_FILES = NO @@ -638,32 +640,32 @@ FILTER_SOURCE_FILES = NO # configuration options related to source browsing #--------------------------------------------------------------------------- -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also # VERBATIM_HEADERS is set to NO. SOURCE_BROWSER = YES -# Setting the INLINE_SOURCES tag to YES will include the body +# Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. INLINE_SOURCES = NO -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code # fragments. Normal C and C++ comments will always remain visible. STRIP_CODE_COMMENTS = YES -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented # functions referencing it will be listed. REFERENCED_BY_RELATION = YES -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities # called/used by that function will be listed. REFERENCES_RELATION = YES @@ -675,16 +677,16 @@ REFERENCES_RELATION = YES REFERENCES_LINK_SOURCE = YES -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html) You +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html) You # will need version 4.8.6 or higher. USE_HTAGS = NO -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for # which an include is specified. Set to NO to disable this. VERBATIM_HEADERS = YES @@ -693,123 +695,123 @@ VERBATIM_HEADERS = YES # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project # contains a lot of classes, structs, unions or interfaces. ALPHABETICAL_INDEX = NO -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns # in which this list will be split (can be a number in the range [1..20]) COLS_IN_ALPHA_INDEX = 5 -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that # should be ignored while generating the index headers. -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will # generate HTML output. GENERATE_HTML = YES -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `html' will be used as the default path. HTML_OUTPUT = html -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank # doxygen will generate files with .html extension. HTML_FILE_EXTENSION = .html -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a # standard header. -HTML_HEADER = +HTML_HEADER = -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = +HTML_FOOTER = -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own # stylesheet in the HTML output directory as well, or it will be erased! -HTML_STYLESHEET = +HTML_STYLESHEET = -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) # of the generated HTML documentation. GENERATE_HTMLHELP = NO -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find # it at startup. GENERATE_DOCSET = NO -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) # can be grouped. DOCSET_FEEDNAME = "Doxygen generated docs for Tor" -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen # will append .docset to the name. DOCSET_BUNDLE_ID = org.torproject.Tor -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox # Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). HTML_DYNAMIC_SECTIONS = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be # written to the html output directory. -CHM_FILE = +CHM_FILE = -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run # the HTML help compiler on the generated index.hhp. -HHC_LOCATION = +HHC_LOCATION = -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that # it should be included in the master .chm file (NO). GENERATE_CHI = NO @@ -818,26 +820,26 @@ GENERATE_CHI = NO # is used to encode HtmlHelp index (hhk), content (hhc) and project file # content. -CHM_INDEX_ENCODING = +CHM_INDEX_ENCODING = -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a # normal table of contents (NO) in the .chm file. BINARY_TOC = NO -# The TOC_EXPAND flag can be set to YES to add extra items for group members +# The TOC_EXPAND flag can be set to YES to add extra items for group members # to the contents of the HTML help documentation and to the tree view. TOC_EXPAND = NO -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and # the value YES disables it. DISABLE_INDEX = NO -# This tag can be used to set the number of enum values (range [1..20]) +# This tag can be used to set the number of enum values (range [1..20]) # that doxygen will group on one line in the generated HTML documentation. ENUM_VALUES_PER_LINE = 4 @@ -845,11 +847,11 @@ ENUM_VALUES_PER_LINE = 4 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index # structure should be generated to display hierarchical information. # If the tag value is set to FRAME, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. Other possible values +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# probably better off using the HTML help feature. Other possible values # for this tag are: HIERARCHIES, which will generate the Groups, Directories, # and Class Hiererachy pages using a tree view instead of an ordered list; # ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which @@ -859,16 +861,16 @@ ENUM_VALUES_PER_LINE = 4 GENERATE_TREEVIEW = NO -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree # is shown. TREEVIEW_WIDTH = 250 -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory # to force them to be regenerated. FORMULA_FONTSIZE = 10 @@ -877,74 +879,74 @@ FORMULA_FONTSIZE = 10 # configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. GENERATE_LATEX = YES -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `latex' will be used as the default path. LATEX_OUTPUT = latex -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. If left blank `latex' will be used as the default command name. LATEX_CMD_NAME = latex -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the # default command name. MAKEINDEX_CMD_NAME = makeindex -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_LATEX = NO -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and # executive. If left blank a4wide will be used. PAPER_TYPE = a4wide -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. -EXTRA_PACKAGES = +EXTRA_PACKAGES = -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = +LATEX_HEADER = -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references # This makes the output suitable for online browsing using a pdf viewer. PDF_HYPERLINKS = NO -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a # higher quality PDF documentation. USE_PDFLATEX = NO -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. # This option is also used when generating formulas in HTML. LATEX_BATCHMODE = NO -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) # in the output. LATEX_HIDE_INDICES = NO @@ -953,68 +955,68 @@ LATEX_HIDE_INDICES = NO # configuration options related to the RTF output #--------------------------------------------------------------------------- -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with # other RTF readers or editors. GENERATE_RTF = NO -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `rtf' will be used as the default path. RTF_OUTPUT = rtf -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_RTF = NO -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. # Note: wordpad (write) and others do not support links. RTF_HYPERLINKS = NO -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide # replacements, missing definitions are set to their default value. -RTF_STYLESHEET_FILE = +RTF_STYLESHEET_FILE = -# Set optional variables used in the generation of an rtf document. +# Set optional variables used in the generation of an rtf document. # Syntax is similar to doxygen's config file. -RTF_EXTENSIONS_FILE = +RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will # generate man pages GENERATE_MAN = NO -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `man' will be used as the default path. MAN_OUTPUT = man -# The MAN_EXTENSION tag determines the extension that is added to +# The MAN_EXTENSION tag determines the extension that is added to # the generated man pages (default is the subroutine's section .3) MAN_EXTENSION = .3 -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command # would be unable to find the correct page. The default is NO. MAN_LINKS = NO @@ -1023,21 +1025,21 @@ MAN_LINKS = NO # configuration options related to the XML output #--------------------------------------------------------------------------- -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of # the code including all documentation. GENERATE_XML = NO -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `xml' will be used as the default path. XML_OUTPUT = xml -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that # enabling this will significantly increase the size of the XML output. XML_PROGRAMLISTING = YES @@ -1046,10 +1048,10 @@ XML_PROGRAMLISTING = YES # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental # and incomplete at the moment. GENERATE_AUTOGEN_DEF = NO @@ -1058,338 +1060,338 @@ GENERATE_AUTOGEN_DEF = NO # configuration options related to the Perl module output #--------------------------------------------------------------------------- -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the # moment. GENERATE_PERLMOD = NO -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able # to generate PDF and DVI output from the Perl module output. PERLMOD_LATEX = NO -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller # and Perl will parse it just the same. PERLMOD_PRETTY = YES -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same # Makefile don't overwrite each other's variables. -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- -# Configuration options related to the preprocessor +# Configuration options related to the preprocessor #--------------------------------------------------------------------------- -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include # files. ENABLE_PREPROCESSING = YES -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled # way by setting EXPAND_ONLY_PREDEF to YES. MACRO_EXPANSION = NO -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the # PREDEFINED and EXPAND_AS_DEFINED tags. EXPAND_ONLY_PREDEF = NO -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files # in the INCLUDE_PATH (see below) will be search if a #include is found. SEARCH_INCLUDES = YES -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by # the preprocessor. -INCLUDE_PATH = +INCLUDE_PATH = -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will # be used. -INCLUDE_FILE_PATTERNS = +INCLUDE_FILE_PATTERNS = -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = +PREDEFINED = -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. # Use the PREDEFINED tag if you want to use a different macro definition. -EXPAND_AS_DEFINED = +EXPAND_AS_DEFINED = -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse # the parser if not removed. SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- -# Configuration::additions related to external references +# Configuration::additions related to external references #--------------------------------------------------------------------------- -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool # does not have to be run to correct the links. # Note that each tag file must have a unique name # (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen +# If a tag file is not located in the directory in which doxygen # is run, you must also specify the path to the tagfile here. -TAGFILES = +TAGFILES = -# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. -GENERATE_TAGFILE = +GENERATE_TAGFILE = -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes # will be listed. ALLEXTERNALS = NO -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will # be listed. EXTERNAL_GROUPS = YES -# The PERL_PATH should be the absolute path and name of the perl script +# The PERL_PATH should be the absolute path and name of the perl script # interpreter (i.e. the result of `which perl'). PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- -# Configuration options related to the dot tool +# Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more # powerful graphs. CLASS_DIAGRAMS = YES -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the # default search path. -MSCGEN_PATH = +MSCGEN_PATH = -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented # or is not a class. HIDE_UNDOC_RELATIONS = YES -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) HAVE_DOT = NO -# By default doxygen will write a font called FreeSans.ttf to the output -# directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need -# these (or just want a differently looking font) you can specify the font name -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, -# which can be done by putting it in a standard location or by setting the -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory # containing the font. DOT_FONTNAME = -# By default doxygen will tell dot to use the output directory to look for the -# FreeSans.ttf font (which doxygen will put there itself). If you specify a -# different font using DOT_FONTNAME you can set the path where dot +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot # can find it using this tag. -DOT_FONTPATH = +DOT_FONTPATH = -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the # the CLASS_DIAGRAMS tag to NO. CLASS_GRAPH = YES -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and # class references variables) of the class with other documented classes. COLLABORATION_GRAPH = YES -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen # will generate a graph for groups, showing the direct groups dependencies GROUP_GRAPHS = YES -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling # Language. UML_LOOK = NO -# If set to YES, the inheritance and collaboration graphs will show the +# If set to YES, the inheritance and collaboration graphs will show the # relations between templates and their instances. TEMPLATE_RELATIONS = YES -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with # other documented files. INCLUDE_GRAPH = YES -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or # indirectly include this file. INCLUDED_BY_GRAPH = YES -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs # for selected functions only using the \callgraph command. CALL_GRAPH = NO -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller # graphs for selected functions only using the \callergraph command. CALLER_GRAPH = NO -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen # will graphical hierarchy of all classes instead of a textual one. GRAPHICAL_HIERARCHY = YES -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories # in a graphical way. The dependency relations are determined by the #include # relations between the files in the directories. DIRECTORY_GRAPH = YES -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. Possible values are png, jpg, or gif # If left blank png will be used. DOT_IMAGE_FORMAT = png -# The tag DOT_PATH can be used to specify the path where the dot tool can be +# The tag DOT_PATH can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found in the path. -DOT_PATH = +DOT_PATH = -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the # \dotfile command). -DOTFILE_DIRS = +DOTFILE_DIRS = -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. DOT_GRAPH_MAX_NODES = 50 -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. MAX_DOT_GRAPH_DEPTH = 0 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is enabled by default, which results in a transparent -# background. Warning: Depending on the platform used, enabling this option -# may lead to badly anti-aliased labels on the edges of a graph (i.e. they +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is enabled by default, which results in a transparent +# background. Warning: Depending on the platform used, enabling this option +# may lead to badly anti-aliased labels on the edges of a graph (i.e. they # become hard to read). DOT_TRANSPARENT = NO -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) # support this, this feature is disabled by default. DOT_MULTI_TARGETS = NO -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and # arrows in the dot generated graphs. GENERATE_LEGEND = YES -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate # the various graphs. DOT_CLEANUP = YES #--------------------------------------------------------------------------- -# Configuration::additions related to the search engine +# Configuration::additions related to the search engine #--------------------------------------------------------------------------- -# The SEARCHENGINE tag specifies whether or not a search engine should be +# The SEARCHENGINE tag specifies whether or not a search engine should be # used. If set to NO the values of all tags below this one will be ignored. SEARCHENGINE = NO diff --git a/configure.ac b/configure.ac index 557a81f41..296591f02 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl See LICENSE for licensing information AC_PREREQ([2.63]) AC_INIT([tor],[0.3.5.0-alpha-dev]) -AC_CONFIG_SRCDIR([src/or/main.c]) +AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) # "foreign" means we don't follow GNU package layout standards diff --git a/doc/HACKING/Module.md b/doc/HACKING/Module.md index 1028a029d..6684e258d 100644 --- a/doc/HACKING/Module.md +++ b/doc/HACKING/Module.md @@ -12,9 +12,9 @@ Currently, there is only one module: - Directory Authority subsystem (dirauth) -It is located in its own directory in `src/or/dirauth/`. To disable it, one -need to pass `--disable-module-dirauth` at configure time. All modules are -currently enabled by default. +It is located in its own directory in `src/feature/dirauth/`. To disable it, +one need to pass `--disable-module-dirauth` at configure time. All modules +are currently enabled by default. ## Build System ## @@ -32,10 +32,10 @@ The changes to the build system are pretty straightforward. the C code to conditionally compile things for your module. And the `BUILD_MODULE_<name>` is also defined for automake files (e.g: include.am). -3. In the `src/or/include.am` file, locate the `MODULE_DIRAUTH_SOURCES` value. - You need to create your own `_SOURCES` variable for your module and then - conditionally add the it to `LIBTOR_A_SOURCES` if you should build the - module. +3. In the `src/core/include.am` file, locate the `MODULE_DIRAUTH_SOURCES` + value. You need to create your own `_SOURCES` variable for your module + and then conditionally add the it to `LIBTOR_A_SOURCES` if you should + build the module. It is then **very** important to add your SOURCES variable to `src_or_libtor_testing_a_SOURCES` so the tests can build it. @@ -51,7 +51,7 @@ always build everything in order to tests everything. ## Coding ## As mentioned above, a module must be isolated in its own directory (name of -the module) in `src/or/`. +the module) in `src/feature/`. There are couples of "rules" you want to follow: @@ -87,10 +87,10 @@ There are couples of "rules" you want to follow: making the code much more difficult to follow/understand. * It is possible that you end up with code that needs to be used by the rest - of the code base but is still part of your module. As a good example, if you - look at `src/or/shared_random_client.c`: it contains code needed by the hidden - service subsystem but mainly related to the shared random subsystem very - specific to the dirauth module. + of the code base but is still part of your module. As a good example, if + you look at `src/feature/shared_random_client.c`: it contains code needed + by the hidden service subsystem but mainly related to the shared random + subsystem very specific to the dirauth module. This is fine but try to keep it as lean as possible and never use the same filename as the one in the module. For example, this is a bad idea and @@ -102,7 +102,7 @@ There are couples of "rules" you want to follow: * When you include headers from the module, **always** use the full module path in your statement. Example: - `#include "dirauth/dirvote.h"` + `#include "feature/dirauth/dirvote.h"` The main reason is that we do **not** add the module include path by default so it needs to be specified. But also, it helps our human brain understand diff --git a/doc/HACKING/Tracing.md b/doc/HACKING/Tracing.md index 349aade23..24fa76131 100644 --- a/doc/HACKING/Tracing.md +++ b/doc/HACKING/Tracing.md @@ -69,7 +69,7 @@ configure option: ## Instrument Tor ## This is pretty easy. Let's say you want to add a trace event in -`src/or/rendcache.c`, you only have to add this include statement: +`src/feature/rend/rendcache.c`, you only have to add this include statement: #include "trace/events.h" diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index e9158e128..79551948c 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -12,7 +12,8 @@ # To replace this list with the hard-coded fallback list (for testing), use # a command similar to: -# cat src/or/fallback_dirs.inc | grep \" | grep -v weight | tr -d '\n' | \ +# cat src/app/config/fallback_dirs.inc | grep \" | grep -v weight | \ +# tr -d '\n' | \ # sed 's/"" / /g' | sed 's/""/"/g' | tr \" '\n' | grep -v '^$' \ # > scripts/maint/fallback.whitelist # diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index b093463e0..355dc027d 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -3,11 +3,11 @@ # Usage: # # Regenerate the list: -# scripts/maint/updateFallbackDirs.py > src/or/fallback_dirs.inc 2> fallback_dirs.log +# scripts/maint/updateFallbackDirs.py > src/app/config/fallback_dirs.inc 2> fallback_dirs.log # # Check the existing list: # scripts/maint/updateFallbackDirs.py check_existing > fallback_dirs.inc.ok 2> fallback_dirs.log -# mv fallback_dirs.inc.ok src/or/fallback_dirs.inc +# mv fallback_dirs.inc.ok src/app/config/fallback_dirs.inc # # This script should be run from a stable, reliable network connection, # with no other network activity (and not over tor). @@ -112,7 +112,7 @@ DOWNLOAD_MICRODESC_CONSENSUS = True # expired consensus. This makes them fail the download check. # We use a tolerance of 0, so that 0.2.x series relays also fail the download # check if they serve an expired consensus. -CONSENSUS_EXPIRY_TOLERANCE = 0 +CONSENSUS_EXPIRY_TOLERANCE = 0 # Output fallback name, flags, bandwidth, and ContactInfo in a C comment? OUTPUT_COMMENTS = True if OUTPUT_CANDIDATES else False @@ -161,7 +161,7 @@ BLACKLIST_EXCLUDES_WHITELIST_ENTRIES = True WHITELIST_FILE_NAME = 'scripts/maint/fallback.whitelist' BLACKLIST_FILE_NAME = 'scripts/maint/fallback.blacklist' -FALLBACK_FILE_NAME = 'src/or/fallback_dirs.inc' +FALLBACK_FILE_NAME = 'src/app/config/fallback_dirs.inc' # The number of bytes we'll read from a filter file before giving up MAX_LIST_FILE_SIZE = 1024 * 1024 diff --git a/scripts/test/coverage b/scripts/test/coverage index 75a793a45..59d468ee1 100755 --- a/scripts/test/coverage +++ b/scripts/test/coverage @@ -7,7 +7,7 @@ dst=$1 -for fn in src/or/*.c src/or/*/*.c src/common/*.c src/lib/*/*.c; do +for fn in src/core/*/*.c src/feature/*/*.c src/app/*/*.c src/lib/*/*.c; do BN=`basename $fn` DN=`dirname $fn` F=`echo $BN | sed -e 's/\.c$//;'` diff --git a/src/core/or/git_revision.c b/src/core/or/git_revision.c index f34f922c8..28ec1a793 100644 --- a/src/core/or/git_revision.c +++ b/src/core/or/git_revision.c @@ -7,11 +7,10 @@ /** String describing which Tor Git repository version the source was * built from. This string is generated by a bit of shell kludging in - * src/or/include.am, and is usually right. + * src/core/include.am, and is usually right. */ const char tor_git_revision[] = #ifndef _MSC_VER #include "micro-revision.i" #endif ""; - diff --git a/src/rust/external/external.rs b/src/rust/external/external.rs index 66317f212..059fdd0df 100644 --- a/src/rust/external/external.rs +++ b/src/rust/external/external.rs @@ -11,7 +11,7 @@ extern "C" { ) -> c_int; } -/// Wrap calls to tor_version_as_new_as, defined in src/or/routerparse.c +/// Wrap calls to tor_version_as_new_as, defined in routerparse.c pub fn c_tor_version_as_new_as(platform: &str, cutoff: &str) -> bool { // CHK: These functions should log a warning if an error occurs. This // can be added when integration with tor's logger is added to rust diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index cd49e5f93..3055893d4 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -3,7 +3,7 @@ //! FFI functions, only to be called from C. //! -//! Equivalent C versions of this api are in `src/or/protover.c` +//! Equivalent C versions of this api are in `protover.c` use libc::{c_char, c_int, uint32_t}; use std::ffi::CStr; @@ -18,7 +18,7 @@ use protover::*; /// Translate C enums to Rust Proto enums, using the integer value of the C /// enum to map to its associated Rust enum. /// -/// C_RUST_COUPLED: src/or/protover.h `protocol_type_t` +/// C_RUST_COUPLED: protover.h `protocol_type_t` fn translate_to_rust(c_proto: uint32_t) -> Result<Protocol, ProtoverError> { match c_proto { 0 => Ok(Protocol::Link), diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index f50419ed1..299e43372 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -19,13 +19,13 @@ use protoset::ProtoSet; /// Authorities should use this to decide whether to guess proto lines. /// /// C_RUST_COUPLED: -/// src/or/protover.h `FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS` +/// protover.h `FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS` const FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS: &'static str = "0.2.9.3-alpha"; /// The maximum number of subprotocol version numbers we will attempt to expand /// before concluding that someone is trying to DoS us /// -/// C_RUST_COUPLED: src/or/protover.c `MAX_PROTOCOLS_TO_EXPAND` +/// C_RUST_COUPLED: protover.c `MAX_PROTOCOLS_TO_EXPAND` const MAX_PROTOCOLS_TO_EXPAND: usize = (1<<16); /// The maximum size an `UnknownProtocol`'s name may be. @@ -33,7 +33,7 @@ pub(crate) const MAX_PROTOCOL_NAME_LENGTH: usize = 100; /// Known subprotocols in Tor. Indicates which subprotocol a relay supports. /// -/// C_RUST_COUPLED: src/or/protover.h `protocol_type_t` +/// C_RUST_COUPLED: protover.h `protocol_type_t` #[derive(Clone, Hash, Eq, PartialEq, Debug)] pub enum Protocol { Cons, @@ -57,7 +57,7 @@ impl fmt::Display for Protocol { /// Translates a string representation of a protocol into a Proto type. /// Error if the string is an unrecognized protocol name. /// -/// C_RUST_COUPLED: src/or/protover.c `PROTOCOL_NAMES` +/// C_RUST_COUPLED: protover.c `PROTOCOL_NAMES` impl FromStr for Protocol { type Err = ProtoverError; @@ -130,7 +130,7 @@ impl From<Protocol> for UnknownProtocol { /// Rust code can use the `&'static CStr` as a normal `&'a str` by /// calling `protover::get_supported_protocols`. /// -// C_RUST_COUPLED: src/or/protover.c `protover_get_supported_protocols` +// C_RUST_COUPLED: protover.c `protover_get_supported_protocols` pub(crate) fn get_supported_protocols_cstr() -> &'static CStr { cstr!("Cons=1-2 \ Desc=1-2 \ @@ -601,7 +601,7 @@ impl ProtoverVote { /// let vote = ProtoverVote::compute(protos, &2); /// assert_eq!("Link=3", vote.to_string()); /// ``` - // C_RUST_COUPLED: /src/or/protover.c protover_compute_vote + // C_RUST_COUPLED: protover.c protover_compute_vote pub fn compute(proto_entries: &[UnvalidatedProtoEntry], threshold: &usize) -> UnvalidatedProtoEntry { let mut all_count: ProtoverVote = ProtoverVote::default(); let mut final_output: UnvalidatedProtoEntry = UnvalidatedProtoEntry::default(); diff --git a/src/rust/tor_log/tor_log.rs b/src/rust/tor_log/tor_log.rs index 963c68afa..49a1e7b15 100644 --- a/src/rust/tor_log/tor_log.rs +++ b/src/rust/tor_log/tor_log.rs @@ -129,7 +129,7 @@ pub mod log { } /// The main entry point into Tor's logger. When in non-test mode, this - /// will link directly with `tor_log_string` in /src/or/log.c + /// will link directly with `tor_log_string` in torlog.c extern "C" { pub fn tor_log_string( severity: c_int, diff --git a/src/test/test-network.sh b/src/test/test-network.sh index 6e0f28657..b7a9f1b3c 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -52,12 +52,12 @@ done # - if $PWD looks like a tor build directory, set it to $PWD, or # - unset $TOR_DIR, and let chutney fall back to finding tor binaries in $PATH if [ ! -d "$TOR_DIR" ]; then - if [ -d "$BUILDDIR/src/or" -a -d "$BUILDDIR/src/tools" ]; then + if [ -d "$BUILDDIR/src/core/or" -a -d "$BUILDDIR/src/tools" ]; then # Choose the build directory # But only if it looks like one $ECHO "$myname: \$TOR_DIR not set, trying \$BUILDDIR" TOR_DIR="$BUILDDIR" - elif [ -d "$PWD/src/or" -a -d "$PWD/src/tools" ]; then + elif [ -d "$PWD/src/core/or" -a -d "$PWD/src/tools" ]; then # Guess the tor directory is the current directory # But only if it looks like one $ECHO "$myname: \$TOR_DIR not set, trying \$PWD" diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c index bdab14890..07d6b88ed 100644 --- a/src/test/test_bridges.c +++ b/src/test/test_bridges.c @@ -3,7 +3,7 @@ /** * \file test_bridges.c - * \brief Unittests for code in src/or/bridges.c + * \brief Unittests for code in bridges.c **/ #define TOR_BRIDGES_PRIVATE @@ -609,4 +609,3 @@ struct testcase_t bridges_tests[] = { B_TEST(transport_is_needed, 0), END_OF_TESTCASES }; - diff --git a/src/test/test_router.c b/src/test/test_router.c index a398c7497..c6a2452c8 100644 --- a/src/test/test_router.c +++ b/src/test/test_router.c @@ -4,7 +4,7 @@ /** * \file test_router.c - * \brief Unittests for code in src/or/router.c + * \brief Unittests for code in router.c **/ #include "core/or/or.h" @@ -111,4 +111,3 @@ struct testcase_t router_tests[] = { ROUTER_TEST(dump_router_to_string_no_bridge_distribution_method, TT_FORK), END_OF_TESTCASES }; -

1 0

[tor/master] Actually sort the lines in src/core/include.am
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 50963f36d7c69f3fb51caaf487af8ccc85532d48 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 17:10:22 2018 -0400 Actually sort the lines in src/core/include.am --- src/core/include.am | 356 ++++++++++++++++++++++++++-------------------------- 1 file changed, 178 insertions(+), 178 deletions(-) diff --git a/src/core/include.am b/src/core/include.am index 23c283d8d..b35367ccb 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -10,96 +10,96 @@ LIBTOR_APP_A_SOURCES = \ src/app/config/config.c \ src/app/config/confparse.c \ src/app/config/statefile.c \ - src/core/proto/proto_socks.c \ - src/core/proto/protover_rust.c \ - src/core/proto/proto_ext_or.c \ - src/core/proto/proto_cell.c \ - src/core/proto/proto_http.c \ - src/core/proto/proto_control0.c \ - src/core/mainloop/cpuworker.c \ - src/core/mainloop/main.c \ - src/core/mainloop/periodic.c \ - src/core/mainloop/connection.c \ + src/core/crypto/hs_ntor.c \ src/core/crypto/onion.c \ - src/core/crypto/onion_ntor.c \ - src/core/crypto/relay_crypto.c \ src/core/crypto/onion_fast.c \ - src/core/crypto/hs_ntor.c \ + src/core/crypto/onion_ntor.c \ src/core/crypto/onion_tap.c \ - src/core/or/scheduler_kist.c \ + src/core/crypto/relay_crypto.c \ + src/core/mainloop/connection.c \ + src/core/mainloop/cpuworker.c \ + src/core/mainloop/main.c \ + src/core/mainloop/periodic.c \ + src/core/or/address_set.c \ + src/core/or/channel.c \ + src/core/or/channelpadding.c \ + src/core/or/channeltls.c \ src/core/or/circuitbuild.c \ - src/core/or/reasons.c \ + src/core/or/circuitlist.c \ + src/core/or/circuitmux.c \ + src/core/or/circuitmux_ewma.c \ src/core/or/circuitstats.c \ src/core/or/circuituse.c \ - src/core/or/scheduler.c \ - src/core/or/circuitmux_ewma.c \ - src/core/or/channelpadding.c \ + src/core/or/command.c \ + src/core/or/connection_edge.c \ + src/core/or/connection_or.c \ + src/core/or/dos.c \ src/core/or/git_revision.c \ - src/core/or/circuitlist.c \ - src/core/or/circuitmux.c \ src/core/or/policies.c \ - src/core/or/channeltls.c \ + src/core/or/protover.c \ + src/core/or/reasons.c \ src/core/or/relay.c \ + src/core/or/scheduler.c \ + src/core/or/scheduler_kist.c \ src/core/or/scheduler_vanilla.c \ - src/core/or/connection_edge.c \ - src/core/or/dos.c \ - src/core/or/protover.c \ - src/core/or/address_set.c \ - src/core/or/command.c \ - src/core/or/channel.c \ - src/core/or/connection_or.c \ src/core/or/status.c \ + src/core/proto/proto_cell.c \ + src/core/proto/proto_control0.c \ + src/core/proto/proto_ext_or.c \ + src/core/proto/proto_http.c \ + src/core/proto/proto_socks.c \ + src/core/proto/protover_rust.c \ + src/feature/api/tor_api.c \ + src/feature/client/addressmap.c \ + src/feature/client/bridges.c \ + src/feature/client/circpathbias.c \ + src/feature/client/dnsserv.c \ + src/feature/client/entrynodes.c \ + src/feature/client/transports.c \ + src/feature/control/control.c \ + src/feature/dirauth/keypin.c \ + src/feature/dircache/conscache.c \ + src/feature/dircache/consdiffmgr.c \ + src/feature/dircache/directory.c \ + src/feature/dircache/dirserv.c \ src/feature/dircommon/consdiff.c \ src/feature/dircommon/fp_pair.c \ src/feature/dircommon/voting_schedule.c \ - src/feature/stats/geoip.c \ - src/feature/stats/rephist.c \ src/feature/hibernate/hibernate.c \ - src/feature/hs_common/shared_random_client.c \ - src/feature/hs_common/replaycache.c \ - src/feature/client/circpathbias.c \ - src/feature/client/bridges.c \ - src/feature/client/entrynodes.c \ - src/feature/client/transports.c \ - src/feature/client/addressmap.c \ - src/feature/client/dnsserv.c \ - src/feature/api/tor_api.c \ - src/feature/nodelist/microdesc.c \ - src/feature/nodelist/routerparse.c \ - src/feature/nodelist/networkstatus.c \ - src/feature/nodelist/nodelist.c \ - src/feature/nodelist/routerset.c \ - src/feature/nodelist/torcert.c \ - src/feature/nodelist/routerlist.c \ - src/feature/nodelist/parsecommon.c \ - src/feature/hs/hs_circuitmap.c \ - src/feature/hs/hs_cell.c \ src/feature/hs/hs_cache.c \ + src/feature/hs/hs_cell.c \ + src/feature/hs/hs_circuit.c \ + src/feature/hs/hs_circuitmap.c \ + src/feature/hs/hs_client.c \ src/feature/hs/hs_common.c \ + src/feature/hs/hs_config.c \ src/feature/hs/hs_control.c \ - src/feature/hs/hs_client.c \ - src/feature/hs/hs_intropoint.c \ + src/feature/hs/hs_descriptor.c \ src/feature/hs/hs_ident.c \ - src/feature/hs/hs_config.c \ + src/feature/hs/hs_intropoint.c \ src/feature/hs/hs_service.c \ src/feature/hs/hs_stats.c \ - src/feature/hs/hs_descriptor.c \ - src/feature/hs/hs_circuit.c \ - src/feature/dirauth/keypin.c \ + src/feature/hs_common/replaycache.c \ + src/feature/hs_common/shared_random_client.c \ + src/feature/nodelist/microdesc.c \ + src/feature/nodelist/networkstatus.c \ + src/feature/nodelist/nodelist.c \ + src/feature/nodelist/parsecommon.c \ + src/feature/nodelist/routerlist.c \ + src/feature/nodelist/routerparse.c \ + src/feature/nodelist/routerset.c \ + src/feature/nodelist/torcert.c \ + src/feature/relay/dns.c \ src/feature/relay/ext_orport.c \ src/feature/relay/router.c \ - src/feature/relay/dns.c \ src/feature/relay/routerkeys.c \ - src/feature/control/control.c \ + src/feature/rend/rendcache.c \ + src/feature/rend/rendclient.c \ src/feature/rend/rendcommon.c \ src/feature/rend/rendmid.c \ src/feature/rend/rendservice.c \ - src/feature/rend/rendcache.c \ - src/feature/rend/rendclient.c \ - src/feature/dircache/directory.c \ - src/feature/dircache/conscache.c \ - src/feature/dircache/consdiffmgr.c \ - src/feature/dircache/dirserv.c + src/feature/stats/geoip.c \ + src/feature/stats/rephist.c # # Modules are conditionnally compiled in tor starting here. We add the C files @@ -144,157 +144,157 @@ src_core_libtor_app_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) noinst_HEADERS += \ src/app/config/config.h \ - src/app/config/statefile.h \ + src/app/config/confparse.h \ src/app/config/or_options_st.h \ src/app/config/or_state_st.h \ - src/app/config/confparse.h \ + src/app/config/statefile.h \ src/app/main/ntmain.h \ - src/core/proto/proto_ext_or.h \ - src/core/proto/proto_http.h \ - src/core/proto/proto_cell.h \ - src/core/proto/proto_socks.h \ - src/core/proto/proto_control0.h \ - src/core/mainloop/cpuworker.h \ - src/core/mainloop/connection.h \ - src/core/mainloop/periodic.h \ - src/core/mainloop/main.h \ - src/core/crypto/onion_ntor.h \ - src/core/crypto/onion_tap.h \ - src/core/crypto/onion.h \ src/core/crypto/hs_ntor.h \ + src/core/crypto/onion.h \ src/core/crypto/onion_fast.h \ + src/core/crypto/onion_ntor.h \ + src/core/crypto/onion_tap.h \ src/core/crypto/relay_crypto.h \ - src/core/or/edge_connection_st.h \ - src/core/or/connection_edge.h \ - src/core/or/cpath_build_state_st.h \ + src/core/mainloop/connection.h \ + src/core/mainloop/cpuworker.h \ + src/core/mainloop/main.h \ + src/core/mainloop/periodic.h \ + src/core/or/addr_policy_st.h \ + src/core/or/address_set.h \ + src/core/or/cell_queue_st.h \ + src/core/or/cell_st.h \ + src/core/or/channel.h \ + src/core/or/channelpadding.h \ + src/core/or/channeltls.h \ + src/core/or/circuit_st.h \ + src/core/or/circuitbuild.h \ + src/core/or/circuitlist.h \ + src/core/or/circuitmux.h \ + src/core/or/circuitmux_ewma.h \ src/core/or/circuitstats.h \ - src/core/or/connection_or.h \ - src/core/or/or.h \ + src/core/or/circuituse.h \ src/core/or/command.h \ - src/core/or/server_port_cfg_st.h \ - src/core/or/port_cfg_st.h \ - src/core/or/scheduler.h \ + src/core/or/connection_edge.h \ + src/core/or/connection_or.h \ src/core/or/connection_st.h \ - src/core/or/address_set.h \ - src/core/or/circuitmux.h \ - src/core/or/circuitlist.h \ + src/core/or/cpath_build_state_st.h \ src/core/or/crypt_path_reference_st.h \ src/core/or/crypt_path_st.h \ - src/core/or/circuitbuild.h \ - src/core/or/circuit_st.h \ - src/core/or/var_cell_st.h \ - src/core/or/entry_connection_st.h \ - src/core/or/cell_st.h \ - src/core/or/socks_request_st.h \ - src/core/or/or_handshake_certs_st.h \ + src/core/or/destroy_cell_queue_st.h \ src/core/or/dos.h \ - src/core/or/or_connection_st.h \ - src/core/or/protover.h \ - src/core/or/channel.h \ - src/core/or/or_circuit_st.h \ + src/core/or/edge_connection_st.h \ + src/core/or/entry_connection_st.h \ src/core/or/entry_port_cfg_st.h \ - src/core/or/channelpadding.h \ - src/core/or/relay_crypto_st.h \ - src/core/or/cell_queue_st.h \ - src/core/or/circuituse.h \ - src/core/or/channeltls.h \ + src/core/or/extend_info_st.h \ + src/core/or/git_revision.h \ + src/core/or/listener_connection_st.h \ + src/core/or/or.h \ + src/core/or/or_circuit_st.h \ + src/core/or/or_connection_st.h \ + src/core/or/or_handshake_certs_st.h \ src/core/or/or_handshake_state_st.h \ - src/core/or/addr_policy_st.h \ - src/core/or/status.h \ - src/core/or/relay.h \ - src/core/or/circuitmux_ewma.h \ + src/core/or/origin_circuit_st.h \ src/core/or/policies.h \ + src/core/or/port_cfg_st.h \ + src/core/or/protover.h \ src/core/or/reasons.h \ - src/core/or/listener_connection_st.h \ - src/core/or/origin_circuit_st.h \ - src/core/or/destroy_cell_queue_st.h \ + src/core/or/relay.h \ + src/core/or/relay_crypto_st.h \ + src/core/or/scheduler.h \ + src/core/or/server_port_cfg_st.h \ + src/core/or/socks_request_st.h \ + src/core/or/status.h \ src/core/or/tor_version_st.h \ - src/core/or/git_revision.h \ - src/core/or/extend_info_st.h \ + src/core/or/var_cell_st.h \ + src/core/proto/proto_cell.h \ + src/core/proto/proto_control0.h \ + src/core/proto/proto_ext_or.h \ + src/core/proto/proto_http.h \ + src/core/proto/proto_socks.h \ + src/feature/api/tor_api_internal.h \ + src/feature/client/addressmap.h \ + src/feature/client/bridges.h \ + src/feature/client/circpathbias.h \ + src/feature/client/dnsserv.h \ + src/feature/client/entrynodes.h \ + src/feature/client/transports.h \ + src/feature/control/control.h \ + src/feature/control/control_connection_st.h \ + src/feature/dirauth/dircollate.h \ + src/feature/dirauth/dirvote.h \ + src/feature/dirauth/keypin.h \ + src/feature/dirauth/mode.h \ + src/feature/dirauth/ns_detached_signatures_st.h \ + src/feature/dirauth/shared_random.h \ + src/feature/dirauth/shared_random_state.h \ + src/feature/dirauth/vote_microdesc_hash_st.h \ + src/feature/dircache/cached_dir_st.h \ + src/feature/dircache/conscache.h \ + src/feature/dircache/consdiffmgr.h \ + src/feature/dircache/directory.h \ + src/feature/dircache/dirserv.h \ + src/feature/dirclient/dir_server_st.h \ + src/feature/dirclient/download_status_st.h \ src/feature/dircommon/consdiff.h \ - src/feature/dircommon/voting_schedule.h \ src/feature/dircommon/dir_connection_st.h \ src/feature/dircommon/fp_pair.h \ src/feature/dircommon/vote_timing_st.h \ - src/feature/stats/rephist.h \ - src/feature/stats/geoip.h \ + src/feature/dircommon/voting_schedule.h \ src/feature/hibernate/hibernate.h \ - src/feature/hs_common/shared_random_client.h \ - src/feature/hs_common/replaycache.h \ - src/feature/dirclient/dir_server_st.h \ - src/feature/dirclient/download_status_st.h \ - src/feature/client/transports.h \ - src/feature/client/circpathbias.h \ - src/feature/client/entrynodes.h \ - src/feature/client/addressmap.h \ - src/feature/client/bridges.h \ - src/feature/client/dnsserv.h \ - src/feature/api/tor_api_internal.h \ - src/feature/nodelist/routerparse.h \ - src/feature/nodelist/routerlist.h \ - src/feature/nodelist/signed_descriptor_st.h \ - src/feature/nodelist/routerstatus_st.h \ - src/feature/nodelist/torcert.h \ - src/feature/nodelist/parsecommon.h \ - src/feature/nodelist/networkstatus_sr_info_st.h \ - src/feature/nodelist/microdesc_st.h \ - src/feature/nodelist/nodelist.h \ - src/feature/nodelist/microdesc.h \ - src/feature/nodelist/node_st.h \ - src/feature/nodelist/desc_store_st.h \ - src/feature/nodelist/routerlist_st.h \ - src/feature/nodelist/routerinfo_st.h \ - src/feature/nodelist/document_signature_st.h \ - src/feature/nodelist/vote_routerstatus_st.h \ - src/feature/nodelist/extrainfo_st.h \ - src/feature/nodelist/networkstatus_voter_info_st.h \ - src/feature/nodelist/networkstatus_st.h \ - src/feature/nodelist/authority_cert_st.h \ - src/feature/nodelist/routerset.h \ - src/feature/nodelist/networkstatus.h \ - src/feature/hs/hs_cell.h \ src/feature/hs/hs_cache.h \ + src/feature/hs/hs_cell.h \ + src/feature/hs/hs_circuit.h \ + src/feature/hs/hs_circuitmap.h \ src/feature/hs/hs_client.h \ - src/feature/hs/hs_intropoint.h \ + src/feature/hs/hs_common.h \ src/feature/hs/hs_config.h \ - src/feature/hs/hs_ident.h \ - src/feature/hs/hs_stats.h \ - src/feature/hs/hs_circuitmap.h \ + src/feature/hs/hs_control.h \ src/feature/hs/hs_descriptor.h \ + src/feature/hs/hs_ident.h \ + src/feature/hs/hs_intropoint.h \ src/feature/hs/hs_service.h \ - src/feature/hs/hs_circuit.h \ - src/feature/hs/hs_control.h \ + src/feature/hs/hs_stats.h \ src/feature/hs/hsdir_index_st.h \ - src/feature/hs/hs_common.h \ - src/feature/dirauth/mode.h \ - src/feature/dirauth/ns_detached_signatures_st.h \ - src/feature/dirauth/shared_random_state.h \ - src/feature/dirauth/shared_random.h \ - src/feature/dirauth/vote_microdesc_hash_st.h \ - src/feature/dirauth/keypin.h \ - src/feature/dirauth/dircollate.h \ - src/feature/dirauth/dirvote.h \ - src/feature/relay/dns_structs.h \ + src/feature/hs_common/replaycache.h \ + src/feature/hs_common/shared_random_client.h \ + src/feature/nodelist/authority_cert_st.h \ + src/feature/nodelist/desc_store_st.h \ + src/feature/nodelist/document_signature_st.h \ + src/feature/nodelist/extrainfo_st.h \ + src/feature/nodelist/microdesc.h \ + src/feature/nodelist/microdesc_st.h \ + src/feature/nodelist/networkstatus.h \ + src/feature/nodelist/networkstatus_sr_info_st.h \ + src/feature/nodelist/networkstatus_st.h \ + src/feature/nodelist/networkstatus_voter_info_st.h \ + src/feature/nodelist/node_st.h \ + src/feature/nodelist/nodelist.h \ + src/feature/nodelist/parsecommon.h \ + src/feature/nodelist/routerinfo_st.h \ + src/feature/nodelist/routerlist.h \ + src/feature/nodelist/routerlist_st.h \ + src/feature/nodelist/routerparse.h \ + src/feature/nodelist/routerset.h \ + src/feature/nodelist/routerstatus_st.h \ + src/feature/nodelist/signed_descriptor_st.h \ + src/feature/nodelist/torcert.h \ + src/feature/nodelist/vote_routerstatus_st.h \ src/feature/relay/dns.h \ + src/feature/relay/dns_structs.h \ src/feature/relay/ext_orport.h \ src/feature/relay/router.h \ src/feature/relay/routerkeys.h \ - src/feature/control/control_connection_st.h \ - src/feature/control/control.h \ - src/feature/rend/rendcommon.h \ - src/feature/rend/rendservice.h \ - src/feature/rend/rendcache.h \ - src/feature/rend/rendmid.h \ - src/feature/rend/rend_intro_point_st.h \ src/feature/rend/rend_authorized_client_st.h \ src/feature/rend/rend_encoded_v2_service_descriptor_st.h \ + src/feature/rend/rend_intro_point_st.h \ src/feature/rend/rend_service_descriptor_st.h \ + src/feature/rend/rendcache.h \ src/feature/rend/rendclient.h \ - src/feature/dircache/conscache.h \ - src/feature/dircache/cached_dir_st.h \ - src/feature/dircache/dirserv.h \ - src/feature/dircache/directory.h \ - src/feature/dircache/consdiffmgr.h + src/feature/rend/rendcommon.h \ + src/feature/rend/rendmid.h \ + src/feature/rend/rendservice.h \ + src/feature/stats/geoip.h \ + src/feature/stats/rephist.h noinst_HEADERS += \ src/app/config/auth_dirs.inc \

1 0

Jump to page: