From 887729faf8876fe42ef14dac6dae946c65ba90cf Mon Sep 17 00:00:00 2001 From: nathan Date: Tue, 18 Aug 2020 22:33:40 +0200 Subject: [PATCH] WIP ping --- src/dorkbox/netUtil/ping/PingResultBuilder.kt | 2 +- src/dorkbox/netUtil/ping/ResultParser.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dorkbox/netUtil/ping/PingResultBuilder.kt b/src/dorkbox/netUtil/ping/PingResultBuilder.kt index eb51e42..5b53a12 100644 --- a/src/dorkbox/netUtil/ping/PingResultBuilder.kt +++ b/src/dorkbox/netUtil/ping/PingResultBuilder.kt @@ -80,7 +80,7 @@ internal object PingResultBuilder { val host: String = matcher.group(2) val icmpSeq: Int = matcher.group(3).toInt() val ttl: Int = matcher.group(4).toInt() - val time = Duration.ofNanos((1000 * 1000 * matcher.group(5).toDouble()) as Long) + val time = Duration.ofNanos(1000 * 1000 * matcher.group(5).toLong()) val response = PingResult.Response(bytes, host, icmpSeq, ttl, time) result.responses.add(response) diff --git a/src/dorkbox/netUtil/ping/ResultParser.kt b/src/dorkbox/netUtil/ping/ResultParser.kt index 76b7d74..cd4fdba 100644 --- a/src/dorkbox/netUtil/ping/ResultParser.kt +++ b/src/dorkbox/netUtil/ping/ResultParser.kt @@ -5,13 +5,13 @@ import java.util.regex.Pattern class ResultParser(private val pattern: Pattern, private val reader: (PingResult, Matcher) -> PingResult) { fun fill(result: PingResult, output: String): PingResult { - var result = result + var r = result val matcher = pattern.matcher(output) while (matcher.find()) { - result = reader(result, matcher) + r = reader(r, matcher) } - return result + return r } companion object {