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

Cleaned up inet address formats

Browse Source
This commit is contained in:
Robinson 2022-08-18 12:38:44 +02:00
parent 9af89ebd0c
commit f384638b44
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/dorkbox/network/Client.kt
View File

@ -284,7 +284,7 @@ open class Client<CONNECTION : Connection>(
fun ipv4Connect() { fun ipv4Connect() {
// we have to check first if it's a valid IPv4 address. If not, maybe it's a DNS lookup // we have to check first if it's a valid IPv4 address. If not, maybe it's a DNS lookup
val inet4Address = if (IPv4.isValid(remoteAddress)) { val inetAddress = if (IPv4.isValid(remoteAddress)) {
Inet4.toAddress(remoteAddress) Inet4.toAddress(remoteAddress)
} else { } else {
val client = DnsClient() val client = DnsClient()
@ -294,12 +294,12 @@ open class Client<CONNECTION : Connection>(
records?.get(0) records?.get(0)
} }
if (inet4Address == null) { if (inetAddress == null) {
throw IllegalArgumentException("The remote address '$remoteAddress' cannot be found.") throw IllegalArgumentException("The remote address '$remoteAddress' cannot be found.")
} }
connect(remoteAddress = inet4Address, connect(remoteAddress = inetAddress,
remoteAddressString = formatCommonAddressString(remoteAddress, true), remoteAddressString = formatCommonAddressString(IP.toString(inetAddress), inetAddress is Inet4Address),
connectionTimeoutSec = connectionTimeoutSec, connectionTimeoutSec = connectionTimeoutSec,
reliable = reliable) reliable = reliable)
} }
@ -321,7 +321,7 @@ open class Client<CONNECTION : Connection>(
} }
connect(remoteAddress = inetAddress, connect(remoteAddress = inetAddress,
remoteAddressString = formatCommonAddressString(remoteAddress, inetAddress is Inet4Address), remoteAddressString = formatCommonAddressString(IP.toString(inetAddress), inetAddress is Inet4Address),
connectionTimeoutSec = connectionTimeoutSec, connectionTimeoutSec = connectionTimeoutSec,
reliable = reliable reliable = reliable
) )
@ -329,7 +329,7 @@ open class Client<CONNECTION : Connection>(
fun ipv6Connect() { fun ipv6Connect() {
// we have to check first if it's a valid IPv6 address. If not, maybe it's a DNS lookup // we have to check first if it's a valid IPv6 address. If not, maybe it's a DNS lookup
val inet6Address = if (IPv6.isValid(remoteAddress)) { val inetAddress = if (IPv6.isValid(remoteAddress)) {
Inet6.toAddress(remoteAddress) Inet6.toAddress(remoteAddress)
} else { } else {
val client = DnsClient() val client = DnsClient()
@ -339,29 +339,29 @@ open class Client<CONNECTION : Connection>(
records?.get(0) records?.get(0)
} }
if (inet6Address == null) { if (inetAddress == null) {
throw IllegalArgumentException("The remote address '$remoteAddress' cannot be found.") throw IllegalArgumentException("The remote address '$remoteAddress' cannot be found.")
} }
when (inet6Address) { when (inetAddress) {
IPv4.LOCALHOST -> { IPv4.LOCALHOST -> {
connect(remoteAddress = IPv6.LOCALHOST, connect(remoteAddress = IPv6.LOCALHOST,
remoteAddressString = IPv6.toString(IPv6.LOCALHOST), remoteAddressString = formatCommonAddressString(IPv6.toString(IPv6.LOCALHOST), true),
connectionTimeoutSec = connectionTimeoutSec, connectionTimeoutSec = connectionTimeoutSec,
reliable = reliable) reliable = reliable)
} }
is Inet4Address -> { is Inet4Address -> {
// we can map the IPv4 address to an IPv6 address. // we can map the IPv4 address to an IPv6 address.
val address = IPv6.toAddress(IPv4.toString(inet6Address), true)!! val address = IPv6.toAddress(IPv4.toString(inetAddress), true)!!
connect(remoteAddress = address, connect(remoteAddress = address,
remoteAddressString = IPv6.toString(address), remoteAddressString = formatCommonAddressString(IPv6.toString(address), true),
connectionTimeoutSec = connectionTimeoutSec, connectionTimeoutSec = connectionTimeoutSec,
reliable = reliable) reliable = reliable)
} }
else -> { else -> {
connect(remoteAddress = inet6Address, connect(remoteAddress = inetAddress,
remoteAddressString = formatCommonAddressString(remoteAddress, false), remoteAddressString = formatCommonAddressString(remoteAddress, inetAddress is Inet6Address),
connectionTimeoutSec = connectionTimeoutSec, connectionTimeoutSec = connectionTimeoutSec,
reliable = reliable) reliable = reliable)
} }