From 23dc68c4293652853ae9444507512aec9c66f82f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tilmann=20Z=C3=A4schke?= Date: Tue, 10 Dec 2024 18:03:52 +0100 Subject: [PATCH] PingAll output --- CHANGELOG.md | 3 ++- src/main/java/org/scion/multiping/PingAll.java | 11 ++++++++--- src/main/java/org/scion/multiping/util/Util.java | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1473bef..45df90c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added - REPEAT setting in PingAll + some output cleanup - [#9](https://github.com/netsec-ethz/scion-java-multiping/pull/9) + [#9](https://github.com/netsec-ethz/scion-java-multiping/pull/9), + [#10](https://github.com/netsec-ethz/scion-java-multiping/pull/10) ### Changed diff --git a/src/main/java/org/scion/multiping/PingAll.java b/src/main/java/org/scion/multiping/PingAll.java index 8e8fc24..96d62ac 100644 --- a/src/main/java/org/scion/multiping/PingAll.java +++ b/src/main/java/org/scion/multiping/PingAll.java @@ -44,11 +44,11 @@ */ public class PingAll { private static final int REPEAT = 3; - private static final boolean SHOW_ONLY_ICMP = !true; + private static final boolean SHOW_ONLY_ICMP = false; private static final Config config = new Config(); static { - config.tryICMP = !false; + config.tryICMP = false; if (SHOW_ONLY_ICMP) { DELAYED_PRINT = true; } @@ -79,13 +79,18 @@ private enum Policy { SHORTEST_ECHO } - private static final Policy POLICY = Policy.FASTEST_TR; // SHORTEST_TR; + private static final Policy POLICY = Policy.SHORTEST_TR; // SHORTEST_TR; private static final boolean SHOW_PATH = !true; public static void main(String[] args) throws IOException { PRINT = true; // System.setProperty(Constants.PROPERTY_DNS_SEARCH_DOMAINS, "ethz.ch."); + println("Settings:"); + println(" Path policy = " + POLICY); + println(" ICMP=" + config.tryICMP); + println(" printOnlyICMP=" + SHOW_ONLY_ICMP); + PingAll demo = new PingAll(); List list = DownloadAssignmentsFromWeb.getList(); for (ParseAssignments.HostEntry e : list) { diff --git a/src/main/java/org/scion/multiping/util/Util.java b/src/main/java/org/scion/multiping/util/Util.java index b362218..eecdf0a 100644 --- a/src/main/java/org/scion/multiping/util/Util.java +++ b/src/main/java/org/scion/multiping/util/Util.java @@ -41,6 +41,7 @@ public static void print(String msg) { public static void println(String msg) { print(msg); + println(); } public static void println() {