Use screen name instead of IP address to announce server through zeroconf
This commit is contained in:
parent
9432743cea
commit
c21d4269f8
|
@ -124,27 +124,6 @@ void ZeroconfService::errorHandle(DNSServiceErrorType errorCode)
|
||||||
tr("Error code: %1.").arg(errorCode));
|
tr("Error code: %1.").arg(errorCode));
|
||||||
}
|
}
|
||||||
|
|
||||||
QString ZeroconfService::getLocalIPAddresses()
|
|
||||||
{
|
|
||||||
QStringList addresses;
|
|
||||||
for (const QHostAddress& address : QNetworkInterface::allAddresses()) {
|
|
||||||
if (address.protocol() == QAbstractSocket::IPv4Protocol &&
|
|
||||||
address != QHostAddress(QHostAddress::LocalHost)) {
|
|
||||||
addresses.append(address.toString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const QString& preferedIP : preferedIPAddress) {
|
|
||||||
for (const QString& address : addresses) {
|
|
||||||
if (address.startsWith(preferedIP)) {
|
|
||||||
return address;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ZeroconfService::registerService(bool server)
|
bool ZeroconfService::registerService(bool server)
|
||||||
{
|
{
|
||||||
bool result = true;
|
bool result = true;
|
||||||
|
@ -159,19 +138,10 @@ bool ZeroconfService::registerService(bool server)
|
||||||
else {
|
else {
|
||||||
m_pZeroconfRegister = new ZeroconfRegister(this);
|
m_pZeroconfRegister = new ZeroconfRegister(this);
|
||||||
if (server) {
|
if (server) {
|
||||||
QString localIP = getLocalIPAddresses();
|
m_pZeroconfRegister->registerService(
|
||||||
if (localIP.isEmpty()) {
|
ZeroconfRecord(tr("%1").arg(m_pMainWindow->getScreenName()),
|
||||||
QMessageBox::warning(m_pMainWindow, tr("Barrier"),
|
QLatin1String(m_ServerServiceName), QString()),
|
||||||
tr("Failed to get local IP address. "
|
m_zeroconfServer.serverPort());
|
||||||
"Please manually type in server address "
|
|
||||||
"on your clients"));
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
m_pZeroconfRegister->registerService(
|
|
||||||
ZeroconfRecord(tr("%1").arg(localIP),
|
|
||||||
QLatin1String(m_ServerServiceName), QString()),
|
|
||||||
m_zeroconfServer.serverPort());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
m_pZeroconfRegister->registerService(
|
m_pZeroconfRegister->registerService(
|
||||||
|
|
|
@ -42,7 +42,6 @@ private slots:
|
||||||
void errorHandle(DNSServiceErrorType errorCode);
|
void errorHandle(DNSServiceErrorType errorCode);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QString getLocalIPAddresses();
|
|
||||||
bool registerService(bool server);
|
bool registerService(bool server);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
Loading…
Reference in New Issue