Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 10:22:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace convertFlags() function with its body

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-03-29 16:16:30 +02:00
parent 35205fd485
commit e2ac5c5b3d
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/network/kernel/qnetworkinterface_p.h
View file

@ -60,7 +60,7 @@ public:
~QNetworkInterfacePrivate()
{ }
int index; // interface index, if know
int index; // interface index, if known
QNetworkInterface::InterfaceFlags flags;
QString name;

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

@ -84,18 +84,6 @@ static QHostAddress addressFromSockaddr(sockaddr *sa)
}
static QNetworkInterface::InterfaceFlags convertFlags(uint rawFlags)
{
QNetworkInterface::InterfaceFlags flags = 0;
flags |= (rawFlags & IFF_UP) ? QNetworkInterface::IsUp : QNetworkInterface::InterfaceFlag(0);
flags |= (rawFlags & IFF_RUNNING) ? QNetworkInterface::IsRunning : QNetworkInterface::InterfaceFlag(0);
flags |= (rawFlags & IFF_BROADCAST) ? QNetworkInterface::CanBroadcast : QNetworkInterface::InterfaceFlag(0);
flags |= (rawFlags & IFF_LOOPBACK) ? QNetworkInterface::IsLoopBack : QNetworkInterface::InterfaceFlag(0);
flags |= (rawFlags & IFF_POINTOPOINT) ? QNetworkInterface::IsPointToPoint : QNetworkInterface::InterfaceFlag(0);
flags |= (rawFlags & IFF_MULTICAST) ? QNetworkInterface::CanMulticast : QNetworkInterface::InterfaceFlag(0);
return flags;
}
QList<QNetworkInterfacePrivate *> QNetworkInterfacePrivate::scan()
{
QList<QNetworkInterfacePrivate *> interfaces;
@ -119,10 +107,28 @@ QList<QNetworkInterfacePrivate *> QNetworkInterfacePrivate::scan()
}
if (!iface) {
iface = new QNetworkInterfacePrivate;
iface = new QNetworkInterfacePrivate();
iface->index = ifindex;
iface->name = QString::fromLatin1(ifiter->ifa_name);
iface->flags = convertFlags(ifiter->ifa_flags);
iface->flags = 0;
if (ifiter->ifa_flags & IFF_UP) {
iface->flags |= QNetworkInterface::IsUp;
}
if (ifiter->ifa_flags & IFF_RUNNING) {
iface->flags |= QNetworkInterface::IsRunning;
}
if (ifiter->ifa_flags & IFF_BROADCAST) {
iface->flags |= QNetworkInterface::CanBroadcast;
}
if (ifiter->ifa_flags & IFF_LOOPBACK) {
iface->flags |= QNetworkInterface::IsLoopBack;
}
if (ifiter->ifa_flags & IFF_POINTOPOINT) {
iface->flags |= QNetworkInterface::IsPointToPoint;
}
if (ifiter->ifa_flags & IFF_MULTICAST) {
iface->flags |= QNetworkInterface::CanMulticast;
}
interfaces.append(iface);
}