From ef71d9a38e0395bb7e71475ee02287795ec26b00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tilmann=20Z=C3=A4schke?= Date: Mon, 23 Feb 2026 10:54:01 +0100 Subject: [PATCH 1/2] TR error + cleanup --- CHANGELOG.md | 13 ++++++++----- pom.xml | 2 +- src/main/java/org/scion/multiping/PingAll.java | 5 +++-- src/main/java/org/scion/multiping/PingRepeat.java | 2 +- .../org/scion/multiping/PingRepeatBlocking.java | 2 +- src/main/java/org/scion/multiping/util/Record.java | 2 +- src/main/java/org/scion/multiping/util/Result.java | 2 +- .../org/scion/multiping/util/ResultSummary.java | 2 +- 8 files changed, 17 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d6e7b4..6520d5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,15 +15,18 @@ TODO ### Fixed -- Fixed error handling for additional rounds. Cleanup. - [#32](https://github.com/netsec-ethz/scion-java-multiping/pull/32) - -### Fixed - - Fixed mangled output with mode SHOW_SCMP_ONLY [#31](https://github.com/netsec-ethz/scion-java-multiping/pull/31) - Fixed occurrence of ISD=0 / "AS not listed" [#32](https://github.com/netsec-ethz/scion-java-multiping/pull/32) +- Fixed error handling for additional rounds. Cleanup. + [#33](https://github.com/netsec-ethz/scion-java-multiping/pull/33) + +### Changed + +- Refactored for JPAN 1.6.2 and Use new endhost API. + [#33](https://github.com/netsec-ethz/scion-java-multiping/pull/33) + ## [0.6.1] - 2025-12-12 diff --git a/pom.xml b/pom.xml index 3d0e51a..93fcbb9 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ org.scion jpan - 0.6.1 + 0.6.2-SNAPSHOT diff --git a/src/main/java/org/scion/multiping/PingAll.java b/src/main/java/org/scion/multiping/PingAll.java index 985dbbc..5e293c8 100644 --- a/src/main/java/org/scion/multiping/PingAll.java +++ b/src/main/java/org/scion/multiping/PingAll.java @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; import org.scion.jpan.*; -import org.scion.jpan.internal.PathRawParser; +import org.scion.jpan.internal.header.PathRawParser; import org.scion.jpan.internal.Shim; import org.scion.multiping.util.*; @@ -96,6 +96,7 @@ public static void main(String[] argsArray) throws IOException { localPort = config.getLocalPortOr30041(); Policy policy = parseArgs(argsArray); + System.setProperty(Constants.PROPERTY_BOOTSTRAP_PATH_SERVICE, "192.168.53.19:48080"); System.setProperty(Constants.PROPERTY_SHIM, startShim ? "true" : "false"); // disable SHIM println("Settings:"); @@ -216,7 +217,7 @@ private void runAS(ParseAssignments.HostEntry remote) throws IOException { List messages = sender.sendTracerouteRequest(bestPath.get()); msgs[i] = messages.get(messages.size() - 1); } catch (IOException e) { - msgs[i] = Scmp.TracerouteMessage.createEmpty(bestPath.get()); + msgs[i] = Scmp.TracerouteMessage.createRequest(-1, bestPath.get()); msgs[i].setTimedOut(1_000_000_000); } } diff --git a/src/main/java/org/scion/multiping/PingRepeat.java b/src/main/java/org/scion/multiping/PingRepeat.java index a6a5747..fc52e18 100644 --- a/src/main/java/org/scion/multiping/PingRepeat.java +++ b/src/main/java/org/scion/multiping/PingRepeat.java @@ -26,7 +26,7 @@ import java.util.*; import java.util.concurrent.ConcurrentLinkedQueue; import org.scion.jpan.*; -import org.scion.jpan.internal.PathRawParser; +import org.scion.jpan.internal.header.PathRawParser; import org.scion.jpan.internal.Shim; import org.scion.multiping.util.*; import org.scion.multiping.util.Record; diff --git a/src/main/java/org/scion/multiping/PingRepeatBlocking.java b/src/main/java/org/scion/multiping/PingRepeatBlocking.java index 5aa8bb1..b530062 100644 --- a/src/main/java/org/scion/multiping/PingRepeatBlocking.java +++ b/src/main/java/org/scion/multiping/PingRepeatBlocking.java @@ -25,7 +25,7 @@ import java.util.Comparator; import java.util.List; import org.scion.jpan.*; -import org.scion.jpan.internal.PathRawParser; +import org.scion.jpan.internal.header.PathRawParser; import org.scion.multiping.util.*; import org.scion.multiping.util.Record; diff --git a/src/main/java/org/scion/multiping/util/Record.java b/src/main/java/org/scion/multiping/util/Record.java index 42ca66a..6a1ed39 100644 --- a/src/main/java/org/scion/multiping/util/Record.java +++ b/src/main/java/org/scion/multiping/util/Record.java @@ -23,7 +23,7 @@ import org.scion.jpan.Path; import org.scion.jpan.ScionUtil; import org.scion.jpan.Scmp; -import org.scion.jpan.internal.PathRawParser; +import org.scion.jpan.internal.header.PathRawParser; public class Record { /** diff --git a/src/main/java/org/scion/multiping/util/Result.java b/src/main/java/org/scion/multiping/util/Result.java index 0a548c7..68092fc 100644 --- a/src/main/java/org/scion/multiping/util/Result.java +++ b/src/main/java/org/scion/multiping/util/Result.java @@ -17,7 +17,7 @@ import org.scion.jpan.Path; import org.scion.jpan.ScionUtil; import org.scion.jpan.Scmp; -import org.scion.jpan.internal.PathRawParser; +import org.scion.jpan.internal.header.PathRawParser; public class Result { public enum State { diff --git a/src/main/java/org/scion/multiping/util/ResultSummary.java b/src/main/java/org/scion/multiping/util/ResultSummary.java index 3d3d430..3c5630f 100644 --- a/src/main/java/org/scion/multiping/util/ResultSummary.java +++ b/src/main/java/org/scion/multiping/util/ResultSummary.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; import org.scion.jpan.ScionUtil; import org.scion.jpan.Scmp; -import org.scion.jpan.internal.PathRawParser; +import org.scion.jpan.internal.header.PathRawParser; public class ResultSummary { From 139a92c10ee94025b174aefef7cb39777b115a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tilmann=20Z=C3=A4schke?= Date: Mon, 23 Feb 2026 13:25:53 +0100 Subject: [PATCH 2/2] New endhost API + JPAN refactoring --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6520d5f..97ca234 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,7 @@ TODO ### Changed - Refactored for JPAN 1.6.2 and Use new endhost API. - [#33](https://github.com/netsec-ethz/scion-java-multiping/pull/33) + [#34](https://github.com/netsec-ethz/scion-java-multiping/pull/34) ## [0.6.1] - 2025-12-12