Skip to content

Make hyprctl listener non-blocking and bounded #12587

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

Open
Rtur2003 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make hyprctl listener non-blocking and bounded #12587

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
54 changes: 30 additions & 24 deletions src/debug/HyprCtl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <cerrno>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
Expand Down Expand Up @@ -2250,6 +2251,8 @@ static bool isFollowUpRollingLogRequest(const std::string& request) {
}

static int hyprCtlFDTick(int fd, uint32_t mask, void* data) {
constexpr size_t MAX_REQUEST_SIZE = 64 * 1024;

if (mask & WL_EVENT_ERROR || mask & WL_EVENT_HANGUP)
return 0;

Expand All @@ -2259,7 +2262,13 @@ static int hyprCtlFDTick(int fd, uint32_t mask, void* data) {
sockaddr_in clientAddress;
socklen_t clientSize = sizeof(clientAddress);

const auto ACCEPTEDCONNECTION = accept4(g_pHyprCtl->m_socketFD.get(), rc<sockaddr*>(&clientAddress), &clientSize, SOCK_CLOEXEC);
const auto ACCEPTEDCONNECTION = accept4(g_pHyprCtl->m_socketFD.get(), rc<sockaddr*>(&clientAddress), &clientSize, SOCK_CLOEXEC | SOCK_NONBLOCK);

if (ACCEPTEDCONNECTION < 0) {
if (errno != EAGAIN && errno != EWOULDBLOCK)
Debug::log(ERR, "Hyprctl: failed to accept connection: {}", strerror(errno));
return 0;
}

std::array<char, 1024> readBuffer;

Expand All @@ -2273,31 +2282,28 @@ static int hyprCtlFDTick(int fd, uint32_t mask, void* data) {
Debug::log(LOG, "Hyprctl: new connection from pid {}", creds.CRED_PID);
}

//
pollfd pollfds[1] = {
{
.fd = ACCEPTEDCONNECTION,
.events = POLLIN,
},
};

int ret = poll(pollfds, 1, 5000);

if (ret <= 0) {
close(ACCEPTEDCONNECTION);
return 0;
}

std::string request;
while (true) {
while (request.size() < MAX_REQUEST_SIZE) {
readBuffer.fill(0);
auto messageSize = read(ACCEPTEDCONNECTION, readBuffer.data(), 1023);
if (messageSize < 1)
break;
std::string recvd = readBuffer.data();
request += recvd;
if (messageSize < 1023)
auto messageSize = read(ACCEPTEDCONNECTION, readBuffer.data(), readBuffer.size());
if (messageSize < 0) {
if (errno == EAGAIN || errno == EWOULDBLOCK)
break;
Debug::log(ERR, "Hyprctl: read error: {}", strerror(errno));
close(ACCEPTEDCONNECTION);
return 0;
}
if (messageSize == 0)
break;
request.append(readBuffer.data(), rc<size_t>(messageSize));
if (messageSize < static_cast<int>(readBuffer.size()))
break; // drained
}

if (request.size() >= MAX_REQUEST_SIZE) {
Debug::log(ERR, "Hyprctl: request exceeded {} bytes, closing", MAX_REQUEST_SIZE);
close(ACCEPTEDCONNECTION);
return 0;
}

std::string reply = "";
Expand Down Expand Up @@ -2342,7 +2348,7 @@ static int hyprCtlFDTick(int fd, uint32_t mask, void* data) {
}

void CHyprCtl::startHyprCtlSocket() {
m_socketFD = CFileDescriptor{socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0)};
m_socketFD = CFileDescriptor{socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)};

if (!m_socketFD.isValid()) {
Debug::log(ERR, "Couldn't start the Hyprland Socket. (1) IPC will not work.");
Expand Down