1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QHostAddress: Convert AnyIPv4 to AnyIPv6 instead of ::ffff:0.0.0.0

Browse Source 
Unlike localhost (127.0.0.1), there's really no point in using
::ffff:0.0.0.0, since you shouldn't be sending packets to it. Linux
transforms 0.0.0.0 to localhost, but that's non-standard and won't work
on other OSs, so it's still a bad idea.

Change-Id: I5982b21bf953e11e04fc19893f94be90ed29089b
Reviewed-by: Richard J. Moore <rich@kde.org>
This commit is contained in:
Thiago Macieira 2014-12-24 15:40:21 -02:00
parent c64d27a9f7
commit ab8d36d6f3
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/network/kernel/qhostaddress.cpp
View File

@ -123,28 +123,41 @@ QHostAddressPrivate::QHostAddressPrivate()
void QHostAddressPrivate::setAddress(quint32 a_) void QHostAddressPrivate::setAddress(quint32 a_)
{ {
a = a_; a = a_;
//create mapped address //create mapped address, except for a_ == 0 (any)
memset(&a6, 0, sizeof(a6)); memset(&a6, 0, sizeof(a6));
if (a) {
a6[11] = 0xFF;
a6[10] = 0xFF;
} else {
a6[11] = 0;
a6[10] = 0;
}
int i; int i;
for (i=15; a_ != 0; i--) { for (i=15; a_ != 0; i--) {
a6[i] = a_ & 0xFF; a6[i] = a_ & 0xFF;
a_ >>=8; a_ >>=8;
} }
Q_ASSERT(i >= 11); Q_ASSERT(i >= 11);
a6[11] = 0xFF;
a6[10] = 0xFF;
protocol = QAbstractSocket::IPv4Protocol; protocol = QAbstractSocket::IPv4Protocol;
isParsed = true; isParsed = true;
} }
static bool parseMappedAddress(quint32& a, const Q_IPV6ADDR &a6) /// parses v4-mapped addresses or the AnyIPv6 address and stores in \a a;
/// returns true if the address was one of those
static bool convertToIpv4(quint32& a, const Q_IPV6ADDR &a6)
{ {
int i; const uchar *ptr = a6.c;
for (i=0;i<10;i++) if (qFromUnaligned<quint64>(ptr) != 0)
if (a6[i]) return false; return false;
for (;i<12;i++) if (qFromBigEndian<quint32>(ptr + 8) == 0) {
if (a6[i] != 0xFF) return false; // is it AnyIPv6?
a=(a6[12] << 24) | (a6[13] << 16) | (a6[14] << 8) | a6[15]; a = 0;
return qFromBigEndian<quint32>(ptr + 12) == 0;
}
if (qFromBigEndian<quint32>(ptr + 8) != 0xFFFF)
return false;
a = qFromBigEndian<quint32>(ptr + 12);
return true; return true;
} }
@ -153,7 +166,7 @@ void QHostAddressPrivate::setAddress(const quint8 *a_)
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
a6[i] = a_[i]; a6[i] = a_[i];
a = 0; a = 0;
parseMappedAddress(a, a6); convertToIpv4(a, a6);
protocol = QAbstractSocket::IPv6Protocol; protocol = QAbstractSocket::IPv6Protocol;
isParsed = true; isParsed = true;
} }
@ -162,7 +175,7 @@ void QHostAddressPrivate::setAddress(const Q_IPV6ADDR &a_)
{ {
a6 = a_; a6 = a_;
a = 0; a = 0;
parseMappedAddress(a, a6); convertToIpv4(a, a6);
protocol = QAbstractSocket::IPv6Protocol; protocol = QAbstractSocket::IPv6Protocol;
isParsed = true; isParsed = true;
} }