@ -13,20 +13,18 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
|
||||
#include "LookupServerAddress.h"
|
||||
|
||||
#include <launch/LaunchTask.h>
|
||||
|
||||
LookupServerAddress::LookupServerAddress(LaunchTask *parent) :
|
||||
LaunchStep(parent), m_dnsLookup(new QDnsLookup(this))
|
||||
LookupServerAddress::LookupServerAddress(LaunchTask* parent) : LaunchStep(parent), m_dnsLookup(new QDnsLookup(this))
|
||||
{
|
||||
connect(m_dnsLookup, &QDnsLookup::finished, this, &LookupServerAddress::on_dnsLookupFinished);
|
||||
|
||||
m_dnsLookup->setType(QDnsLookup::SRV);
|
||||
}
|
||||
|
||||
void LookupServerAddress::setLookupAddress(const QString &lookupAddress)
|
||||
void LookupServerAddress::setLookupAddress(const QString& lookupAddress)
|
||||
{
|
||||
m_lookupAddress = lookupAddress;
|
||||
m_dnsLookup->setName(QString("_minecraft._tcp.%1").arg(lookupAddress));
|
||||
@ -51,41 +49,40 @@ void LookupServerAddress::executeTask()
|
||||
|
||||
void LookupServerAddress::on_dnsLookupFinished()
|
||||
{
|
||||
if (isFinished())
|
||||
{
|
||||
if (isFinished()) {
|
||||
// Aborted
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_dnsLookup->error() != QDnsLookup::NoError)
|
||||
{
|
||||
if (m_dnsLookup->error() != QDnsLookup::NoError) {
|
||||
emit logLine(QString("Failed to resolve server address (this is NOT an error!) %1: %2\n")
|
||||
.arg(m_dnsLookup->name(), m_dnsLookup->errorString()), MessageLevel::Launcher);
|
||||
resolve(m_lookupAddress, 25565); // Technically the task failed, however, we don't abort the launch
|
||||
// and leave it up to minecraft to fail (or maybe not) when connecting
|
||||
.arg(m_dnsLookup->name(), m_dnsLookup->errorString()),
|
||||
MessageLevel::Launcher);
|
||||
resolve(m_lookupAddress, 25565); // Technically the task failed, however, we don't abort the launch
|
||||
// and leave it up to minecraft to fail (or maybe not) when connecting
|
||||
return;
|
||||
}
|
||||
|
||||
const auto records = m_dnsLookup->serviceRecords();
|
||||
if (records.empty())
|
||||
{
|
||||
emit logLine(
|
||||
QString("Failed to resolve server address %1: the DNS lookup succeeded, but no records were returned.\n")
|
||||
.arg(m_dnsLookup->name()), MessageLevel::Warning);
|
||||
resolve(m_lookupAddress, 25565); // Technically the task failed, however, we don't abort the launch
|
||||
// and leave it up to minecraft to fail (or maybe not) when connecting
|
||||
if (records.empty()) {
|
||||
emit logLine(QString("Failed to resolve server address %1: the DNS lookup succeeded, but no records were returned.\n")
|
||||
.arg(m_dnsLookup->name()),
|
||||
MessageLevel::Warning);
|
||||
resolve(m_lookupAddress, 25565); // Technically the task failed, however, we don't abort the launch
|
||||
// and leave it up to minecraft to fail (or maybe not) when connecting
|
||||
return;
|
||||
}
|
||||
|
||||
const auto &firstRecord = records.at(0);
|
||||
const auto& firstRecord = records.at(0);
|
||||
quint16 port = firstRecord.port();
|
||||
|
||||
emit logLine(QString("Resolved server address %1 to %2 with port %3\n").arg(
|
||||
m_dnsLookup->name(), firstRecord.target(), QString::number(port)),MessageLevel::Launcher);
|
||||
emit logLine(
|
||||
QString("Resolved server address %1 to %2 with port %3\n").arg(m_dnsLookup->name(), firstRecord.target(), QString::number(port)),
|
||||
MessageLevel::Launcher);
|
||||
resolve(firstRecord.target(), port);
|
||||
}
|
||||
|
||||
void LookupServerAddress::resolve(const QString &address, quint16 port)
|
||||
void LookupServerAddress::resolve(const QString& address, quint16 port)
|
||||
{
|
||||
m_output->address = address;
|
||||
m_output->port = port;
|
||||
|
Reference in New Issue
Block a user