Skip to content

M
Mirai
Commit badc792a authored by Him188's avatar Him188 Committed by GitHub
Browse files
Options

Merge pull request #131 from Cyenoch/master 

Addressed an exception that was thrown because InetAddress.getLocalHost().hostAddress might get an ipv6 address
parents 292388a1 b3fa841d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/platformAndroid.kt
View file @ badc792a
......@@ -18,7 +18,7 @@ import kotlinx.io.pool.useInstance
import net.mamoe.mirai.utils.io.ByteArrayPool
import java.io.ByteArrayOutputStream
import java.io.InputStream
import java.net.InetAddress
import java.net.Inet4Address
import java.security.MessageDigest
import java.util.zip.Deflater
import java.util.zip.Inflater
......@@ -81,7 +81,7 @@ actual object MiraiPlatformUtils {
* Localhost 解析
*/
actual fun localIpAddress(): String = runCatching {
InetAddress.getLocalHost().hostAddress
Inet4Address.getLocalHost().hostAddress
}.getOrElse { "192.168.1.123" }
fun md5(stream: InputStream): ByteArray {
......
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/PlatformUtilsJvm.kt
View file @ badc792a
......@@ -19,7 +19,7 @@ import net.mamoe.mirai.utils.io.ByteArrayPool
import java.io.ByteArrayOutputStream
import java.io.InputStream
import java.io.OutputStream
import java.net.InetAddress
import java.net.Inet4Address
import java.security.MessageDigest
import java.util.zip.Deflater
import java.util.zip.Inflater
......@@ -82,7 +82,7 @@ actual object MiraiPlatformUtils {
* Localhost 解析
*/
actual fun localIpAddress(): String = runCatching {
InetAddress.getLocalHost().hostAddress
Inet4Address.getLocalHost().hostAddress
}.getOrElse { "192.168.1.123" }
fun md5(stream: InputStream): ByteArray {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment