medvedych/harbour-seaprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Vain attempts at optimization

Browse source
This commit is contained in:
Anton Thomasson 2021-06-21 20:19:34 +02:00
parent 01e7e02bcd
commit d9c14241bf
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/ippdiscovery.cpp
View file

@ -186,12 +186,13 @@ void IppDiscovery::update()
{ {
QStringList found; QStringList found;
QList<QPair<QString,QString>> ippsIpRps; QList<QPair<QString,QString>> ippsIpRps;
QString target, rp;
foreach(QString it, _ipps) foreach(QString it, _ipps)
{ {
quint16 port = _ports[it]; quint16 port = _ports[it];
QString target = _targets[it]; target = _targets[it];
QString rp = _rps[it]; rp = _rps[it];
for(QMultiMap<QString,QString>::Iterator ait = _AAs.begin(); ait != _AAs.end(); ait++) for(QMultiMap<QString,QString>::Iterator ait = _AAs.begin(); ait != _AAs.end(); ait++)
{ {
@ -211,8 +212,8 @@ void IppDiscovery::update()
foreach(QString it, _ipp) foreach(QString it, _ipp)
{ {
quint16 port = _ports[it]; quint16 port = _ports[it];
QString target = _targets[it]; target = _targets[it];
QString rp = _rps[it]; rp = _rps[it];
for(QMultiMap<QString,QString>::Iterator ait = _AAs.begin(); ait != _AAs.end(); ait++) for(QMultiMap<QString,QString>::Iterator ait = _AAs.begin(); ait != _AAs.end(); ait++)
{ {
@ -279,6 +280,8 @@ void IppDiscovery::readPendingDatagrams()
QStringList new_ipps_ptrs; QStringList new_ipps_ptrs;
QStringList new_targets; QStringList new_targets;
QString qaddr, aaddr, tmpname, target;
socket->readDatagram((char*)(resp.raw()), size, &sender, &senderPort); socket->readDatagram((char*)(resp.raw()), size, &sender, &senderPort);
sender = QHostAddress(sender.toIPv4Address()); sender = QHostAddress(sender.toIPv4Address());
@ -291,7 +294,7 @@ void IppDiscovery::readPendingDatagrams()
for(quint16 i = 0; i < questions; i++) for(quint16 i = 0; i < questions; i++)
{ {
quint16 qtype, qflags; quint16 qtype, qflags;
QString qaddr = get_addr(resp).join('.'); qaddr = get_addr(resp).join('.');
resp >> qtype >> qflags; resp >> qtype >> qflags;
} }
@ -300,13 +303,13 @@ void IppDiscovery::readPendingDatagrams()
quint16 atype, aflags, len; quint16 atype, aflags, len;
quint32 ttl; quint32 ttl;
QString aaddr = get_addr(resp).join('.'); aaddr = get_addr(resp).join('.');
resp >> atype >> aflags >> ttl >> len; resp >> atype >> aflags >> ttl >> len;
quint16 pos_before = resp.pos(); quint16 pos_before = resp.pos();
if (atype == PTR) if (atype == PTR)
{ {
QString tmpname = get_addr(resp).join("."); tmpname = get_addr(resp).join(".");
if(aaddr.endsWith("_ipp._tcp.local")) if(aaddr.endsWith("_ipp._tcp.local"))
{ {
new_ipp_ptrs.append(tmpname); new_ipp_ptrs.append(tmpname);
@ -334,7 +337,7 @@ void IppDiscovery::readPendingDatagrams()
{ {
quint16 prio, w, port; quint16 prio, w, port;
resp >> prio >> w >> port; resp >> prio >> w >> port;
QString target = get_addr(resp).join("."); target = get_addr(resp).join(".");
_ports[aaddr] = port; _ports[aaddr] = port;
_targets[aaddr] = target; _targets[aaddr] = target;
if(!new_targets.contains(target)) if(!new_targets.contains(target))
@ -383,12 +386,12 @@ void IppDiscovery::readPendingDatagrams()
QStringList unresolvedAddrs; QStringList unresolvedAddrs;
foreach(QString target, new_targets) foreach(QString t, new_targets)
{ {
// If target does not resolve to an address, query about it // If target does not resolve to an address, query about it
if(!_AAs.contains(target)) if(!_AAs.contains(t))
{ {
unresolvedAddrs.append(target); unresolvedAddrs.append(t);
} }
} }