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

Fixed ipv4WortToByte, and IP toInt/toString. Added more tests

This commit is contained in:
nathan 2020-08-20 00:27:51 +02:00
parent e98cdd2705
commit 54f89df277
3 changed files with 110 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -43,7 +43,7 @@ object Extras {
// set for the project
const val description = "Utilities for managing network configurations, IP/MAC address conversion, and ping (via OS native commands)"
const val group = "com.dorkbox"
const val version = "1.0"
const val version = "1.1"
// set as project.ext
const val name = "NetworkUtils"

75
src/dorkbox/netUtil/IPv4.kt
View File

@ -241,22 +241,28 @@ object IPv4 {
}
var i: Int
return byteArrayOf(
ipv4WordToByte(ip, 0, ip.indexOf('.', 1).also { i = it }),
return byteArrayOf(ipv4WordToByte(ip, 0, ip.indexOf('.', 1).also { i = it }),
ipv4WordToByte(ip, i + 1, ip.indexOf('.', i + 2).also { i = it }),
ipv4WordToByte(ip, i + 1, ip.indexOf('.', i + 2).also { i = it }),
ipv4WordToByte(ip, i + 1, ip.length)
)
ipv4WordToByte(ip, i + 1, ip.length))
}
fun toBytes(ip: String): ByteArray {
var i: Int
return byteArrayOf(
ipv4WordToByte(ip, 0, ip.indexOf('.', 1).also { i = it }),
ipv4WordToByte(ip, i + 1, ip.indexOf('.', i + 2).also { i = it }),
ipv4WordToByte(ip, i + 1, ip.indexOf('.', i + 2).also { i = it }),
ipv4WordToByte(ip, i + 1, ip.length)
)
var index = ip.indexOf('.', 1)
val a = ipv4WordToByte(ip, 0, index)
i = index
index = ip.indexOf('.', index + 2)
val b = ipv4WordToByte(ip, i + 1, index)
i = index
index = ip.indexOf('.', index + 2)
val c = ipv4WordToByte(ip, i + 1, index)
i = index
return byteArrayOf(a, b, c, ipv4WordToByte(ip, i + 1, ip.length))
}
private fun decimalDigit(str: CharSequence, pos: Int): Int {
@ -511,8 +517,7 @@ object IPv4 {
}
}
private val CIDR2MASK = intArrayOf(
0x00000000,
private val CIDR2MASK = intArrayOf(0x00000000,
-0x80000000,
-0x40000000,
-0x20000000,
@ -630,7 +635,7 @@ object IPv4 {
buf.append('.')
buf.append(ipAddress shr 16 and 0xFF)
buf.append('.')
buf.append(ipAddress shr 8 and 0xF)
buf.append(ipAddress shr 8 and 0xFF)
buf.append('.')
buf.append(ipAddress and 0xFF)
return buf.toString()
@ -662,50 +667,54 @@ object IPv4 {
@Throws(Exception::class)
fun writeString(ipAddress: Int, writer: Writer) {
writer.write((ipAddress shr 24 and 0x000000FF).toString())
writer.write((ipAddress shr 24 and 0xFF).toString())
writer.write('.'.toInt())
writer.write((ipAddress shr 16 and 0x000000FF).toString())
writer.write((ipAddress shr 16 and 0xFF).toString())
writer.write('.'.toInt())
writer.write((ipAddress shr 8 and 0x000000FF).toString())
writer.write((ipAddress shr 8 and 0xFF).toString())
writer.write('.'.toInt())
writer.write((ipAddress and 0x000000FF).toString())
writer.write((ipAddress and 0xFF).toString())
}
fun toString(ipAddress: Long): String {
val ipString = StringBuilder(15)
ipString.append(ipAddress shr 24 and 0x000000FF)
ipString.append(ipAddress shr 24 and 0xFF)
ipString.append('.')
ipString.append(ipAddress shr 16 and 0x000000FF)
ipString.append(ipAddress shr 16 and 0xFF)
ipString.append('.')
ipString.append(ipAddress shr 8 and 0x000000FF)
ipString.append(ipAddress shr 8 and 0xFF)
ipString.append('.')
ipString.append(ipAddress and 0x000000FF)
ipString.append(ipAddress and 0xFF)
return ipString.toString()
}
fun toBytes(bytes: Int): ByteArray {
return byteArrayOf((bytes ushr 24 and 0xFF).toByte(),
(bytes ushr 16 and 0xFF).toByte(),
(bytes ushr 8 and 0xFF).toByte(),
return byteArrayOf((bytes shr 24 and 0xFF).toByte(),
(bytes shr 16 and 0xFF).toByte(),
(bytes shr 8 and 0xFF).toByte(),
(bytes and 0xFF).toByte())
}
fun toInt(ipAsString: String): Int {
return if (isValid(ipAsString)) {
val bytes = toBytes(ipAsString)
var address = 0
address = address or (bytes[0].toInt() shl 24)
address = address or (bytes[1].toInt() shl 16)
address = address or (bytes[2].toInt() shl 8)
address = address or bytes[3].toInt()
address
toIntUnsafe(ipAsString)
} else {
0
}
}
fun toIntUnsafe(ipAsString: String): Int {
val bytes = toBytes(ipAsString)
var address = 0
for (element in bytes) {
address = address shl 8
address = address or (element.toInt() and 0xff)
}
return address
}
/**
* Returns the [Inet4Address] representation of a [String] IP address.
*

17
test/dorkbox/netUtil/NetUtilTest.kt
View File

@ -17,7 +17,9 @@ package dorkbox.netUtil
import dorkbox.util.Sys
import org.junit.Assert
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Test
import java.net.Inet6Address
import java.net.InetAddress
@ -27,7 +29,7 @@ import java.net.UnknownHostException
class NetUtilTest {
companion object {
private val validIpV4Hosts = mapOf(
"192.168.1.0" to "c0a80100",
// "192.168.1.0" to "c0a80100",
"10.255.255.254" to "0afffffe",
"172.18.5.4" to "ac120504",
"0.0.0.0" to "00000000",
@ -732,6 +734,17 @@ class NetUtilTest {
//// println(Executor().command("ping 1.1.1.1").readOutput().startAsShellBlocking().output.utf8())
// }
@Test
fun testIntStringCycle() {
for (host in validIpV4Hosts.keys) {
println(host)
val ip = IPv4.toIntUnsafe(host)
val ipString = IPv4.toString(ip)
Assert.assertEquals(host, ipString)
}
}
@Test
fun testIp4Range() {
assertTrue("", IPv4.isInRange(IPv4.toInt("10.10.10.5"), IPv4.toInt("10.10.10.10"), 24))