Skip to content

fix: Modify network service crash issue #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caixr23 merged 1 commit into from
Mar 20, 2025
Merged

fix: Modify network service crash issue #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion network-service-plugin/accountnetwork/session/accountnetwork/activeaccoutnetwork.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,11 @@ void ActiveAccountNetwork::onActiveConnectionChanged()

void ActiveAccountNetwork::onStateChanged(NetworkManager::ActiveConnection::State state)
{
NetworkManager::ActiveConnection::Ptr activeConnection(qobject_cast<NetworkManager::ActiveConnection *>(sender()));
NetworkManager::ActiveConnection *activeConn = qobject_cast<NetworkManager::ActiveConnection *>(sender());
if (!activeConn) {
return;
}
const NetworkManager::ActiveConnection::Ptr activeConnection = NetworkManager::findActiveConnection(activeConn->path());
if (!activeConnection) {
return;
}
Expand Down
11 changes: 9 additions & 2 deletions network-service-plugin/system/networkinitialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ void NetworkInitialization::addFirstConnection(const QSharedPointer<NetworkManag
// macAddress.remove(":");
// wiredSetting->setMacAddress(QByteArray::fromHex(macAddress.toUtf8()));
// wiredSetting->setInitialized(true);
qWarning()<<__LINE__<<__FUNCTION__<<conn->toMap();
QDBusPendingReply<QDBusObjectPath> reply = NetworkManager::addConnection(conn->toMap());
reply.waitForFinished();
qCDebug(DSM) << "device" << device->interfaceName() << "create connection success,count:" << device->availableConnections().size();
Expand Down Expand Up @@ -468,7 +467,15 @@ void NetworkInitialization::onInitDeviceConnection()

void NetworkInitialization::onAddFirstConnection()
{
QSharedPointer<NetworkManager::WiredDevice> device(qobject_cast<NetworkManager::WiredDevice *>(sender()));
NetworkManager::WiredDevice *dev = qobject_cast<NetworkManager::WiredDevice *>(sender());
if (!dev) {
return;
}
NetworkManager::Device::Ptr devPtr = NetworkManager::findNetworkInterface(dev->uni());
if (!devPtr) {
return;
}
NetworkManager::WiredDevice::Ptr device = devPtr.staticCast<NetworkManager::WiredDevice>();
qCDebug(DSM) << "device" << device->interfaceName() << " carrier:" << device->carrier() << " managed:" << device->managed() << " interfaceFlags:" << device->interfaceFlags();
addFirstConnection(device);
}
Expand Down