[tor-commits] [tor/master] Create function to log service introduction point creation limits

[nickm@xxxxxxxxxxxxxx]

commit d0927b664602a68844b4a91e10af6d6350048397
Author: teor <teor2345@xxxxxxxxx>
Date:   Sat Mar 4 22:42:59 2017 +1100

    Create function to log service introduction point creation limits
    
    Depends on 21594, part of 21622.
    
    (Resolved merge conflict in static function declarations.
---
 src/or/rendservice.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index eeccd43..8f978d0 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -83,6 +83,7 @@ static const smartlist_t* rend_get_service_list(
                                   const smartlist_t* substitute_service_list);
 static smartlist_t* rend_get_service_list_mutable(
                                   smartlist_t* substitute_service_list);
+static int rend_max_intro_circs_per_period(unsigned int n_intro_points_wanted);
 
 /** Represents the mapping from a virtual port of a rendezvous service to
  * a real port on some IP.
@@ -1025,6 +1026,45 @@ rend_service_del_ephemeral(const char *service_id)
   return 0;
 }
 
+/* There can be 1 second's delay due to second_elapsed_callback, and perhaps
+ * another few seconds due to blocking calls. */
+#define INTRO_CIRC_RETRY_PERIOD_SLOP 10
+
+/** Log information about the intro point creation rate and current intro
+ * points for service, upgrading the log level from min_severity to warn if
+ * we have stopped launching new intro point circuits. */
+static void
+rend_log_intro_limit(const rend_service_t *service, int min_severity)
+{
+  int exceeded_limit = (service->n_intro_circuits_launched >=
+                        rend_max_intro_circs_per_period(
+                                              service->n_intro_points_wanted));
+  int severity = min_severity;
+  /* We stopped creating circuits */
+  if (exceeded_limit) {
+    severity = LOG_WARN;
+  }
+  time_t intro_period_elapsed = time(NULL) - service->intro_period_started;
+  tor_assert_nonfatal(intro_period_elapsed >= 0);
+  /* We delayed resuming circuits longer than expected */
+  int exceeded_elapsed = (intro_period_elapsed > INTRO_CIRC_RETRY_PERIOD +
+                          INTRO_CIRC_RETRY_PERIOD_SLOP);
+  if (exceeded_elapsed) {
+    severity = LOG_WARN;
+  }
+  log_fn(severity, LD_REND, "Hidden service %s %s %d intro points in the last "
+         "%d seconds%s. Intro circuit launches are limited to %d per %d "
+         "seconds.",
+         service->service_id,
+         exceeded_limit ? "exceeded launch limit with" : "launched",
+         service->n_intro_circuits_launched,
+         (int)intro_period_elapsed,
+         exceeded_elapsed ? " (delayed)" : "",
+         rend_max_intro_circs_per_period(service->n_intro_points_wanted),
+         INTRO_CIRC_RETRY_PERIOD);
+  rend_service_dump_stats(severity);
+}
+
 /** Replace the old value of <b>service</b>-\>desc with one that reflects
  * the other fields in service.
  */



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits