Change browser protocol options so it can only be IPv4 or IPv6, not both.

This commit is contained in:
Jonathan Bagg
2019-03-05 21:26:41 -05:00
parent e92ba9936c
commit c286fcd2c0
4 changed files with 25 additions and 41 deletions
+5 -6
View File
@@ -195,10 +195,7 @@ void DNSSD_API QZeroConfPrivate::addressReply(DNSServiceRef sdRef,
if (err == kDNSServiceErr_NoError) {
if ((flags & kDNSServiceFlagsAdd) != 0) {
QHostAddress hAddress(address);
if (hAddress.protocol() == QAbstractSocket::IPv6Protocol)
ref->work.head()->setIpv6(hAddress);
else
ref->work.head()->setIp(hAddress);
ref->work.head()->setIp(hAddress);
QString key = ref->work.head()->name() + QString::number(interfaceIndex);
if (!ref->pub->services.contains(key)) {
@@ -349,8 +346,10 @@ void QZeroConf::startBrowser(QString type, QAbstractSocket::NetworkLayerProtocol
switch (protocol) {
case QAbstractSocket::IPv4Protocol: pri->protocol = kDNSServiceProtocol_IPv4; break;
case QAbstractSocket::IPv6Protocol: pri->protocol = kDNSServiceProtocol_IPv6; break;
case QAbstractSocket::AnyIPProtocol: pri->protocol = kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6; break;
default: pri->protocol = kDNSServiceProtocol_IPv4; break;
default:
qDebug("QZeroConf::startBrowser() - unsupported protocol, using IPv4");
pri->protocol = kDNSServiceProtocol_IPv4;
break;
};
err = DNSServiceBrowse(&pri->browser, 0, 0, type.toUtf8(), 0, (DNSServiceBrowseReply) QZeroConfPrivate::browseCallback, pri);