Improved Async SCMP (#1)

* Improved Async SCMP

---------

Co-authored-by: Tilmann Zäschke <[email protected]>

Author: tzaeschke

CHANGELOG.md

@@ -0,0 +1,32 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+
+
+## [Unreleased]
+
+### Added
+- Support `echo` requests in addition to traceroute. 
+  [#1](https://github.com/netsec-ethz/scion-java-multiping/pull/1)
+- Added CHANGELOG
+- EchoResponder
+
+## [0.1.0] - 2024-09-16
+
+### Added
+- Everything
+
+### Changed
+- Nothing
+
+### Fixed
+- Nothing
+
+### Removed
+- Nothing
+
+[Unreleased]: https://github.com/netsec-ethz/scion-java-multiping/compare/v0.1.0...HEAD
+[0.1.0]: https://github.com/netsec-ethz/scion-java-multiping/compare/init_root_commit...v0.1.0

EchoRepeatDestinations-short.csv

@@ -1,8 +1,8 @@
 "64-3303","Swisscom CH"
 "64-13030","Init7 CH"
 "64-2:0:4","Mobile Connections POC (Swisscom SIM cards)"
-"64-2:0:9","ETH Zurich (ETHZ)"
-"64-2:0:4c","AWS PoC Anapaya"
+64-2:0:9,"ETH Zurich (ETHZ)"
+"64-2:0:4c","AWS PoC Anapaya",192.168.0.1
 "65-2:0:58","Mysten Labs"
 "65-2:0:5a","Mysten Labs London"
 "66-2:0:5b","Mysten Labs Japan"

EchoRepeatOutput.csv

@@ -58,6 +58,19 @@ The tool uses a configuration file `EchoRepeatConfig.json` that can contain the
 }
 ```
 
+## Input
+
+The input file is a csv file with ISD/AS, label and IP (optional). The ISD/AS can optionally be enclosed in `"`.
+When an IP is given then the tool will execute an `echo` requerst to the IP, otherwise it will execute a `traceroute` request to the border router of the destination AS. Example:
+
+```
+64-2:0:9,"ETH Zurich (ETHZ)"
+"64-2:0:4c","AWS PoC Anapaya",192.168.0.1
+```
+
+This will result in a traceroute request to th ETH border router of `64-2:0:9` and a echo request
+to `64-2:0:4c,192.168.0.1 `.
+
 ## Execution
 
 To run, the tool requires a configuration file (see above or [here](/EchoRepeatConfig.json)) and an input file
@@ -68,7 +81,7 @@ the [GitHub Releases section](https://github.com/netsec-ethz/scion-java-multipin
 It can be executed
 with:
 
-```dtd
+```
 java -jar scion-multiping-0.1.0-shaded.jar
 ```
 
@@ -82,6 +95,7 @@ Each row consists of:
 * ISD/AS
 * Remote IP (if known)
 * Time stamp
+* Type: can be ECHO or TRACE
 * Result: can be SUCCESS, NO_PATH (no path found to destination), LOCAL_AS (the destination AS
   is the local AS) or ERROR
 * Hop count of the path taken

README.md

@@ -16,7 +16,7 @@
 
         <scion.bnd-maven-plugin.version>6.4.0</scion.bnd-maven-plugin.version>
         <scion.build-helper-maven-plugin.version>3.3.0</scion.build-helper-maven-plugin.version>
-        <scion.fmt-maven.version>2.20</scion.fmt-maven.version>
+        <scion.fmt-maven.version>2.23</scion.fmt-maven.version>
         <scion.maven-clean-plugin.version>3.2.0</scion.maven-clean-plugin.version>
         <scion.maven-compiler-plugin.version>3.11.0</scion.maven-compiler-plugin.version>
         <scion.maven-enforcer-plugin.version>3.3.0</scion.maven-enforcer-plugin.version>
@@ -123,8 +123,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -153,12 +153,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.2.5</version>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.11</version>
+                <version>0.8.12</version>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>
@@ -175,14 +175,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>11</source>
-                    <target>11</target>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -293,7 +285,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-shade-plugin</artifactId>
-                        <version>2.4.3</version>
+                        <version>3.6.0</version>
                         <executions>
                             <execution>
                                 <phase>package</phase>
@@ -302,19 +294,31 @@
                                 </goals>
                                 <configuration>
                                     <shadedArtifactAttached>true</shadedArtifactAttached>
+                                    <shadedClassifierName>executable</shadedClassifierName>
                                     <transformers>
-                                        <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                        <transformer
+                                                implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                                         <transformer implementation=
                                                              "org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                             <mainClass>org.scion.multiping.EchoRepeat</mainClass>
+                                            <manifestEntries>
+                                                <Multi-Release>true</Multi-Release>
+                                            </manifestEntries>
+                                        </transformer>
+                                        <transformer
+                                                implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">
+                                        </transformer>
+                                        <transformer
+                                                implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+                                            <addHeader>false</addHeader>
                                         </transformer>
                                     </transformers>
                                     <filters>
                                         <filter>
                                             <artifact>*:*</artifact>
                                             <excludes>
+                                                <exclude>META-INF/MANIFEST.MF</exclude>
                                                 <exclude>**/module-info.class</exclude>
-                                                <exclude>META-INF/versions/**</exclude>
                                             </excludes>
                                         </filter>
                                     </filters>

pom.xml

@@ -20,10 +20,8 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+
 import org.scion.jpan.*;
 import org.scion.jpan.internal.PathRawParser;
 import org.scion.multiping.util.*;
@@ -92,7 +90,6 @@ public static void main(String[] args) throws IOException {
 
     // Local port must be 30041 for networks that expect a dispatcher
     EchoAll demo = new EchoAll(30041);
-    // List<ParseAssignments.HostEntry> list = ParseAssignments.getList();
     List<ParseAssignments.HostEntry> list = DownloadAssignments.getList();
     for (ParseAssignments.HostEntry e : list) {
       print(ScionUtil.toStringIA(e.getIsdAs()) + " \"" + e.getName() + "\"  ");
@@ -111,8 +108,8 @@ public static void main(String[] args) throws IOException {
     // max:
     Result maxPing =
         results.stream().max((o1, o2) -> (int) (o1.getPingMs() - o2.getPingMs())).get();
-    Result maxHops = results.stream().max((o1, o2) -> o1.getHopCount() - o2.getHopCount()).get();
-    Result maxPaths = results.stream().max((o1, o2) -> o1.getPathCount() - o2.getPathCount()).get();
+    Result maxHops = results.stream().max(Comparator.comparingInt(Result::getHopCount)).get();
+    Result maxPaths = results.stream().max(Comparator.comparingInt(Result::getPathCount)).get();
 
     println("");
     println("Max hops  = " + maxHops.getHopCount() + ":    " + maxHops);
@@ -210,10 +207,9 @@ private Scmp.EchoMessage findShortestEcho(List<Path> paths, Ref<Path> refBest) {
     Path path = PathPolicy.MIN_HOPS.filter(paths);
     refBest.set(path);
     ByteBuffer bb = ByteBuffer.allocate(0);
-    int id = 0;
-    try (ScmpChannel scmpChannel = Scmp.createChannel(localPort)) {
+    try (ScmpSender sender = Scmp.newSenderBuilder().setLocalPort(localPort).build()) {
       nPathTried++;
-      Scmp.EchoMessage msg = scmpChannel.sendEchoRequest(path, id, bb);
+      Scmp.EchoMessage msg = sender.sendEchoRequest(path, bb);
       if (msg == null) {
         println(" -> local AS, no timing available");
         nPathSuccess++;
@@ -238,9 +234,9 @@ 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);
     refBest.set(path);
-    try (ScmpChannel scmpChannel = Scmp.createChannel(localPort)) {
+    try (ScmpSender sender = Scmp.newSenderBuilder().setLocalPort(localPort).build()) {
       nPathTried++;
-      List<Scmp.TracerouteMessage> messages = scmpChannel.sendTracerouteRequest(path);
+      List<Scmp.TracerouteMessage> messages = sender.sendTracerouteRequest(path);
       if (messages.isEmpty()) {
         println(" -> local AS, no timing available");
         nPathSuccess++;
@@ -269,10 +265,10 @@ 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 (ScmpChannel scmpChannel = Scmp.createChannel(localPort)) {
+    try (ScmpSender sender = Scmp.newSenderBuilder().setLocalPort(localPort).build()) {
       for (Path path : paths) {
         nPathTried++;
-        List<Scmp.TracerouteMessage> messages = scmpChannel.sendTracerouteRequest(path);
+        List<Scmp.TracerouteMessage> messages = sender.sendTracerouteRequest(path);
         if (messages.isEmpty()) {
           println(" -> local AS, no timing available");
           nPathSuccess++;