From 540d6dbd58b66dc15ab193f40a3e47f7342d7424 Mon Sep 17 00:00:00 2001 From: Sunghyun Chun <233250359+sunghyun999@users.noreply.github.com> Date: Wed, 15 Apr 2026 23:55:08 +0900 Subject: [PATCH 1/3] Show all IPv6 addresses in NIC details --- .codex | 0 src/perf/networkdetailwidget.cpp | 2 +- src/perf/networkdetailwidget.ui | 16 ++++++++++++++-- src/system/network.cpp | 12 ++++++++---- src/system/network.h | 3 ++- 5 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 .codex diff --git a/.codex b/.codex new file mode 100644 index 0000000..e69de29 diff --git a/src/perf/networkdetailwidget.cpp b/src/perf/networkdetailwidget.cpp index d71e090..f564478 100644 --- a/src/perf/networkdetailwidget.cpp +++ b/src/perf/networkdetailwidget.cpp @@ -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.IPv6Addresses.isEmpty() ? tr("—") : network.IPv6Addresses.join('\n')); this->ui->throughputGraphWidget->SetDataSource(network.RxHistory, 1024.0); this->ui->throughputGraphWidget->SetOverlayDataSource(network.TxHistory); diff --git a/src/perf/networkdetailwidget.ui b/src/perf/networkdetailwidget.ui index 2833af2..6941e73 100644 --- a/src/perf/networkdetailwidget.ui +++ b/src/perf/networkdetailwidget.ui @@ -240,17 +240,29 @@ - + + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + - IPv6 address + IPv6 addresses + + Qt::TextFormat::PlainText + + + true + + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + — diff --git a/src/system/network.cpp b/src/system/network.cpp index eb9a259..74b2206 100644 --- a/src/system/network.cpp +++ b/src/system/network.cpp @@ -102,7 +102,7 @@ void Network::refreshNetworkMetadata(bool force) struct IfAddrInfo { QString ipv4; - QString ipv6; + QStringList ipv6Addresses; }; QHash ifaddrByName; struct ifaddrs *ifaddr = nullptr; @@ -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.ipv6Addresses.contains(ipv6)) + info.ipv6Addresses.append(ipv6); + } } ::freeifaddrs(ifaddr); } @@ -145,7 +149,7 @@ void Network::refreshNetworkMetadata(bool force) n->Type = networkTypeFromArpType(arpType); n->LinkSpeedMbps = readLinkSpeedMbps(n->Name); n->IPv4 = ifaddrByName.value(n->Name).ipv4; - n->IPv6 = ifaddrByName.value(n->Name).ipv6; + n->IPv6Addresses = ifaddrByName.value(n->Name).ipv6Addresses; } } diff --git a/src/system/network.h b/src/system/network.h index d867e8c..9ff7de2 100644 --- a/src/system/network.h +++ b/src/system/network.h @@ -23,6 +23,7 @@ #include "../historybuffer.h" #include #include +#include #include #include @@ -34,7 +35,7 @@ class Network QString Name; ///< Interface name, e.g. enp5s0 QString Type; ///< Ethernet/Wi-Fi/Other QString IPv4; - QString IPv6; + QStringList IPv6Addresses; bool IsActive { true }; int LinkSpeedMbps { 0 }; quint64 PrevRxBytes { 0 }; From 700f44466d47ea641552d7da4ab74991d20b7832 Mon Sep 17 00:00:00 2001 From: Sunghyun Chun <233250359+sunghyun999@users.noreply.github.com> Date: Thu, 16 Apr 2026 00:08:13 +0900 Subject: [PATCH 2/3] Revert NIC IPv6 field rename --- src/perf/networkdetailwidget.cpp | 2 +- src/system/network.cpp | 8 ++++---- src/system/network.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/perf/networkdetailwidget.cpp b/src/perf/networkdetailwidget.cpp index f564478..7406176 100644 --- a/src/perf/networkdetailwidget.cpp +++ b/src/perf/networkdetailwidget.cpp @@ -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.IPv6Addresses.isEmpty() ? tr("—") : network.IPv6Addresses.join('\n')); + 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); diff --git a/src/system/network.cpp b/src/system/network.cpp index 74b2206..72df06c 100644 --- a/src/system/network.cpp +++ b/src/system/network.cpp @@ -102,7 +102,7 @@ void Network::refreshNetworkMetadata(bool force) struct IfAddrInfo { QString ipv4; - QStringList ipv6Addresses; + QStringList ipv6; }; QHash ifaddrByName; struct ifaddrs *ifaddr = nullptr; @@ -136,8 +136,8 @@ void Network::refreshNetworkMetadata(bool force) else if (fam == AF_INET6) { const QString ipv6 = QString::fromLatin1(host); - if (!info.ipv6Addresses.contains(ipv6)) - info.ipv6Addresses.append(ipv6); + if (!info.ipv6.contains(ipv6)) + info.ipv6.append(ipv6); } } ::freeifaddrs(ifaddr); @@ -149,7 +149,7 @@ void Network::refreshNetworkMetadata(bool force) n->Type = networkTypeFromArpType(arpType); n->LinkSpeedMbps = readLinkSpeedMbps(n->Name); n->IPv4 = ifaddrByName.value(n->Name).ipv4; - n->IPv6Addresses = ifaddrByName.value(n->Name).ipv6Addresses; + n->IPv6 = ifaddrByName.value(n->Name).ipv6; } } diff --git a/src/system/network.h b/src/system/network.h index 9ff7de2..2d8fa09 100644 --- a/src/system/network.h +++ b/src/system/network.h @@ -35,7 +35,7 @@ class Network QString Name; ///< Interface name, e.g. enp5s0 QString Type; ///< Ethernet/Wi-Fi/Other QString IPv4; - QStringList IPv6Addresses; + QStringList IPv6; bool IsActive { true }; int LinkSpeedMbps { 0 }; quint64 PrevRxBytes { 0 }; From 3609c3eed6a40d3e5fd16dfc6768829177659c6c Mon Sep 17 00:00:00 2001 From: Sunghyun Chun <233250359+sunghyun999@users.noreply.github.com> Date: Thu, 16 Apr 2026 00:35:27 +0900 Subject: [PATCH 3/3] Remove '.codex' file --- .codex | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .codex diff --git a/.codex b/.codex deleted file mode 100644 index e69de29..0000000