Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 03:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup findInterface() function

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-12-30 02:43:40 +00:00
parent 02c313578f
commit a0e21b8fd9
1 changed files with 32 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/network/kernel/qnetworkinterface_unix.cpp
View file

@ -167,7 +167,6 @@ static QSet<QByteArray> interfaceNames(int socket)
static QNetworkInterfacePrivate *findInterface(int socket, QList<QNetworkInterfacePrivate *> &interfaces,
struct ifreq &req)
{
QNetworkInterfacePrivate *iface = 0;
int ifindex = 0;
#ifndef QT_NO_IPV6IFNAME
@ -175,58 +174,54 @@ static QNetworkInterfacePrivate *findInterface(int socket, QList<QNetworkInterfa
ifindex = if_nametoindex(req.ifr_name);
// find the interface data
QList<QNetworkInterfacePrivate *>::Iterator if_it = interfaces.begin();
for ( ; if_it != interfaces.end(); ++if_it)
if ((*if_it)->index == ifindex) {
foreach (QNetworkInterfacePrivate *it, interfaces) {
if (it->index == ifindex) {
// existing interface
iface = *if_it;
break;
return it;
}
}
#else
// Search by name
QList<QNetworkInterfacePrivate *>::Iterator if_it = interfaces.begin();
for ( ; if_it != interfaces.end(); ++if_it)
if ((*if_it)->name == QLatin1String(req.ifr_name)) {
foreach (QNetworkInterfacePrivate *it, interfaces) {
if (it->name == QString::fromLatin1(req.ifr_name)) {
// existing interface
iface = *if_it;
break;
return it;
}
}
#endif
if (!iface) {
// new interface, create data:
iface = new QNetworkInterfacePrivate;
iface->index = ifindex;
interfaces << iface;
// new interface, create data:
QNetworkInterfacePrivate *iface = new QNetworkInterfacePrivate;
iface->index = ifindex;
interfaces << iface;
#ifdef SIOCGIFNAME
// Get the canonical name
QByteArray oldName = req.ifr_name;
if (qt_safe_ioctl(socket, SIOCGIFNAME, &req) >= 0) {
iface->name = QString::fromLatin1(req.ifr_name);
// Get the canonical name
QByteArray oldName = req.ifr_name;
if (qt_safe_ioctl(socket, SIOCGIFNAME, &req) >= 0) {
iface->name = QString::fromLatin1(req.ifr_name);
// reset the name:
memcpy(req.ifr_name, oldName, qMin<int>(oldName.length() + 1, sizeof(req.ifr_name) - 1));
} else
// reset the name:
memcpy(req.ifr_name, oldName, qMin<int>(oldName.length() + 1, sizeof(req.ifr_name) - 1));
} else
#endif
{
// use this name anyways
iface->name = QString::fromLatin1(req.ifr_name);
}
{
// use this name anyways
iface->name = QString::fromLatin1(req.ifr_name);
}
// Get interface flags
if (qt_safe_ioctl(socket, SIOCGIFFLAGS, &req) >= 0) {
iface->flags = convertFlags(req.ifr_flags);
}
// Get interface flags
if (qt_safe_ioctl(socket, SIOCGIFFLAGS, &req) >= 0) {
iface->flags = convertFlags(req.ifr_flags);
}
#ifdef SIOCGIFHWADDR
// Get the HW address
if (qt_safe_ioctl(socket, SIOCGIFHWADDR, &req) >= 0) {
uchar *addr = (uchar *)req.ifr_addr.sa_data;
iface->hardwareAddress = iface->makeHwAddress(6, addr);
}
#endif
// Get the HW address
if (qt_safe_ioctl(socket, SIOCGIFHWADDR, &req) >= 0) {
uchar *addr = (uchar *)req.ifr_addr.sa_data;
iface->hardwareAddress = iface->makeHwAddress(6, addr);
}
#endif
return iface;
}