feedc0de/QtZeroConf
1
0
Fork 0
forked from jbagg/QtZeroConf
Code Pull Requests Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

22
avahicore.cpp
View File

@ -128,7 +128,7 @@ public:
break;
case AVAHI_BROWSER_NEW:
if (!ref->resolvers.contains(key))
ref->resolvers.insert(key, avahi_s_service_resolver_new(ref->server, interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC, AVAHI_LOOKUP_USE_MULTICAST, resolveCallback, ref));
ref->resolvers.insert(key, avahi_s_service_resolver_new(ref->server, interface, protocol, name, type, domain, ref->aProtocol, AVAHI_LOOKUP_USE_MULTICAST, resolveCallback, ref));
break;
case AVAHI_BROWSER_REMOVE:
if (!ref->resolvers.contains(key))
@ -196,10 +196,7 @@ public:
char a[AVAHI_ADDRESS_STR_MAX];
avahi_address_snprint(a, sizeof(a), address);
QHostAddress addr(a);
if (protocol == AVAHI_PROTO_INET6)
zcs->setIpv6(addr);
else if (protocol == AVAHI_PROTO_INET)
zcs->setIp(addr);
zcs->setIp(addr);
if (newRecord)
emit ref->pub->serviceAdded(zcs);
@ -265,6 +262,7 @@ public:
AvahiServerConfig config;
AvahiSEntryGroup *group;
AvahiSServiceBrowser *browser;
AvahiProtocol aProtocol;
QMap <QString, AvahiSServiceResolver *> resolvers;
AvahiStringList *txt;
bool ready, registerWaiting;
@ -347,19 +345,19 @@ void QZeroConf::clearServiceTxtRecords()
void QZeroConf::startBrowser(QString type, QAbstractSocket::NetworkLayerProtocol protocol)
{
AvahiProtocol avahiProtocol;
if (pri->browser)
emit error(QZeroConf::browserFailed);
switch (protocol) {
case QAbstractSocket::IPv4Protocol: avahiProtocol = AVAHI_PROTO_INET; break;
case QAbstractSocket::IPv6Protocol: avahiProtocol = AVAHI_PROTO_INET6; break;
case QAbstractSocket::AnyIPProtocol: avahiProtocol = AVAHI_PROTO_UNSPEC; break;
default: avahiProtocol = AVAHI_PROTO_INET; break;
case QAbstractSocket::IPv4Protocol: pri->aProtocol = AVAHI_PROTO_INET; break;
case QAbstractSocket::IPv6Protocol: pri->aProtocol = AVAHI_PROTO_INET6; break;
default:
qDebug("QZeroConf::startBrowser() - unsupported protocol, using IPv4");
pri->aProtocol = AVAHI_PROTO_INET;
break;
};
pri->browser = avahi_s_service_browser_new(pri->server, AVAHI_IF_UNSPEC, avahiProtocol, type.toUtf8(), NULL, AVAHI_LOOKUP_USE_MULTICAST, QZeroConfPrivate::browseCallback, pri);
pri->browser = avahi_s_service_browser_new(pri->server, AVAHI_IF_UNSPEC, pri->aProtocol, type.toUtf8(), NULL, AVAHI_LOOKUP_USE_MULTICAST, QZeroConfPrivate::browseCallback, pri);
if (!pri->browser)
emit error(QZeroConf::browserFailed);
}