From 27a90021a7fbb3c3f965dd4a8bb99a8b8737a868 Mon Sep 17 00:00:00 2001 From: nathan Date: Sun, 9 Aug 2020 14:44:33 +0200 Subject: [PATCH] Fixed conflict between route.flush(), and namespace-route.flush() --- src/dorkbox/netUtil/NameSpace.kt | 11 +++++++++++ src/dorkbox/netUtil/Route.kt | 8 ++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/dorkbox/netUtil/NameSpace.kt b/src/dorkbox/netUtil/NameSpace.kt index 384f65c..c000b1a 100644 --- a/src/dorkbox/netUtil/NameSpace.kt +++ b/src/dorkbox/netUtil/NameSpace.kt @@ -8,6 +8,17 @@ import java.util.* * */ object NameSpace { + object Route { + fun flush(nameSpace: String) { + if (Common.OS_LINUX) { + run(nameSpace, "/sbin/ip", "route", "flush", "cache") + } + else { + throw RuntimeException("NOT IMPL.") + } + } + } + private val nameSpaceToIifToIp: MutableMap> = HashMap() fun add(nameSpace: String) { diff --git a/src/dorkbox/netUtil/Route.kt b/src/dorkbox/netUtil/Route.kt index 88c5ad1..24670cf 100644 --- a/src/dorkbox/netUtil/Route.kt +++ b/src/dorkbox/netUtil/Route.kt @@ -6,12 +6,8 @@ import dorkbox.executor.Executor * */ object Route { - fun flush(nameSpace: String) { - if (Common.OS_LINUX) { - NameSpace.run(nameSpace, "/sbin/ip route flush cache") - } else { - throw RuntimeException("NOT IMPL.") - } + fun flush() { + Executor.run("/sbin/ip", "route", "flush", "cache") } fun add(targetIpAndCidr: String, hostIP: String, hostInterface: String) {