Changeset 5d06de8

Timestamp:

Dec 14, 2018 4:54:10 PM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

3054a24

Parents:

468871f

Message:

Sybil: Class for persisting results, related refactoring

Files:

• apps/routerconsole/java/src/net/i2p/router/sybil/PersistSybil.java (added)
• apps/routerconsole/java/src/net/i2p/router/sybil/Points.java (added)
• apps/routerconsole/java/src/net/i2p/router/sybil/package.html (added)
• apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java (modified) (6 diffs)
• build.xml (modified) (1 diff)

apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java

@@ -31 +31 @@
 import net.i2p.router.peermanager.DBHistory;
 import net.i2p.router.peermanager.PeerProfile;
+import net.i2p.router.sybil.Points;
 import net.i2p.router.tunnel.pool.TunnelPool;
 import net.i2p.router.util.HashDistance;
@@ -51 +52 @@
  *
  */
-class SybilRenderer {
+public class SybilRenderer {
 
     private final RouterContext _context;
@@ -103 +104 @@
     }
 
-    /**
-     *  A total score and a List of reason Strings
-     */
-    public static class Points implements Comparable<Points> {
-         private double points;
-         private final List<String> reasons;
-
-         public Points(double points, String reason) {
-             this.points = points;
-             reasons = new ArrayList<String>(4);
-             reasons.add(reason);
-         }
-         public int compareTo(Points r) {
-             return Double.compare(points, r.points);
-        }
-    }
-
     private static class PointsComparator implements Comparator<Hash>, Serializable {
          private final Map<Hash, Points> _points;
@@ -160 +144 @@
      *  points1 is unmodified.
      */
+/****
     private void mergePoints(Map<Hash, Points> points1, Map<Hash, Points> points2) {
         for (Map.Entry<Hash, Points> e : points1.entrySet()) {
@@ -173 +158 @@
         }
     }
-
+****/
+
+    /** */
     private void addPoints(Map<Hash, Points> points, Hash h, double d, String reason) {
-        String rsn = fmt.format(d) + ": " + reason;
         Points dd = points.get(h);
         if (dd != null) {
-            dd.points += d;
-            dd.reasons.add(rsn);
+            dd.addPoints(d, reason);
         } else {
-            points.put(h, new Points(d, rsn));
+            points.put(h, new Points(d, reason));
         }
     }
@@ -324 +309 @@
                     continue;
                 Points pp = points.get(h);
-                double p = pp.points;
+                double p = pp.getPoints();
                 if (p < MIN_DISPLAY_POINTS)
                     break;  // sorted
                 buf.append("<p class=\"threatpoints\"><b>Threat Points: " + fmt.format(p) + "</b></p><ul>");
-                if (pp.reasons.size() > 1)
-                    Collections.sort(pp.reasons, new ReasonComparator());
-                for (String s : pp.reasons) {
+                List<String> reasons = pp.getReasons();
+                if (reasons.size() > 1)
+                    Collections.sort(reasons, new ReasonComparator());
+                for (String s : reasons) {
                     int c = s.indexOf(':');
                     if (c <= 0)

build.xml

@@ -826 +826 @@
             <group title="Streaming Library" packages="net.i2p.client.streaming:net.i2p.client.streaming.impl" />
             <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:net.i2p.data.router:org.cybergarage:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters:com.maxmind.*:com.southernstorm.noise.*" />
-            <group title="Router Console" packages="net.i2p.router.web:net.i2p.router.web.*:net.i2p.router.update:edu.internet2.ndt:net.i2p.router.news:com.vuze.*" />
+            <group title="Router Console" packages="net.i2p.router.web:net.i2p.router.web.*:net.i2p.router.update:net.i2p.router.sybil:edu.internet2.ndt:net.i2p.router.news:com.vuze.*" />
             <!-- apps and bridges starting here, alphabetical please -->
             <group title="Addressbook Application" packages="net.i2p.addressbook:net.i2p.router.naming:net.metanotion:net.metanotion.*" />