Skip to content

fix(daemon): correctly handle endpoint deletion #8

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
OldUser101 merged 1 commit into from
Feb 23, 2026
Merged

fix(daemon): correctly handle endpoint deletion #8

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
2 changes: 2 additions & 0 deletions daemon/daemon_endpoint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ void HopperDaemon::delete_endpoint(uint32_t id) {

std::cout << "DELETE " << *(m_endpoints[id]) << std::endl;

inotify_rm_watch(m_inotify_fd, m_endpoints[id]->watch_fd());

delete m_endpoints[id];
m_endpoints.erase(id);
}
Expand Down
27 changes: 17 additions & 10 deletions daemon/daemon_inotify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ void HopperDaemon::handle_endpoint_inotify(struct inotify_event *ev,
p /= ev->name;

PipeType pipe_type = detect_pipe_type(p);
if (pipe_type == PipeType::NONE && std::filesystem::is_directory(p)) {
if (pipe_type == PipeType::NONE && ev->mask & IN_ISDIR) {
// nested endpoint
if (create_endpoint(p) == 0)
std::cerr << "Endpoint creation failed! Out of IDs?"
Expand All @@ -78,13 +78,19 @@ void HopperDaemon::handle_endpoint_inotify(struct inotify_event *ev,
std::filesystem::path p = endpoint->path();
p /= ev->name;

HopperPipe *pipe = endpoint->pipe_by_path(p);
if (ev->mask & IN_ISDIR) {
// nested endpoint
delete_endpoint(p);
} else {
// pipe
HopperPipe *pipe = endpoint->pipe_by_path(p);

if (pipe != nullptr) {
if (pipe->status() == PipeStatus::ACTIVE)
remove_pipe(endpoint, pipe->id());
if (pipe != nullptr) {
if (pipe->status() == PipeStatus::ACTIVE)
remove_pipe(endpoint, pipe->id());

endpoint->remove_by_id(pipe->id());
endpoint->remove_by_id(pipe->id());
}
}
}
}
Expand All @@ -106,6 +112,11 @@ void HopperDaemon::handle_inotify() {
continue;
}

if (iev->mask & IN_IGNORED) {
// the endpoint probably got deleted, ignore
continue;
}

HopperEndpoint *endpoint = endpoint_by_watch(iev->wd);
if (endpoint == nullptr) {
std::cout << "No endpoint found for watch ID " << iev->wd
Expand All @@ -114,10 +125,6 @@ void HopperDaemon::handle_inotify() {
}

handle_endpoint_inotify(iev, endpoint);

// The endpoint is now closed
if (iev->mask & IN_IGNORED)
delete_endpoint(endpoint->id());
}
}

Expand Down