motiejus/zig
1
Fork 0
Code Releases Activity

Merge branch 'testAddresses' of https://github.com/marler8997/zig into std.net

Browse Source
This commit is contained in:
Andrew Kelley
2019-10-30 12:33:47 -04:00
parent 0fb1388031 4e0c2ed443
commit f5ff36271b
2 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/std/net.zig
View File

@@ -29,16 +29,30 @@ pub const Address = struct {
//pub const localhost = initIp4(parseIp4("127.0.0.1") catch unreachable, 0);
pub fn initIp4(ip4: u32, _port: u16) Address {
return Address{
.os_addr = os.sockaddr{
.in = os.sockaddr_in{
.family = os.AF_INET,
.port = mem.nativeToBig(u16, _port),
.addr = ip4,
.zero = [_]u8{0} ** 8,
switch (builtin.os) {
.macosx, .ios, .watchos, .tvos, .freebsd, .netbsd => return Address{
.os_addr = os.sockaddr{
.in = os.sockaddr_in{
.len = @sizeOf(os.sockaddr_in),
.family = os.AF_INET,
.port = mem.nativeToBig(u16, _port),
.addr = ip4,
.zero = [_]u8{0} ** 8,
},
},
},
};
.linux => return Address{
.os_addr = os.sockaddr{
.in = os.sockaddr_in{
.family = os.AF_INET,
.port = mem.nativeToBig(u16, _port),
.addr = ip4,
.zero = [_]u8{0} ** 8,
},
},
},
else => @compileError("Address.initIp4 not implemented for this platform"),
}
}
pub fn initIp6(ip6: Ip6Addr, _port: u16) Address {