discoveries reporting

simulator/config/dasprotocol.cfg

@@ -82,7 +82,7 @@ init.1uniqueNodeID.protocoldasbuilder 4dasprotocol
 init.1uniqueNodeID.protocoldasvalidator 5dasprotocol
 init.1uniqueNodeID.protocoldasnonvalidator 6dasprotocol
 init.1uniqueNodeID.protocolEvildas 7evildasprotocol
-init.1uniqueNodeID.validator_rate 0.5
+init.1uniqueNodeID.validator_rate 1.0
 init.1uniqueNodeID.evilNodeRatioValidator 0.0
 init.1uniqueNodeID.evilNodeRatioNonValidator 0.0
 
@@ -110,10 +110,14 @@ control.2turbolenceAdd.protocolevildas 7evildasprotocol
 control.2turbolenceAdd.transport 2unreltr
 control.2turbolenceAdd.step TURBULENCE_STEP
 <<<<<<< HEAD
+<<<<<<< HEAD
 control.2turbolenceAdd.p_idle 0.9
 =======
 control.2turbolenceAdd.p_idle 0.09
 >>>>>>> 62b294e (back to sample assignment based on id)
+=======
+control.2turbolenceAdd.p_idle 0.9
+>>>>>>> 54bd3fd (discoveries reporting)
 control.2turbolenceAdd.p_rem 0.05
 control.2turbolenceAdd.p_add 0.05
 

simulator/src/main/java/peersim/kademlia/KademliaObserver.java

@@ -11,6 +11,8 @@
 import peersim.core.CommonState;
 import peersim.core.Control;
 import peersim.core.Network;
+import peersim.kademlia.das.Neighbour;
+import peersim.kademlia.das.SearchTable;
 import peersim.kademlia.operations.Operation;
 import peersim.util.IncrementalStats;
 
