Skip to content
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

Jump to bottom

Fix async accept with std.event.loop.accept #33

Closed
wants to merge 1 commit into from
Closed

Fix async accept with std.event.loop.accept #33

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
10 changes: 9 additions & 1 deletion network.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,15 @@ pub const Socket = struct {
else if (std.io.is_async) std.os.O_NONBLOCK else 0;

var addr_ptr = @ptrCast(*std.os.sockaddr, &addr);
const fd = try accept4_fn(self.internal, addr_ptr, &addr_size, flags);

const fd = blk: {
if (std.io.is_async) {
const loop = std.event.Loop.instance orelse return error.UnexpectedError;
break :blk try loop.accept(self.internal, addr_ptr, &addr_size, flags);
} else {
break :blk try accept4_fn(self.internal, addr_ptr, &addr_size, flags);
}
};
errdefer close_fn(fd);

return Socket{
Expand Down