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

Removed experimental stuff

This commit is contained in:
nathan 2020-08-08 22:26:49 +02:00
parent 44f4ac1aa1
commit 63dc7ee987
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,6 +136,7 @@ object IPv4 {
return false return false
} }
@Suppress("NAME_SHADOWING")
var from = from var from = from
var i = ip.indexOf('.', from) var i = ip.indexOf('.', from)
@ -165,7 +166,7 @@ object IPv4 {
private fun isValidIpV4Word(word: CharSequence, from: Int, toExclusive: Int): Boolean { private fun isValidIpV4Word(word: CharSequence, from: Int, toExclusive: Int): Boolean {
val len = toExclusive - from val len = toExclusive - from
var c0 = ' ' var c0 = ' '
var c1 = ' ' var c1: Char
var c2 = ' ' var c2 = ' '
if (len < 1 || len > 3 || word[from].also { c0 = it } < '0') { if (len < 1 || len > 3 || word[from].also { c0 = it } < '0') {
@ -193,7 +194,7 @@ object IPv4 {
return null return null
} }
var i = 0 var i: Int
return byteArrayOf( return byteArrayOf(
ipv4WordToByte(ip, 0, ip.indexOf('.', 1).also { i = it }), 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 }),
@ -203,7 +204,7 @@ object IPv4 {
} }
fun toBytes(ip: String): ByteArray { fun toBytes(ip: String): ByteArray {
var i = 0 var i: Int
return byteArrayOf( return byteArrayOf(
ipv4WordToByte(ip, 0, ip.indexOf('.', 1).also { i = it }), 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 }),
@ -591,13 +592,13 @@ object IPv4 {
fun toString(ipBytes: ByteArray): String { fun toString(ipBytes: ByteArray): String {
val buf = StringBuilder(15) val buf = StringBuilder(15)
buf.append(ipBytes[0].toUByte()) buf.append(ipBytes[0].toInt() and 0xFF)
buf.append('.') buf.append('.')
buf.append(ipBytes[1].toUByte()) buf.append(ipBytes[1].toInt() and 0xFF)
buf.append('.') buf.append('.')
buf.append(ipBytes[2].toUByte()) buf.append(ipBytes[2].toInt() and 0xFF)
buf.append('.') buf.append('.')
buf.append(ipBytes[3].toUByte()) buf.append(ipBytes[3].toInt() and 0xFF)
return buf.toString() return buf.toString()
} }