Merge commit 'karsten/entrystats-master'

Conflicts:
	ChangeLog
	configure.in
	src/or/config.c
	src/or/or.h

1 files changed, 22 insertions, 0 deletions

diff --git a/src/or/config.c b/src/or/config.c
index f7a5745262..5137f74792 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -199,6 +199,7 @@ static config_var_t _option_vars[] = {
   V(DownloadExtraInfo,           BOOL,     "0"),
   V(EnforceDistinctSubnets,      BOOL,     "1"),
   V(EntryNodes,                  ROUTERSET,   NULL),
+  V(EntryStatistics,             BOOL,     "0"),
   V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "10 minutes"),
   V(ExcludeNodes,                ROUTERSET, NULL),
   V(ExcludeExitNodes,            ROUTERSET, NULL),
@@ -1396,6 +1397,7 @@ options_act(or_options_t *old_options)
     log_warn(LD_CONFIG, "ExitPortStatistics enabled, but Tor was built "
              "without port statistics support.");
 #endif
+
 #ifdef ENABLE_BUFFER_STATS
   if (options->CellStatistics)
     log_notice(LD_CONFIG, "Configured to measure cell statistics. Look "
@@ -1406,6 +1408,26 @@ options_act(or_options_t *old_options)
     log_warn(LD_CONFIG, "CellStatistics enabled, but Tor was built "
              "without cell statistics support.");
 #endif
+
+#ifdef ENABLE_ENTRY_STATS
+  if (options->EntryStatistics) {
+    if (should_record_bridge_info(options)) {
+      /* Don't allow measuring statistics on entry guards when configured
+       * as bridge. */
+      log_warn(LD_CONFIG, "Bridges cannot be configured to measure "
+               "additional GeoIP statistics as entry guards.");
+      return -1;
+    } else
+      log_notice(LD_CONFIG, "Configured to measure entry node "
+                 "statistics. Look for the entry-stats file that will "
+                 "first be written to the data directory in 24 hours "
+                 "from now.");
+  }
+#else
+  if (options->EntryStatistics)
+    log_warn(LD_CONFIG, "EntryStatistics enabled, but Tor was built "
+             "without entry node statistics support.");
+#endif
   /* Check if we need to parse and add the EntryNodes config option. */
   if (options->EntryNodes &&
       (!old_options ||