Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/perf/networkdetailwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void NetworkDetailWidget::SetNetwork(int index)
this->ui->typeValueLabel->setText(network.Type);
this->ui->speedValueLabel->setText(network.LinkSpeedMbps > 0 ? QString::number(network.LinkSpeedMbps) + tr(" Mbps") : tr("Unknown"));
this->ui->ipv4ValueLabel->setText(network.IPv4.isEmpty() ? tr("—") : network.IPv4);
this->ui->ipv6ValueLabel->setText(network.IPv6.isEmpty() ? tr("—") : network.IPv6);
this->ui->ipv6ValueLabel->setText(network.IPv6.isEmpty() ? tr("—") : network.IPv6.join('\n'));

this->ui->throughputGraphWidget->SetDataSource(network.RxHistory, 1024.0);
this->ui->throughputGraphWidget->SetOverlayDataSource(network.TxHistory);
Expand Down
16 changes: 14 additions & 2 deletions src/perf/networkdetailwidget.ui
Original file line number Diff line number Diff line change
Expand Up @@ -240,17 +240,29 @@
</widget>
</item>
<item row="4" column="2">
<widget class="QLabel" name="ipv6Label">
<widget class="QLabel" name="ipv6Label">
<property name="styleSheet">
<string></string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
<property name="text">
<string>IPv6 address</string>
<string>IPv6 addresses</string>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QLabel" name="ipv6ValueLabel">
<property name="textFormat">
<enum>Qt::TextFormat::PlainText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
<property name="text">
<string>—</string>
</property>
Expand Down
10 changes: 7 additions & 3 deletions src/system/network.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ void Network::refreshNetworkMetadata(bool force)
struct IfAddrInfo
{
QString ipv4;
QString ipv6;
QStringList ipv6;
};
QHash<QString, IfAddrInfo> ifaddrByName;
struct ifaddrs *ifaddr = nullptr;
Expand Down Expand Up @@ -133,8 +133,12 @@ void Network::refreshNetworkMetadata(bool force)
IfAddrInfo &info = ifaddrByName[name];
if (fam == AF_INET && info.ipv4.isEmpty())
info.ipv4 = QString::fromLatin1(host);
else if (fam == AF_INET6 && info.ipv6.isEmpty())
info.ipv6 = QString::fromLatin1(host);
else if (fam == AF_INET6)
{
const QString ipv6 = QString::fromLatin1(host);
if (!info.ipv6.contains(ipv6))
info.ipv6.append(ipv6);
}
}
::freeifaddrs(ifaddr);
}
Expand Down
3 changes: 2 additions & 1 deletion src/system/network.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "../historybuffer.h"
#include <memory>
#include <QElapsedTimer>
#include <QStringList>
#include <QVector>
#include <vector>

Expand All @@ -34,7 +35,7 @@ class Network
QString Name; ///< Interface name, e.g. enp5s0
QString Type; ///< Ethernet/Wi-Fi/Other
QString IPv4;
QString IPv6;
QStringList IPv6;
bool IsActive { true };
int LinkSpeedMbps { 0 };
quint64 PrevRxBytes { 0 };
Expand Down
Loading