Skip to content

fix: [Net-Wakeup] The net card can not wakeup. #506

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
deepin-bot merged 1 commit into from
Aug 1, 2025
Merged

fix: [Net-Wakeup] The net card can not wakeup. #506

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
14 changes: 12 additions & 2 deletions deepin-devicemanager-server/deepin-devicecontrol/src/wakecontrol/wakeuputils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,12 @@
struct ifreq ifr;
struct ethtool_wolinfo wolinfo;
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, logicalName.toStdString().c_str(), sizeof(logicalName.toStdString().c_str()));
memset(&wolinfo, 0, sizeof(wolinfo));

QByteArray nameBytes = logicalName.toLocal8Bit();
strncpy(ifr.ifr_name, nameBytes.constData(), IFNAMSIZ - 1);
ifr.ifr_name[IFNAMSIZ - 1] = '\0';

wolinfo.cmd = ETHTOOL_GWOL;
ifr.ifr_data = reinterpret_cast<char *>(&wolinfo);
if (0 != ioctl(fd, SIOCETHTOOL, &ifr)) {
Expand Down Expand Up @@ -147,10 +152,15 @@
struct ifreq ifr;
struct ethtool_wolinfo wolinfo;
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, logicalName.toStdString().c_str(), sizeof(logicalName.toStdString().c_str()));
memset(&wolinfo, 0, sizeof(wolinfo));

QByteArray nameBytes = logicalName.toLocal8Bit();
strncpy(ifr.ifr_name, nameBytes.constData(), IFNAMSIZ - 1);
ifr.ifr_name[IFNAMSIZ - 1] = '\0';

wolinfo.cmd = ETHTOOL_SWOL;
if (open)
wolinfo.wolopts = 0 | WAKE_MAGIC;

Check warning on line 163 in deepin-devicemanager-server/deepin-devicecontrol/src/wakecontrol/wakeuputils.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Operator '|' with one operand equal to zero is redundant.
else
wolinfo.wolopts = 0;
ifr.ifr_data = reinterpret_cast<char *>(&wolinfo);
Expand Down