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
8 changes: 8 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
dde-cooperation (1.2.3) unstable; urgency=medium

* chore: Update version to 1.2.3
* fix(network): filter virtual network interfaces correctly on Windows
* fix: add PNG/JPEG to BMP DIB conversion for X11 clipboard

-- re2zero <yangwu@uniontech.com> Thu, 23 Apr 2026 16:42:52 +0800

dde-cooperation (1.2.2) unstable; urgency=medium

* fix(log): remove duplicate qCritical logs
Expand Down
30 changes: 24 additions & 6 deletions src/common/commonutils.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -24,6 +24,27 @@ using namespace deepin_cross;
#define WEB_MIN_PORT 13628
#define WEB_MAX_PORT 23628

static bool isVirtualInterface(const QNetworkInterface &netInterface)
{
QString name = netInterface.name().toLower();
if (name.startsWith("virbr") || name.startsWith("vmnet")
|| name.startsWith("docker") || name.startsWith("veth")
|| name.startsWith("br-")) {
qInfo() << "Filtering virtual interface (by name):" << netInterface.name();
return true;
}

QString humanName = netInterface.humanReadableName().toLower();
if (humanName.contains("vmware") || humanName.contains("virtualbox")
|| humanName.contains("hyper-v") || humanName.contains("virtual ethernet")
|| humanName.contains("vethernet") || humanName.contains("bluetooth")) {
qInfo() << "Filtering virtual interface (by humanReadableName):" << netInterface.humanReadableName();
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
return true;
}

return false;
}

std::string CommonUitls::getFirstIp()
{
qInfo() << "Getting first available IP address";
Expand All @@ -38,10 +59,7 @@ std::string CommonUitls::getFirstIp()
continue;
}

if (netInterface.name().startsWith("virbr") || netInterface.name().startsWith("vmnet")
|| netInterface.name().startsWith("docker")) {
// 跳过桥接,虚拟机和docker的网络接口
qInfo() << "netInterface name:" << netInterface.name();
if (isVirtualInterface(netInterface)) {
continue;
}

Expand All @@ -52,7 +70,7 @@ std::string CommonUitls::getFirstIp()
if (entry.ip().protocol() == QAbstractSocket::IPv4Protocol && entry.ip() != QHostAddress::LocalHost) {
//IP地址
ip = QString(entry.ip().toString());
qInfo() << "Found available IP: " << ip;
qInfo() << "Found available IP: " << ip << "on interface:" << netInterface.name();
return ip.toStdString();
}
}
Expand Down
28 changes: 23 additions & 5 deletions src/compat/common/commonutils.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -23,6 +23,27 @@ static constexpr char kApp1[] { "dde-cooperation" };
static constexpr char kApp2[] { "deepin-data-transfer" };
static constexpr char kDaemon[] { "cooperation-daemon" };

static bool isVirtualInterface(const QNetworkInterface &netInterface)
{
QString name = netInterface.name().toLower();
if (name.startsWith("virbr") || name.startsWith("vmnet")
|| name.startsWith("docker") || name.startsWith("veth")
|| name.startsWith("br-")) {
qInfo() << "Filtering virtual interface (by name):" << netInterface.name();
return true;
}

QString humanName = netInterface.humanReadableName().toLower();
if (humanName.contains("vmware") || humanName.contains("virtualbox")
|| humanName.contains("hyper-v") || humanName.contains("virtual ethernet")
|| humanName.contains("vethernet") || humanName.contains("bluetooth")) {
qInfo() << "Filtering virtual interface (by humanReadableName):" << netInterface.humanReadableName();
return true;
}

return false;
}

std::string CommonUitls::getFirstIp()
{
QString ip;
Expand All @@ -35,10 +56,7 @@ std::string CommonUitls::getFirstIp()
continue;
}

if (netInterface.name().startsWith("virbr") || netInterface.name().startsWith("vmnet")
|| netInterface.name().startsWith("docker")) {
// 跳过桥接,虚拟机和docker的网络接口
qInfo() << "netInterface name:" << netInterface.name();
if (isVirtualInterface(netInterface)) {
continue;
}

Expand Down
Loading