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

Comment polish

connection_type_change
Robinson 2021-04-29 01:20:09 +02:00
parent 6fb1b23d01
commit d77f6ee353
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -816,8 +816,9 @@ object IPv4 {
* This method will treat all IPv4 type addresses as "IPv4 mapped" (see [.getByName])
*
* @param ip [String] IP address to be converted to a [Inet4Address]
* @return [Inet4Address] representation of the `ip` or `null` if not a valid IP address.
* @return [Inet4Address] representation of the `ip` or an exception if not a valid IP address.
*/
@Throws(UnknownHostException::class)
fun toAddressUnsafe(ip: String): Inet4Address {
val asBytes = toBytes(ip)
return Inet4Address.getByAddress(null, asBytes) as Inet4Address

5
src/dorkbox/netUtil/IPv6.kt
View File

@ -310,7 +310,7 @@ object IPv6 {
* </ul>
* @return [Inet6Address] representation of the [ip] or [null] if not a valid IP address.
*/
fun toAddress(ip: String, ipv4Mapped: Boolean): Inet6Address? {
fun toAddress(ip: String, ipv4Mapped: Boolean = true): Inet6Address? {
val bytes = getIPv6ByName(ip, ipv4Mapped) ?: return null
return try {
Inet6Address.getByAddress(null, bytes, -1)
@ -328,13 +328,12 @@ object IPv6 {
* defined in [rfc 4291 section 2](http://tools.ietf.org/html/rfc4291#section-2.5.5) is supported.
* @param ip [CharSequence] IP address to be converted to a [Inet6Address]
* @param ipv4Mapped
*
* * `true` To allow IPv4 mapped inputs to be translated into [Inet6Address]
* * `false` Consider IPv4 mapped addresses as invalid.
*
* @return byte array representation of the `ip` or `null` if not a valid IP address.
*/
private fun getIPv6ByName(ip: CharSequence, ipv4Mapped: Boolean): ByteArray? {
private fun getIPv6ByName(ip: CharSequence, ipv4Mapped: Boolean = true): ByteArray? {
val bytes = ByteArray(IPV6_BYTE_COUNT)
val ipLength = ip.length
var compressBegin = 0