dorkbox
/
NetworkUtils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

code polis for updated lib

This commit is contained in:
nathan 2020-08-11 16:24:36 +02:00
parent 7c6e072739
commit b7dabe6db0
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/dorkbox/netUtil/ping/Ping.kt
View File

@ -26,24 +26,24 @@ class Ping {
.command("ping") .command("ping")
if (Common.OS_WINDOWS) { if (Common.OS_WINDOWS) {
ping.addCommand("-n") ping.addArg("-n")
ping.addCommand("$count") ping.addArg("$count")
} }
else { else {
ping.addCommand("-q") ping.addArg("-q")
ping.addCommand("-c $count") ping.addArg("-c $count")
} }
if (waitTime != null) { if (waitTime != null) {
when { when {
Common.OS_MAC -> { Common.OS_MAC -> {
ping.addCommand("-W " + waitTime.toMillis()) ping.addArg("-W " + waitTime.toMillis())
} }
Common.OS_WINDOWS -> { Common.OS_WINDOWS -> {
ping.addCommand("-w " + waitTime.toMillis()) ping.addArg("-w " + waitTime.toMillis())
} }
else -> { else -> {
ping.addCommand("-W " + waitTime.seconds) ping.addArg("-W " + waitTime.seconds)
} }
} }
} }
@ -51,13 +51,13 @@ class Ping {
if (deadline != null) { if (deadline != null) {
when { when {
Common.OS_MAC -> { Common.OS_MAC -> {
ping.addCommand("-t " + deadline.seconds) ping.addArg("-t " + deadline.seconds)
} }
Common.OS_WINDOWS -> { Common.OS_WINDOWS -> {
logger.info("Deadline is not supported on Windows") logger.info("Deadline is not supported on Windows")
} }
else -> { else -> {
ping.addCommand("-w " + deadline.seconds) ping.addArg("-w " + deadline.seconds)
} }
} }
} }
@ -65,20 +65,20 @@ class Ping {
if (ttl != null) { if (ttl != null) {
when { when {
Common.OS_MAC -> { Common.OS_MAC -> {
ping.addCommand("-m $ttl") ping.addArg("-m $ttl")
} }
Common.OS_WINDOWS -> { Common.OS_WINDOWS -> {
ping.addCommand("-i $ttl") ping.addArg("-i $ttl")
} }
else -> { else -> {
ping.addCommand("-t $ttl") ping.addArg("-t $ttl")
} }
} }
} }
ping.command("ping $host") // ping.command("ping $host")
// wait for it to finish running // wait for it to finish running
val output: String = ping.readOutput().startAsShellBlocking().output.utf8() val output: String = ping.enableRead().startAsShellBlocking().output.utf8()
return PingResultBuilder.fromOutput(output) return PingResultBuilder.fromOutput(output)
} }
} }