@@ -54,6 +56,10 @@ public class KademliaObserver implements Control {
   private static HashMap<Long, Map<String, Object>> operations =
       new HashMap<Long, Map<String, Object>>();
 
+  /** Log of operations in the Kademlia network */
+  private static HashMap<Long, Map<String, Object>> peerDiscoveries =
+      new HashMap<Long, Map<String, Object>>();
+
   /** Name of the folder where experiment logs are written */
   private static String logFolderName;
 
@@ -124,6 +130,9 @@ public static void writeOut() {
     if (!operations.isEmpty()) {
       writeLogs(operations, logFolderName + "/" + "operation.csv");
     }
+    if (!peerDiscoveries.isEmpty()) {
+      writeLogs(peerDiscoveries, logFolderName + "/" + "peerDiscoveries.csv");
+    }
   }
 
   /**
@@ -193,4 +202,26 @@ public static void reportOperation(Operation op) {
     op.setStopTime(CommonState.getTime() - op.getTimestamp());
     operations.put(op.getId(), op.toMap());
   }
+
+  public static void reportPeerDiscovery(Message m, SearchTable st) {
+
+    if (m.src == null) return;
+    // Add the message to the message log, but first check if it hasn't already been added
+    assert (!messages.keySet().contains(m.id));
+    Map<String, Object> result = new HashMap<String, Object>();
+    Neighbour[] neighs = (Neighbour[])m.value;
+
+    int notKnown=0;
+    for(Neighbour n : neighs){
+      if(!st.isNeighbourKnown(n))notKnown++;
+    }
+    result.put("message_id", m.id);
+    result.put("dst_id",m.dst.getId());
+    result.put("src_id",m.src.getId());
+    result.put("total_peers", st.getAllNeighboursCount());
+    result.put("peers_in_message", neighs.length);
+    result.put("peers_not_known", notKnown);
+
+    messages.put(m.id, result);
+  }
 }

simulator/src/main/java/peersim/kademlia/das/DASProtocol.java

@@ -94,6 +94,8 @@ public abstract class DASProtocol implements Cloneable, EDProtocol, KademliaEven
 
   protected TreeSet<BigInteger> nonValidatorsIndexed; // , samplesIndexed;
 
+  protected boolean isEvil;
+
   /**
    * Replicate this object by returning an identical copy.<br>
    * It is called by the initializer and do not fill any particular field.
@@ -111,6 +113,7 @@ public abstract class DASProtocol implements Cloneable, EDProtocol, KademliaEven
   public DASProtocol(String prefix) {
 
     DASProtocol.prefix = prefix;
+    isEvil = false;
     _init();
     tid = Configuration.getPid(prefix + "." + PAR_TRANSPORT);
     // samplesRequested = 0;
@@ -236,6 +239,10 @@ public boolean isValidator() {
     return this.isValidator;
   }
 
+  public boolean isEvil() {
+    return this.isEvil;
+  }
+
   public void setBuilderAddress(BigInteger address) {
     this.builderAddress = address;
     searchTable.setBuilderAddress(address);
@@ -422,7 +429,7 @@ protected void sendMessage(Message m, BigInteger destId, int myPid) {
       // interface
       // Timeout t = new Timeout(destId, m.id, m.operationId);
       Sample[] samples = (Sample[]) m.body;
-      BigInteger[] nghbrs = (BigInteger[]) m.value;
+      Neighbour[] nghbrs = (Neighbour[]) m.value;
       double samplesSize = 0.0;
       if (samples != null) samplesSize = samples.length * KademliaCommonConfigDas.SAMPLE_SIZE;
       double nghbrsSize = 0.0;
@@ -630,7 +637,8 @@ public void operationComplete(Operation op) {
       list.remove(builderAddress);
       // searchTable.addNodes(list.toArray(new BigInteger[0]));
       for (BigInteger id : list) {
-        searchTable.addNeighbour(new Neighbour(id));
+        Node n = Util.nodeIdtoNode(id, kademliaId);
+        searchTable.addNeighbour(new Neighbour(id, n, n.getDASProtocol().isEvil()));
       }
       logger.warning(
           "Search table operation complete"
@@ -672,7 +680,8 @@ public void nodesFound(Operation op, BigInteger[] neighbours) {
     }
     // searchTable.addNodes(list.toArray(new BigInteger[0]));
     for (BigInteger id : list) {
-      searchTable.addNeighbour(new Neighbour(id));
+      Node n = Util.nodeIdtoNode(id, kademliaId);
+      searchTable.addNeighbour(new Neighbour(id, n, n.getDASProtocol().isEvil()));
     }
     logger.info(
         "Search table nodes found "

simulator/src/main/java/peersim/kademlia/das/EvilDASProtocol.java

@@ -9,6 +9,7 @@ public class EvilDASProtocol extends DASProtocol {
   public EvilDASProtocol(String prefix) {
     super(prefix);
     EvilDASProtocol.prefix = prefix;
+    isEvil = true;
   }
 
   @Override

simulator/src/main/java/peersim/kademlia/das/Neighbour.java

@@ -1,15 +1,20 @@
 package peersim.kademlia.das;
 
 import java.math.BigInteger;
+import peersim.core.Node;
 
 public class Neighbour implements Comparable<Neighbour> {
 
   BigInteger id;
   int last_seen;
+  Node n;
+  boolean isEvil;
 
-  Neighbour(BigInteger id) {
+  Neighbour(BigInteger id, Node n, boolean isEvil) {
     this.id = id;
     this.last_seen = 0;
+    this.n = n;
+    this.isEvil = isEvil;
   }
 
   public void updateLastSeen() {
@@ -21,6 +26,14 @@ public boolean expired() {
     else return false;
   }
 
+  public Node getNode() {
+    return n;
+  }
+
+  public boolean isEvil() {
+    return isEvil;
+  }
+
   @Override
   public int compareTo(Neighbour arg0) {
     if (this.last_seen < arg0.last_seen) return 1;
@@ -30,4 +43,17 @@ else if (this.last_seen == arg0.last_seen) {
       return -1;
     }
   }
+
+  @Override
+  public boolean equals(Object object)
+  {
+      boolean sameSame = false;
+
+      if (object != null && object instanceof Neighbour)
+      {
+          sameSame = this.id.compareTo(((Neighbour) object).id)==0;
+      }
+
+      return sameSame;
+  }
 }

simulator/src/main/java/peersim/kademlia/das/SearchTable.java

@@ -186,6 +186,30 @@ public Neighbour[] getNeighbours() {
     return result.toArray(new Neighbour[0]);
   }
 
+  public int getAllNeighboursCount() {
+    return neighbours.size();
+  }
+
+  public int getAllAliveNeighboursCount() {
+    int count = 0;
+    for (Neighbour neigh : neighbours) {
+      if (neigh.getNode().isUp()) count++;
+    }
+    return count;
+  }
+
+  public int getMaliciousNeighboursCount() {
+    int count = 0;
+    for (Neighbour neigh : neighbours) {
+      if (neigh.isEvil()) count++;
+    }
+    return count;
+  }
+
+  public boolean isNeighbourKnown(Neighbour neighbour){
+    return neighbours.contains(neighbour);
+  }
+
   public void refresh() {
 
     List<Neighbour> toRemove = new ArrayList<>();