0.6.0!!!

Author: Tilmann Zäschke

pom.xml

@@ -83,7 +83,7 @@
         <dependency>
             <groupId>org.scion</groupId>
             <artifactId>jpan</artifactId>
-            <version>0.5.3</version>
+            <version>0.6.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

src/main/java/org/scion/jpan/PathHelper.java

@@ -0,0 +1,42 @@
+// Copyright 2025 ETH Zurich
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.scion.jpan;
+
+import com.google.protobuf.ByteString;
+import org.scion.jpan.proto.daemon.Daemon;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class PathHelper {
+
+  public static List<Path> createPaths(int n) {
+    List<Path> paths = new ArrayList<>();
+    for (int i = 0; i < n; i++) {
+      Daemon.Path.Builder builder = Daemon.Path.newBuilder();
+      builder.setRaw(ByteString.copyFrom(new byte[]{}));
+      try {
+        InetAddress dst = InetAddress.getByAddress(new byte[]{123, 123, 123, 123});
+        paths.add(RequestPath.create(builder.build(), n + 1, dst, 12345));
+      } catch (UnknownHostException e) {
+        throw new ScionRuntimeException("Unable to create test path", e);
+      }
+    }
+    return paths;
+  }
+
+}

src/main/java/org/scion/multiping/PingAll.java

