thedevstack/PiratX-Archive
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix resolving IP if SRV violences RFC2782

Browse source
This commit is contained in:
Christian Schneppe 2020-04-07 20:54:54 +02:00
parent fdfaae6f59
commit a7fd6b31e2
No known key found for this signature in database
GPG key ID: F30B8D686B44D87E
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/de/pixart/messenger/utils/Resolver.java
View file

@ -203,7 +203,7 @@ public class Resolver {
threads.add(new Thread(() -> {
final List<Result> ipv4s = resolveIp(record, A.class, result.isAuthenticData(), directTls);
if (ipv4s.size() == 0) {
Result resolverResult = Result.fromRecord(record, directTls);
Result resolverResult = Result.fromRecord(record, directTls, true);
resolverResult.authenticated = result.isAuthenticData();
ipv4s.add(resolverResult);
}
@ -266,7 +266,8 @@ public class Resolver {
try {
ResolverResult<D> results = resolveWithFallback(hostname, type, authenticated);
for (D record : results.getAnswersOrEmptySet()) {
Result resolverResult = Result.fromRecord(srv, directTls);
boolean ipv4 = type == A.class;
Result resolverResult = Result.fromRecord(srv, directTls, ipv4);
resolverResult.authenticated = results.isAuthenticData() && authenticated;
resolverResult.ip = record.getInetAddress();
list.add(resolverResult);
@ -392,17 +393,18 @@ public class Resolver {
private String logID = "";
static Result fromRecord(final SRV srv, final boolean directTls) {
static Result fromRecord(final SRV srv, final boolean directTls, final boolean ipv4) {
Result result = new Result();
result.timeRequested = System.currentTimeMillis();
result.port = srv.port;
result.hostname = srv.name;
if (ipv4) {
try {
result.ip = InetAddress.getByName(result.hostname.toString());
} catch (UnknownHostException e) {
result.ip = null;
e.printStackTrace();
}
}
result.directTls = directTls;
result.priority = srv.priority;
return result;