aboutsummaryrefslogtreecommitdiff
path: root/launcher/launch/steps/LookupServerAddress.cpp
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2023-08-04 19:42:36 +0200
committerGitHub <noreply@github.com>2023-08-04 19:42:36 +0200
commitae793f6cf11658c9abc5111e82d5ba7b3e6af127 (patch)
treeed41f30e2c0f02e4be1d42324b3f05fbab75b2cd /launcher/launch/steps/LookupServerAddress.cpp
parent50c7d39e082f0a7dbd977401e16d5adf534d9770 (diff)
parent1d638e018ac40fbfb35dd117f9a948c0cf35eadd (diff)
downloadPrismLauncher-ae793f6cf11658c9abc5111e82d5ba7b3e6af127.tar.gz
PrismLauncher-ae793f6cf11658c9abc5111e82d5ba7b3e6af127.tar.bz2
PrismLauncher-ae793f6cf11658c9abc5111e82d5ba7b3e6af127.zip
Merge pull request #1459 from Scrumplex/format
Diffstat (limited to 'launcher/launch/steps/LookupServerAddress.cpp')
-rw-r--r--launcher/launch/steps/LookupServerAddress.cpp41
1 files changed, 19 insertions, 22 deletions
diff --git a/launcher/launch/steps/LookupServerAddress.cpp b/launcher/launch/steps/LookupServerAddress.cpp
index c7b8cea4..9bdac203 100644
--- a/launcher/launch/steps/LookupServerAddress.cpp
+++ b/launcher/launch/steps/LookupServerAddress.cpp
@@ -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;