@@ -74,11 +74,14 @@ public class PingAll {
   private int nPathSuccess = 0;
   private int nPathTimeout = 0;
 
-  private static final Set<Long> listedAs = new HashSet<>();
-  private static final Set<Long> seenAs = new HashSet<>();
-  private static final List<Result> results = new ArrayList<>();
+  private final Set<Long> listedAs = new HashSet<>();
+  private final Set<Long> seenAs = new HashSet<>();
+  private final List<Result> results = new ArrayList<>();
 
-  private enum Policy {
+  private final ScmpProvider service;
+  private Policy policy = Policy.FASTEST_TR_ASYNC;
+
+  enum Policy {
     /** Fastest path using SCMP traceroute */
     FASTEST_TR,
     /** Fastest path using SCMP async traceroute */
@@ -90,28 +93,37 @@ private enum Policy {
     SHORTEST_ECHO
   }
 
-  private static final Policy POLICY = Policy.FASTEST_TR_ASYNC;
+  private static Policy DEFAULT_POLICY = Policy.FASTEST_TR_ASYNC;
   private static final boolean SHOW_PATH = false;
 
+  PingAll(Policy policy, ScmpProvider service) {
+    this.policy = policy;
+    this.service = service;
+  }
+
   public static void main(String[] args) throws IOException {
     PRINT = true;
     // System.setProperty(Constants.PROPERTY_DNS_SEARCH_DOMAINS, "ethz.ch.");
     System.setProperty(Constants.PROPERTY_SHIM, STOP_SHIM ? "false" : "true"); // disable SHIM
 
     println("Settings:");
-    println("  Path policy = " + POLICY);
+    println("  Path policy = " + DEFAULT_POLICY);
     println("  ICMP=" + config.tryICMP);
     println("  printOnlyICMP=" + SHOW_ONLY_ICMP);
 
-    PingAll demo = new PingAll();
-    List<ParseAssignments.HostEntry> allASes = DownloadAssignmentsFromWeb.getList();
+    PingAll pingAll = new PingAll(DEFAULT_POLICY, ScmpProvider.defaultProvider(localPort));
+    pingAll.run();
+  }
+
+  void run() throws IOException {
+    List<ParseAssignments.HostEntry> allASes = service.getIsdAsEntries();
     // remove entry for local AS
     long localAS = Scion.defaultService().getLocalIsdAs();
     allASes = allASes.stream().filter(e -> e.getIsdAs() != localAS).collect(Collectors.toList());
     // Process all ASes
     for (ParseAssignments.HostEntry e : allASes) {
       print(ScionUtil.toStringIA(e.getIsdAs()) + " \"" + e.getName() + "\"  ");
-      demo.runDemo(e);
+      runAS(e);
       listedAs.add(e.getIsdAs());
     }
 
@@ -151,26 +163,25 @@ public static void main(String[] args) throws IOException {
 
     println("");
     println("AS Stats:");
-    println(" all        = " + demo.nAsTried);
-    println(" success    = " + demo.nAsSuccess);
-    println(" no path    = " + demo.nAsNoPathFound);
-    println(" timeout    = " + demo.nAsTimeout);
-    println(" error      = " + demo.nAsError);
+    println(" all        = " + nAsTried);
+    println(" success    = " + nAsSuccess);
+    println(" no path    = " + nAsNoPathFound);
+    println(" timeout    = " + nAsTimeout);
+    println(" error      = " + nAsError);
     println(" not listed = " + nSeenButNotListed);
     println("Path Stats:");
-    println(" all        = " + demo.nPathTried);
-    println(" success    = " + demo.nPathSuccess);
-    println(" timeout    = " + demo.nPathTimeout);
+    println(" all        = " + nPathTried);
+    println(" success    = " + nPathSuccess);
+    println(" timeout    = " + nPathTimeout);
     println("ICMP Stats:");
     println(" all        = " + ICMP.nIcmpTried);
     println(" success    = " + ICMP.nIcmpSuccess);
     println(" timeout    = " + ICMP.nIcmpTimeout);
     println(" error      = " + ICMP.nIcmpError);
   }
 
-  private void runDemo(ParseAssignments.HostEntry remote) throws IOException {
+  private void runAS(ParseAssignments.HostEntry remote) throws IOException {
     nAsTried++;
-    ScionService service = Scion.defaultService();
     // Dummy address. The traceroute will contact the control service IP instead.
     InetSocketAddress destinationAddress =
         new InetSocketAddress(InetAddress.getByAddress(new byte[] {0, 0, 0, 0}), 30041);
@@ -191,9 +202,16 @@ private void runDemo(ParseAssignments.HostEntry remote) throws IOException {
       }
       nPaths = paths.size();
       msg[0] = findPaths(paths, bestPath);
-      if (msg[0] != null && REPEAT > 1) {
-        try (ScmpSender sender = Scmp.newSenderBuilder().setLocalPort(localPort).build()) {
+      if (bestPath.get() == null) {
+        nAsTimeout++;
+      }
+      // bestPath is null if all paths have timed out
+      if (msg[0] != null && bestPath.get() != null && REPEAT > 1) {
+        try (ScmpProvider.Sync sender = service.getSync()) {
           for (int i = 1; i < msg.length; i++) {
+            if (bestPath.get() == null) {
+              break;
+            }
             List<Scmp.TracerouteMessage> messages = sender.sendTracerouteRequest(bestPath.get());
             msg[i] = messages.get(messages.size() - 1);
           }
@@ -249,7 +267,7 @@ private void runDemo(ParseAssignments.HostEntry remote) throws IOException {
   }
 
   private Scmp.TimedMessage findPaths(List<Path> paths, Ref<Path> bestOut) {
-    switch (POLICY) {
+    switch (policy) {
       case FASTEST_TR:
         return findFastestTR(paths, bestOut);
       case FASTEST_TR_ASYNC:
@@ -267,7 +285,7 @@ private Scmp.EchoMessage findShortestEcho(List<Path> paths, Ref<Path> refBest) {
     Path path = PathPolicy.MIN_HOPS.filter(paths).get(0);
     refBest.set(path);
     ByteBuffer bb = ByteBuffer.allocate(0);
-    try (ScmpSender sender = Scmp.newSenderBuilder().setLocalPort(localPort).build()) {
+    try (ScmpProvider.Sync sender = service.getSync()) {
       nPathTried++;
       Scmp.EchoMessage msg = sender.sendEchoRequest(path, bb);
       if (msg == null) {
@@ -294,7 +312,7 @@ private Scmp.EchoMessage findShortestEcho(List<Path> paths, Ref<Path> refBest) {
   private Scmp.TracerouteMessage findShortestTR(List<Path> paths, Ref<Path> refBest) {
     Path path = PathPolicy.MIN_HOPS.filter(paths).get(0);
     refBest.set(path);
-    try (ScmpSender sender = Scmp.newSenderBuilder().setLocalPort(localPort).build()) {
+    try (ScmpProvider.Sync sender = service.getSync()) {
       nPathTried++;
       List<Scmp.TracerouteMessage> messages = sender.sendTracerouteRequest(path);
       if (messages.isEmpty()) {
@@ -325,7 +343,7 @@ private Scmp.TracerouteMessage findShortestTR(List<Path> paths, Ref<Path> refBes
 
   private Scmp.TracerouteMessage findFastestTR(List<Path> paths, Ref<Path> refBest) {
     Scmp.TracerouteMessage best = null;
-    try (ScmpSender sender = Scmp.newSenderBuilder().setLocalPort(localPort).build()) {
+    try (ScmpProvider.Sync sender = service.getSync()) {
       for (Path path : paths) {
         nPathTried++;
         List<Scmp.TracerouteMessage> messages = sender.sendTracerouteRequest(path);
@@ -390,8 +408,7 @@ public void onException(Throwable t) {
         };
 
     Scmp.TracerouteMessage best = null;
-    try (ScmpSenderAsync sender =
-        Scmp.newSenderAsyncBuilder(handler).setLocalPort(localPort).build()) {
+    try (ScmpProvider.Async sender = service.getAsync(handler)) {
       for (Path path : paths) {
         nPathTried++;
         int id = sender.sendTracerouteLast(path);
@@ -442,15 +459,15 @@ public void onException(Throwable t) {
     return best;
   }
 
-  private static double avg(Predicate<Result> filter, ToDoubleFunction<Result> mapper) {
+  private double avg(Predicate<Result> filter, ToDoubleFunction<Result> mapper) {
     return results.stream().filter(filter).mapToDouble(mapper).average().orElse(-1);
   }
 
-  private static Result max(Predicate<Result> filter, Comparator<Result> comparator) {
+  private Result max(Predicate<Result> filter, Comparator<Result> comparator) {
     return results.stream().filter(filter).max(comparator).orElseThrow(NoSuchElementException::new);
   }
 
-  private static <T> double median(Predicate<Result> filter, Function<Result, T> mapper) {
+  private <T> double median(Predicate<Result> filter, Function<Result, T> mapper) {
     List<T> list =
         results.stream().filter(filter).map(mapper).sorted().collect(Collectors.toList());
     if (list.isEmpty()) {

src/main/java/org/scion/multiping/util/Result.java

@@ -57,7 +57,7 @@ public Result(ParseAssignments.HostEntry e, Scmp.TimedMessage msg, Path request,
     }
     this.nPaths = nPaths;
     this.path = request;
-    nHops = PathRawParser.create(request.getRawPath()).getHopCount();
+    nHops = request != null ? PathRawParser.create(request.getRawPath()).getHopCount() : -1;
     remoteIP = msg.getPath().getRemoteAddress().getHostAddress();
     if (msg.isTimedOut()) {
       state = State.TIMEOUT;

src/main/java/org/scion/multiping/util/ScmpProvider.java

@@ -0,0 +1,144 @@
+// Copyright 2025 ETH Zurich
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.scion.multiping.util;
+
+import org.scion.jpan.*;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public class ScmpProvider {
+
+  public interface Async extends AutoCloseable {
+    int sendTracerouteLast(Path path) throws IOException;
+
+    void close() throws IOException;
+  }
+
+  public interface Sync extends AutoCloseable {
+    Scmp.EchoMessage sendEchoRequest(Path path, ByteBuffer bb) throws IOException;
+
+    List<Scmp.TracerouteMessage> sendTracerouteRequest(Path path) throws IOException;
+
+    void close() throws IOException;
+  }
+
+  private static class AsyncDefault implements Async {
+    private final ScmpSenderAsync sender;
+        AsyncDefault(ScmpSenderAsync sender) {
+           this.sender = sender;
+    }
+
+      @Override
+      public int sendTracerouteLast(Path path) throws IOException {
+        return sender.sendTracerouteLast(path);
+      }
+
+      @Override
+      public void close() throws IOException {
+        sender.close();
+      }
+  }
+
+  private static class SyncDefault implements Sync {
+    private final ScmpSender sender;
+        SyncDefault(ScmpSender sender) {
+           this.sender = sender;
+    }
+
+      @Override
+      public Scmp.EchoMessage sendEchoRequest(Path path, ByteBuffer bb) throws IOException {
+        return sender.sendEchoRequest(path, bb);
+      }
+
+      @Override
+      public List<Scmp.TracerouteMessage> sendTracerouteRequest(Path path) throws IOException {
+        return sender.sendTracerouteRequest(path);
+      }
+
+      @Override
+      public void close() throws IOException {
+        sender.close();
+      }
+  }
+
+  private final Supplier<Sync> senderSupplier;
+  private final Function<ScmpSenderAsync.ResponseHandler, Async> senderAsyncSupplier;
+  private final Supplier<List<ParseAssignments.HostEntry>> assignmentSupplier;
+  private final Supplier<Long> localIsdAsSupplier;
+  private final BiFunction<Long, InetSocketAddress, List<Path>> localDefaultPathsSupplier;
+
+  public static ScmpProvider defaultProvider(int localPort) {
+    return new ScmpProvider(() -> new SyncDefault(Scmp.newSenderBuilder().setLocalPort(localPort).build()),
+            handler -> new AsyncDefault(Scmp.newSenderAsyncBuilder(handler).setLocalPort(localPort).build()),
+            DownloadAssignmentsFromWeb::getList,
+            ()->Scion.defaultService().getLocalIsdAs(),
+            (isdAs, address) -> Scion.defaultService().getPaths(isdAs, address)
+            );
+  }
+
+  public static ScmpProvider createAsync(
+          Function<ScmpSenderAsync.ResponseHandler, Async> senderAsyncSupplier,
+          Supplier<List<ParseAssignments.HostEntry>> assignmentSupplier,
+          Supplier<Long> localIsdAs,
+          BiFunction<Long, InetSocketAddress, List<Path>> paths) {
+    return new ScmpProvider(null, senderAsyncSupplier, assignmentSupplier, localIsdAs, paths);
+  }
+
+  public static ScmpProvider createSync(Supplier<Sync> senderSupplier,
+                                        Supplier<List<ParseAssignments.HostEntry>> assignmentSupplier,
+                                        Supplier<Long> localIsdAsSupplier,
+                                        BiFunction<Long, InetSocketAddress, List<Path>> localDefaultPathsSupplier) {
+    return new ScmpProvider(senderSupplier, null, assignmentSupplier, localIsdAsSupplier, localDefaultPathsSupplier);
+  }
+
+  private ScmpProvider(Supplier<Sync> senderSupplier,
+                       Function<ScmpSenderAsync.ResponseHandler, Async> senderAsyncSupplier,
+                       Supplier<List<ParseAssignments.HostEntry>> assignmentSupplier,
+                       Supplier<Long> localIsdAsSupplier,
+                       BiFunction<Long, InetSocketAddress, List<Path>> localDefaultPathsSupplier) {
+    this.assignmentSupplier = assignmentSupplier;
+    this.senderSupplier = senderSupplier;
+    this.senderAsyncSupplier = senderAsyncSupplier;
+    this.localIsdAsSupplier = localIsdAsSupplier;
+    this.localDefaultPathsSupplier = localDefaultPathsSupplier;
+  }
+
+  public List<ParseAssignments.HostEntry> getIsdAsEntries() {
+    return assignmentSupplier.get();
+  }
+
+  public Async getAsync(ScmpSenderAsync.ResponseHandler handler) {
+    return senderAsyncSupplier.apply(handler);
+  }
+
+  public Sync getSync() {
+    return senderSupplier.get();
+  }
+
+  public List<Path> getPaths(long isdAs, InetSocketAddress destinationAddress) {
+    return localDefaultPathsSupplier.apply(isdAs, destinationAddress);
+  }
+
+  public long getLocalIsdAs() {
+    return localIsdAsSupplier.get();
+  }
+
+}