[tor-commits] [metrics-web/release] Removed redundant comments and added explanatory comment.

karsten at torproject.org karsten at torproject.org
Wed May 30 13:45:11 UTC 2018


commit 66caac798cb4524956c1bc9114ab7b1441b1e89e
Author: iwakeh <iwakeh at torproject.org>
Date:   Wed Dec 20 13:06:54 2017 +0000

    Removed redundant comments and added explanatory comment.
---
 .../java/org/torproject/metrics/stats/ipv6servers/Parser.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java
index a66ad23..962ca27 100644
--- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java
+++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java
@@ -25,6 +25,9 @@ class Parser {
     Ipv6ServerDescriptor parsedDescriptor = new Ipv6ServerDescriptor();
     parsedDescriptor.digest = serverDescriptor.getDigestSha1Hex();
     for (String orAddress : serverDescriptor.getOrAddresses()) {
+      /* Check whether the additional OR address is an IPv6 address containing
+       * at least two colons as opposed to an IPv4 address and TCP port
+       * containing only one colon as separator. */
       if (StringUtils.countMatches(orAddress, ":") >= 2) {
         parsedDescriptor.announced = true;
         break;
@@ -47,14 +50,12 @@ class Parser {
     return parsedDescriptor;
   }
 
-  /** Parse a relay network status. */
   Ipv6NetworkStatus parseRelayNetworkStatusConsensus(
       RelayNetworkStatusConsensus consensus) throws Exception {
     return this.parseStatus(true, consensus.getValidAfterMillis(),
         consensus.getStatusEntries().values());
   }
 
-  /** Parse a bridge network status. */
   Ipv6NetworkStatus parseBridgeNetworkStatus(BridgeNetworkStatus status)
       throws Exception {
     return this.parseStatus(false, status.getPublishedMillis(),
@@ -85,6 +86,9 @@ class Parser {
             && !entry.getFlags().contains("BadExit");
         parsedEntry.reachable = false;
         for (String orAddress : entry.getOrAddresses()) {
+          /* Check whether the additional OR address is an IPv6 address
+           * containing at least two colons as opposed to an IPv4 address and
+           * TCP port containing only one colon as separator. */
           if (StringUtils.countMatches(orAddress, ":") >= 2) {
             parsedEntry.reachable = true;
             break;





More information about the tor-commits mailing list