mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 15:47:38 +02:00
Code Issues Releases Wiki Activity

Compare only as IPv6 as IPv4 address are often mapped to IPv6 addresses

Browse Source
This commit is contained in:
Uwe L. Korn
2013-07-18 11:48:57 +02:00
parent af59024e6c
commit 101d6c2991
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libtomahawk/network/Servent.cpp
View File

@@ -1067,6 +1067,19 @@ Servent::additionalPort() const
return d_func()->externalPort; return d_func()->externalPort;
} }
bool
equalByIPv6Address( QHostAddress a1, QHostAddress a2 )
{
Q_IPV6ADDR addr1 = a1.toIPv6Address();
Q_IPV6ADDR addr2 = a2.toIPv6Address();
for (int i = 0; i < 16; ++i)
{
if ( addr1[i] != addr2[i] )
return false;
}
return true;
}
// return the appropriate connection for a given offer key, or NULL if invalid // return the appropriate connection for a given offer key, or NULL if invalid
Connection* Connection*
@@ -1083,7 +1096,8 @@ Servent::claimOffer( ControlConnection* cc, const QString &nodeid, const QString
foreach ( ControlConnection* cc, d_func()->controlconnections ) foreach ( ControlConnection* cc, d_func()->controlconnections )
{ {
tDebug() << Q_FUNC_INFO << "Probing:" << cc->name(); tDebug() << Q_FUNC_INFO << "Probing:" << cc->name();
if ( cc->socket() && cc->socket()->peerAddress() == peer ) // Always compare IPv6 addresses as IPv4 address are sometime simply IPv4 addresses, sometimes mapped IPv6 addresses
if ( cc->socket() && equalByIPv6Address( cc->socket()->peerAddress(), peer ) )
{ {
authed = true; authed = true;
break; break;