moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2026-02-16 10:31:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash with IPv4-mapped IPv6 addresses

Browse Source
This commit is contained in:
Cameron Gutman
2023-02-20 23:31:53 -06:00
parent 292ed35555
commit d36b73fc1b
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/limelight/nvstream/http/NvHTTP.java
View File

@@ -8,6 +8,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringReader;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.Proxy;
import java.net.Socket;
@@ -209,9 +210,21 @@ public class NvHTTP {
this.httpsPort = httpsPort;
try {
// If this is an IPv4-mapped IPv6 address, OkHTTP will choke on it if it's
// in IPv6 form, because InetAddress.getByName() will return an Inet4Address
// for what OkHTTP thinks is an IPv6 address. Normalize it into IPv4 form
// to avoid triggering this bug.
String addressString = address.address;
if (addressString.contains(":") && addressString.contains(".")) {
InetAddress addr = InetAddress.getByName(addressString);
if (addr instanceof Inet4Address) {
addressString = ((Inet4Address)addr).getHostAddress();
}
}
this.baseUrlHttp = new HttpUrl.Builder()
.scheme("http")
.host(address.address)
.host(addressString)
.port(address.port)
.build();
} catch (IllegalArgumentException e) {