Compare commits

...

2 Commits

Author SHA1 Message Date
Colbster937
a6fb5e379c remove build files 2026-01-11 00:02:54 -06:00
Colbster937
2699ceaeff fix ipv6 bug 2026-01-11 00:02:23 -06:00
2 changed files with 34 additions and 16 deletions

1
.gitignore vendored
View File

@@ -2,6 +2,7 @@
/.vscode/ /.vscode/
/gradle/ /gradle/
/build/ /build/
/bin/
/run/ /run/
/gradlew /gradlew
/gradlew.bat /gradlew.bat

View File

@@ -78,25 +78,42 @@ public final class OPlayer {
} }
private static final String formatIPAddress(String addr) { private static final String formatIPAddress(String addr) {
if (addr.startsWith("/")) { if (addr == null) {
addr = addr.substring(1); addr = OriginBlacklist.UNKNOWN_STR;
} } else {
if (addr.startsWith("/")) {
addr = addr.substring(1);
}
int i = addr.lastIndexOf('/'); int i = addr.lastIndexOf('/');
if (i != -1) { if (i != -1) {
addr = addr.substring(i + 1); addr = addr.substring(i + 1);
} }
if (addr.startsWith("[")) { if (addr.startsWith("[")) {
i = addr.indexOf(']'); i = addr.indexOf(']');
if (i != -1) if (i != -1) {
return addr.substring(1, i); addr = addr.substring(1, i);
return addr.substring(1); } else {
} addr = addr.substring(1);
}
} else {
i = addr.lastIndexOf(':');
if (i != -1) {
String a = addr.substring(0, i);
String p = addr.substring(i + 1);
i = addr.lastIndexOf(':'); boolean port = !p.isEmpty();
if (i != -1) { for (int j = 0; j < p.length() && port; j++) {
addr = addr.substring(0, i); char c = p.charAt(j);
port = (c >= '0' && c <= '9');
}
if (port && a.indexOf('.') != -1) {
addr = a;
}
}
}
} }
return addr; return addr;