Removed dependency
This commit is contained in:
parent
80e95c3097
commit
6b331051a4
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
package dorkbox.netUtil
|
package dorkbox.netUtil
|
||||||
|
|
||||||
import mu.KotlinLogging
|
import org.slf4j.LoggerFactory
|
||||||
import java.net.InetAddress
|
import java.net.InetAddress
|
||||||
import java.net.InetSocketAddress
|
import java.net.InetSocketAddress
|
||||||
import java.security.AccessController
|
import java.security.AccessController
|
||||||
|
@ -52,7 +52,7 @@ internal object Common {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
internal val logger = KotlinLogging.logger("NetworkUtils")
|
internal val logger = LoggerFactory.getLogger("NetworkUtils")
|
||||||
|
|
||||||
fun getBoolean(property: String, defaultValue: Boolean): Boolean {
|
fun getBoolean(property: String, defaultValue: Boolean): Boolean {
|
||||||
var value: String = System.getProperty(property, defaultValue.toString()) ?: return defaultValue
|
var value: String = System.getProperty(property, defaultValue.toString()) ?: return defaultValue
|
||||||
|
|
|
@ -34,12 +34,8 @@ object IP {
|
||||||
val LOOPBACK_IF: NetworkInterface
|
val LOOPBACK_IF: NetworkInterface
|
||||||
|
|
||||||
init {
|
init {
|
||||||
logger.trace {
|
logger.trace("-Djava.net.preferIPv4Stack: ${IPv4.isPreferred}")
|
||||||
"-Djava.net.preferIPv4Stack: ${IPv4.isPreferred}"
|
logger.trace("-Djava.net.preferIPv6Addresses: ${IPv6.isPreferred}")
|
||||||
}
|
|
||||||
logger.trace {
|
|
||||||
"-Djava.net.preferIPv6Addresses: ${IPv6.isPreferred}"
|
|
||||||
}
|
|
||||||
|
|
||||||
// Retrieve the list of available network interfaces.
|
// Retrieve the list of available network interfaces.
|
||||||
val netInterfaces = mutableListOf<NetworkInterface>()
|
val netInterfaces = mutableListOf<NetworkInterface>()
|
||||||
|
@ -103,18 +99,14 @@ object IP {
|
||||||
|
|
||||||
if (loopbackIface != null) {
|
if (loopbackIface != null) {
|
||||||
// Found the loopback interface with an INET address.
|
// Found the loopback interface with an INET address.
|
||||||
logger.trace {
|
logger.trace("Loopback interface: ${loopbackIface.name} (${loopbackIface.displayName}, ${loopbackAddr!!.hostAddress})")
|
||||||
"Loopback interface: ${loopbackIface.name} (${loopbackIface.displayName}, ${loopbackAddr!!.hostAddress})"
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
// Could not find the loopback interface, but we can't leave LOCALHOST as null.
|
// Could not find the loopback interface, but we can't leave LOCALHOST as null.
|
||||||
// Use LOCALHOST6 or LOCALHOST4, preferably the IPv6 one.
|
// Use LOCALHOST6 or LOCALHOST4, preferably the IPv6 one.
|
||||||
if (loopbackAddr == null) {
|
if (loopbackAddr == null) {
|
||||||
try {
|
try {
|
||||||
if (NetworkInterface.getByInetAddress(IPv6.LOCALHOST) != null) {
|
if (NetworkInterface.getByInetAddress(IPv6.LOCALHOST) != null) {
|
||||||
logger.debug {
|
logger.debug("Using hard-coded IPv6 localhost address: ${IPv6.LOCALHOST}")
|
||||||
"Using hard-coded IPv6 localhost address: ${IPv6.LOCALHOST}"
|
|
||||||
}
|
|
||||||
|
|
||||||
loopbackAddr = IPv6.LOCALHOST
|
loopbackAddr = IPv6.LOCALHOST
|
||||||
}
|
}
|
||||||
|
@ -122,16 +114,14 @@ object IP {
|
||||||
|
|
||||||
}
|
}
|
||||||
if (loopbackAddr == null) {
|
if (loopbackAddr == null) {
|
||||||
logger.debug {
|
logger.debug("Using hard-coded IPv4 localhost address: ${IPv4.LOCALHOST}")
|
||||||
"Using hard-coded IPv4 localhost address: ${IPv4.LOCALHOST}"
|
|
||||||
}
|
|
||||||
loopbackAddr = IPv4.LOCALHOST
|
loopbackAddr = IPv4.LOCALHOST
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
LOOPBACK_IF = loopbackIface!!
|
LOOPBACK_IF = loopbackIface!!
|
||||||
LOCALHOST = loopbackAddr!!
|
LOCALHOST = loopbackAddr
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
package dorkbox.netUtil
|
package dorkbox.netUtil
|
||||||
|
|
||||||
import dorkbox.executor.Executor
|
import dorkbox.executor.Executor
|
||||||
import mu.KLogger
|
import org.slf4j.Logger
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.Writer
|
import java.io.Writer
|
||||||
import java.math.BigInteger
|
import java.math.BigInteger
|
||||||
|
@ -44,7 +44,7 @@ object Mac {
|
||||||
synchronized(fakeMacsInUse) {}
|
synchronized(fakeMacsInUse) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getMacAddress(ip: String, logger: KLogger? = null): String {
|
fun getMacAddress(ip: String, logger: Logger? = null): String {
|
||||||
try {
|
try {
|
||||||
val mac = getMacAddressByte(ip, logger)
|
val mac = getMacAddressByte(ip, logger)
|
||||||
if (mac == null) {
|
if (mac == null) {
|
||||||
|
@ -74,7 +74,7 @@ object Mac {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getMacAddressByte(ip: String, logger: KLogger? = null): ByteArray? {
|
fun getMacAddressByte(ip: String, logger: Logger? = null): ByteArray? {
|
||||||
try {
|
try {
|
||||||
val addr = InetAddress.getByName(ip)
|
val addr = InetAddress.getByName(ip)
|
||||||
val networkInterface = NetworkInterface.getByInetAddress(addr)
|
val networkInterface = NetworkInterface.getByInetAddress(addr)
|
||||||
|
|
Loading…
Reference in New Issue