mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 14:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.net.Address: clarify unix socket getOsSockLen

Browse Source
This commit is contained in:
Isaac Freund 2023-01-23 12:17:06 +01:00
parent faf2fd18d3
commit 186e805838
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/std/net.zig
View File

@ -103,10 +103,10 @@ pub const Address = extern union {
.path = undefined,
};
// this enables us to have the proper length of the socket in getOsSockLen
mem.set(u8, &sock_addr.path, 0);
// Add 1 to ensure a terminating 0 is present in the path array for maximum portability.
if (path.len + 1 > sock_addr.path.len) return error.NameTooLong;
if (path.len > sock_addr.path.len) return error.NameTooLong;
mem.set(u8, &sock_addr.path, 0);
mem.copy(u8, &sock_addr.path, path);
return Address{ .un = sock_addr };
@ -179,9 +179,17 @@ pub const Address = extern union {
unreachable;
}
const path_len = std.mem.len(std.meta.assumeSentinel(&self.un.path, 0));
return @intCast(os.socklen_t, @sizeOf(os.sockaddr.un) - self.un.path.len + path_len);
// Using the full length of the structure here is more portable than returning
// the number of bytes actually used by the currently stored path.
// This also is correct regardless if we are passing a socket address to the kernel
// (e.g. in bind, connect, sendto) since we ensure the path is 0 terminated in
// initUnix() or if we are receiving a socket address from the kernel and must
// provide the full buffer size (e.g. getsockname, getpeername, recvfrom, accept).
//
// To access the path, std.mem.sliceTo(&address.un.path, 0) should be used.
return @intCast(os.socklen_t, @sizeOf(os.sockaddr.un));
},
else => unreachable,
}
}