From 8d8836c2d1a5f2137867a01689021d3e6b1966ae Mon Sep 17 00:00:00 2001 From: Josh Wolfe Date: Wed, 7 Nov 2018 20:53:23 -0500 Subject: [PATCH] address port getter --- std/net.zig | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/std/net.zig b/std/net.zig index 235b8bae49..006a9d4ac5 100644 --- a/std/net.zig +++ b/std/net.zig @@ -18,12 +18,12 @@ pub const OsAddress = switch (builtin.os) { pub const Address = struct { os_addr: OsAddress, - pub fn initIp4(ip4: u32, port: u16) Address { + pub fn initIp4(ip4: u32, _port: u16) Address { return Address{ .os_addr = posix.sockaddr{ .in = posix.sockaddr_in{ .family = posix.AF_INET, - .port = std.mem.endianSwapIfLe(u16, port), + .port = std.mem.endianSwapIfLe(u16, _port), .addr = ip4, .zero = []u8{0} ** 8, }, @@ -31,13 +31,13 @@ pub const Address = struct { }; } - pub fn initIp6(ip6: *const Ip6Addr, port: u16) Address { + pub fn initIp6(ip6: *const Ip6Addr, _port: u16) Address { return Address{ .family = posix.AF_INET6, .os_addr = posix.sockaddr{ .in6 = posix.sockaddr_in6{ .family = posix.AF_INET6, - .port = std.mem.endianSwapIfLe(u16, port), + .port = std.mem.endianSwapIfLe(u16, _port), .flowinfo = 0, .addr = ip6.addr, .scope_id = ip6.scope_id, @@ -46,6 +46,10 @@ pub const Address = struct { }; } + pub fn port(self: Address) u16 { + return std.mem.endianSwapIfLe(u16, self.os_addr.in.port); + } + pub fn initPosix(addr: posix.sockaddr) Address { return Address{ .os_addr = addr }; }