routing works. Era change stable.

Author: thsc42

src/net/sharksystem/asap/ASAPPeerFS.java

@@ -30,9 +30,9 @@ public void chunkReceived(String format, String senderE2E, String uri, int era,
                               EncounterConnectionType connectionType) throws IOException {
 
         StringBuilder sb = new StringBuilder();
-        sb.append("\n++++++++++++++++++++++++++++++++++++++++++ chunkReceived ++++++++++++++++++++++++++++++++++++++++\n");
-        sb.append("E2E|P2P: " + senderE2E +  " | " + senderPoint2Point + " | uri: " + uri + " | era: " + era + " | appFormat: " + format + " | ");
-        sb.append("\n+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
+        sb.append("\n++++++++++++++++++++++++++++++++++++++++++ chunkReceived +++++++++++++++++++++++++++++++++++++++++++\n");
+        sb.append("E2E|P2P: " + senderE2E +  " | " + senderPoint2Point + " | uri: " + uri + " | era: " + era + " | appFormat: " + format);
+        sb.append("\n++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
         this.log(sb.toString());
 
         if(this.chunkReceivedListener != null) {

src/net/sharksystem/asap/engine/ASAPEngine.java

@@ -402,9 +402,18 @@ public void handleASAPAssimilate(ASAP_AssimilationPDU_1_0 asapAssimilationPDU, A
 
         // debug break
         //Log.writeLog(this, "!!!!!!!!!!!!!!!!!!!!!!!! ASSIMILATE PDU senderE2E: " + senderE2E);
+        /*
         if(PeerIDHelper.sameID(senderE2E, "Alice_42")) {
             int i = 42;
         }
+         */
+
+        if(PeerIDHelper.sameID(senderE2E, this.owner)) {
+            Log.writeLogErr(this,  "I was offered messages from myself ("
+                    + this.owner + ") by " + encounteredPeer + " - refused: ");
+            asapAssimilationPDU.takeDataFromStream();
+            return;
+        }
 
         //<<<<<<<<<<<<<<<<<<debug
         StringBuilder b = new StringBuilder();
@@ -559,7 +568,8 @@ private boolean hasSufficientCrypto(ASAP_PDU_1_0 pdu) {
         return proceed;
     }
 
-    public void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 protocol, OutputStream os)
+    public void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 protocol,
+               String encounteredPeer, OutputStream os, EncounterConnectionType connectionType)
             throws ASAPException, IOException {
 
         // before we start - lets crypto: TODO can be removed - do it on communication not engine level
@@ -583,9 +593,11 @@ public void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 prot
         /* We have got an interest from another peer.
         First: Let's find what chunks from our peer are be be sent to get in sync. */
         Map<String, Integer> encounterMap = null;
-        Integer lastSeenEra = null;
+//        Integer lastSeenEra = null;
+        Integer lastSeenEra = this.lastSeen.get(senderID);
 
         // has it even provided an encounter list?
+        /* Cannot do this - sent era is their era not ours.
         if(asapInterest.encounterList()) {
             encounterMap = asapInterest.getEncounterMap();
             lastSeenEra = encounterMap.get(this.getOwner());
@@ -598,6 +610,7 @@ public void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 prot
             // no entry in encounter list - local history?
             lastSeenEra = this.lastSeen.get(senderID);
         }
+         */
 
         if(lastSeenEra == null) {
             // still nothing
@@ -654,6 +667,10 @@ public void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 prot
             // iterate: what sender do we know in our side?
             for(CharSequence receivedFromID : this.getSender()) {
                 Log.writeLog(this, "we have messages from " + receivedFromID);
+                if(PeerIDHelper.sameID(encounteredPeer, receivedFromID)) {
+                    // do not send messages back
+                    continue;
+                }
                 try {
                     ASAPStorage receivedMessagesStorage = this.getExistingIncomingStorage(receivedFromID);
 

src/net/sharksystem/asap/engine/ASAPProtocolEngine.java

@@ -14,7 +14,8 @@
  * @author thsc
  */
 public interface ASAPProtocolEngine {
-    void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 protocol, OutputStream os)
+    void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 protocol,
+                            String encounteredPeer, OutputStream os, EncounterConnectionType connectionType)
             throws ASAPException, IOException;
 
     void handleASAPAssimilate(ASAP_AssimilationPDU_1_0 asapAssimilationPDU, ASAP_1_0 protocolModem,

src/net/sharksystem/asap/protocol/ASAPPersistentConnection.java

@@ -387,7 +387,11 @@ public void run() {
                     // TODO add encrypt / sign as parameter..
                     case ASAP_1_0.INTEREST_CMD:
                         Log.writeLog(this, getLogStart() + "ASAPPDUExecutor call handleASAPInterest");
-                        engineSetting.engine.handleASAPInterest((ASAP_Interest_PDU_1_0) asapPDU, protocol, os);
+                        engineSetting.engine.handleASAPInterest(
+                                (ASAP_Interest_PDU_1_0) asapPDU, this.protocol,
+                                this.encounteredPeer,
+                                this.os,
+                                this.connectionType);
                         break;
                     case ASAP_1_0.ASSIMILATE_CMD:
                         Log.writeLog(this, getLogStart() + "ASAPPDUExecutor call handleASAPAssimilate");

test/net/sharksystem/TodoTests.java

@@ -13,8 +13,7 @@
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-        Point2PointTests.class,
-        MultihopTests.class
+        Point2PointTests.class
 })
 public class TodoTests {
 }

test/net/sharksystem/V1TestSuite.java

@@ -14,7 +14,6 @@
 @Suite.SuiteClasses({
         SerializationTests.class,
         BasisMethodsTests.class,
-        //Point2PointTests.class,
         UsageExamples.class,
         CreateNewChannelFromOutsideTest.class,
         PDUTests.class,
@@ -23,6 +22,7 @@
         LongerMessages.class,
         CryptoUsage.class,
         HelperTester.class,
+        MultihopTests.class,
         SharkComponentTests.class
 })
 public class V1TestSuite {

test/net/sharksystem/asap/engine/MultihopTests.java

@@ -24,7 +24,7 @@ public class MultihopTests {
      * @throws ASAPException
      * @throws InterruptedException
      */
-    @Test
+    //@Test // keep it as an example of batch processor based test case
     public void twoHops() throws IOException, ASAPException, InterruptedException {
         CmdLineUI ui = new CmdLineUI(System.out);
 
@@ -141,7 +141,7 @@ public void connectionWithNoDataExchange() throws IOException, ASAPException, In
         ui.doKill("all");
     }
 
-    @Test
+//    @Test
     public void closedChannelTest() throws IOException, ASAPException, InterruptedException {
         CmdLineUI ui = new CmdLineUI(System.out);
         ui.doResetASAPStorages();
@@ -411,7 +411,7 @@ public void asapRoutingIsFiniteAndCheckEra() throws IOException, ASAPException,
         // reset counter on clara side
         claraListener.numberOfMessages = 0;
         System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
-        System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>> Alice meets Clara <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
+        System.out.println(">>>>>>>>>>>>>>>>>>>>>>> Alice meets Clara again <<<<<<<<<<<<<<<<<<<<<<<<<<<<");
         System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
         alicePeer.startEncounter(TestHelper.getPortNumber(), claraPeer);
         // give your app a moment to process