authorgravatar for git@l4.pmLuna <git@l4.pm> 2019-11-08 19:35:04-03:00
committergravatar for git@l4.pmLuna <git@l4.pm> 2019-11-08 19:35:04-03:00
log5d05cfcfe6144a7f49f57cb376863edd0059d9ca
treeac74983cbb2bb1de382b99107e85d67e5521bb0f
parent6d28b28ccc689e6bf8849b1d39e969e8da760999

rename IpAddress to Address, add Address.unix

2 files changed, 58 insertions(+), 57 deletions(-)

lib/std/net.zig+43-42
...@@ -10,15 +10,16 @@ test "" {...@@ -10,15 +10,16 @@ test "" {
10 _ = @import("net/test.zig");10 _ = @import("net/test.zig");
11}11}
1212
13pub const IpAddress = extern union {13pub const Address = extern union {
14 any: os.sockaddr,14 any: os.sockaddr,
15 in: os.sockaddr_in,15 in: os.sockaddr_in,
16 in6: os.sockaddr_in6,16 in6: os.sockaddr_in6,
17 unix: os.sockaddr_un,
1718
18 // TODO this crashed the compiler19 // TODO this crashed the compiler
19 //pub const localhost = initIp4(parseIp4("127.0.0.1") catch unreachable, 0);20 //pub const localhost = initIp4(parseIp4("127.0.0.1") catch unreachable, 0);
2021
21 pub fn parse(name: []const u8, port: u16) !IpAddress {22 pub fn parseIp(name: []const u8, port: u16) !Address {
22 if (parseIp4(name, port)) |ip4| return ip4 else |err| switch (err) {23 if (parseIp4(name, port)) |ip4| return ip4 else |err| switch (err) {
23 error.Overflow,24 error.Overflow,
24 error.InvalidEnd,25 error.InvalidEnd,
...@@ -39,7 +40,7 @@ pub const IpAddress = extern union {...@@ -39,7 +40,7 @@ pub const IpAddress = extern union {
39 return error.InvalidIPAddressFormat;40 return error.InvalidIPAddressFormat;
40 }41 }
4142
42 pub fn parseExpectingFamily(name: []const u8, family: os.sa_family_t, port: u16) !IpAddress {43 pub fn parseExpectingFamily(name: []const u8, family: os.sa_family_t, port: u16) !Address {
43 switch (family) {44 switch (family) {
44 os.AF_INET => return parseIp4(name, port),45 os.AF_INET => return parseIp4(name, port),
45 os.AF_INET6 => return parseIp6(name, port),46 os.AF_INET6 => return parseIp6(name, port),
...@@ -48,8 +49,8 @@ pub const IpAddress = extern union {...@@ -48,8 +49,8 @@ pub const IpAddress = extern union {
48 }49 }
49 }50 }
5051
51 pub fn parseIp6(buf: []const u8, port: u16) !IpAddress {52 pub fn parseIp6(buf: []const u8, port: u16) !Address {
52 var result = IpAddress{53 var result = Address{
53 .in6 = os.sockaddr_in6{54 .in6 = os.sockaddr_in6{
54 .scope_id = 0,55 .scope_id = 0,
55 .port = mem.nativeToBig(u16, port),56 .port = mem.nativeToBig(u16, port),
...@@ -154,8 +155,8 @@ pub const IpAddress = extern union {...@@ -154,8 +155,8 @@ pub const IpAddress = extern union {
154 }155 }
155 }156 }
156157
157 pub fn parseIp4(buf: []const u8, port: u16) !IpAddress {158 pub fn parseIp4(buf: []const u8, port: u16) !Address {
158 var result = IpAddress{159 var result = Address{
159 .in = os.sockaddr_in{160 .in = os.sockaddr_in{
160 .port = mem.nativeToBig(u16, port),161 .port = mem.nativeToBig(u16, port),
161 .addr = undefined,162 .addr = undefined,
...@@ -194,8 +195,8 @@ pub const IpAddress = extern union {...@@ -194,8 +195,8 @@ pub const IpAddress = extern union {
194 return error.Incomplete;195 return error.Incomplete;
195 }196 }
196197
197 pub fn initIp4(addr: [4]u8, port: u16) IpAddress {198 pub fn initIp4(addr: [4]u8, port: u16) Address {
198 return IpAddress{199 return Address{
199 .in = os.sockaddr_in{200 .in = os.sockaddr_in{
200 .port = mem.nativeToBig(u16, port),201 .port = mem.nativeToBig(u16, port),
201 .addr = @ptrCast(*align(1) const u32, &addr).*,202 .addr = @ptrCast(*align(1) const u32, &addr).*,
...@@ -203,8 +204,8 @@ pub const IpAddress = extern union {...@@ -203,8 +204,8 @@ pub const IpAddress = extern union {
203 };204 };
204 }205 }
205206
206 pub fn initIp6(addr: [16]u8, port: u16, flowinfo: u32, scope_id: u32) IpAddress {207 pub fn initIp6(addr: [16]u8, port: u16, flowinfo: u32, scope_id: u32) Address {
207 return IpAddress{208 return Address{
208 .in6 = os.sockaddr_in6{209 .in6 = os.sockaddr_in6{
209 .addr = addr,210 .addr = addr,
210 .port = mem.nativeToBig(u16, port),211 .port = mem.nativeToBig(u16, port),
...@@ -215,7 +216,7 @@ pub const IpAddress = extern union {...@@ -215,7 +216,7 @@ pub const IpAddress = extern union {
215 }216 }
216217
217 /// Returns the port in native endian.218 /// Returns the port in native endian.
218 pub fn getPort(self: IpAddress) u16 {219 pub fn getPort(self: Address) u16 {
219 const big_endian_port = switch (self.any.family) {220 const big_endian_port = switch (self.any.family) {
220 os.AF_INET => self.in.port,221 os.AF_INET => self.in.port,
221 os.AF_INET6 => self.in6.port,222 os.AF_INET6 => self.in6.port,
...@@ -225,7 +226,7 @@ pub const IpAddress = extern union {...@@ -225,7 +226,7 @@ pub const IpAddress = extern union {
225 }226 }
226227
227 /// `port` is native-endian.228 /// `port` is native-endian.
228 pub fn setPort(self: *IpAddress, port: u16) void {229 pub fn setPort(self: *Address, port: u16) void {
229 const ptr = switch (self.any.family) {230 const ptr = switch (self.any.family) {
230 os.AF_INET => &self.in.port,231 os.AF_INET => &self.in.port,
231 os.AF_INET6 => &self.in6.port,232 os.AF_INET6 => &self.in6.port,
...@@ -237,16 +238,16 @@ pub const IpAddress = extern union {...@@ -237,16 +238,16 @@ pub const IpAddress = extern union {
237 /// Asserts that `addr` is an IP address.238 /// Asserts that `addr` is an IP address.
238 /// This function will read past the end of the pointer, with a size depending239 /// This function will read past the end of the pointer, with a size depending
239 /// on the address family.240 /// on the address family.
240 pub fn initPosix(addr: *align(4) const os.sockaddr) IpAddress {241 pub fn initPosix(addr: *align(4) const os.sockaddr) Address {
241 switch (addr.family) {242 switch (addr.family) {
242 os.AF_INET => return IpAddress{ .in = @ptrCast(*const os.sockaddr_in, addr).* },243 os.AF_INET => return Address{ .in = @ptrCast(*const os.sockaddr_in, addr).* },
243 os.AF_INET6 => return IpAddress{ .in6 = @ptrCast(*const os.sockaddr_in6, addr).* },244 os.AF_INET6 => return Address{ .in6 = @ptrCast(*const os.sockaddr_in6, addr).* },
244 else => unreachable,245 else => unreachable,
245 }246 }
246 }247 }
247248
248 pub fn format(249 pub fn format(
249 self: IpAddress,250 self: Address,
250 comptime fmt: []const u8,251 comptime fmt: []const u8,
251 options: std.fmt.FormatOptions,252 options: std.fmt.FormatOptions,
252 context: var,253 context: var,
...@@ -271,7 +272,7 @@ pub const IpAddress = extern union {...@@ -271,7 +272,7 @@ pub const IpAddress = extern union {
271 },272 },
272 os.AF_INET6 => {273 os.AF_INET6 => {
273 const port = mem.bigToNative(u16, self.in6.port);274 const port = mem.bigToNative(u16, self.in6.port);
274 if (mem.eql(u8, self.in6.addr[0..12], [_]u8{0,0,0,0,0,0,0,0,0,0,0xff,0xff})) {275 if (mem.eql(u8, self.in6.addr[0..12], [_]u8{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff })) {
275 try std.fmt.format(276 try std.fmt.format(
276 context,277 context,
277 Errors,278 Errors,
...@@ -318,13 +319,13 @@ pub const IpAddress = extern union {...@@ -318,13 +319,13 @@ pub const IpAddress = extern union {
318 }319 }
319 }320 }
320321
321 pub fn eql(a: IpAddress, b: IpAddress) bool {322 pub fn eql(a: Address, b: Address) bool {
322 const a_bytes = @ptrCast([*]const u8, &a.any)[0..a.getOsSockLen()];323 const a_bytes = @ptrCast([*]const u8, &a.any)[0..a.getOsSockLen()];
323 const b_bytes = @ptrCast([*]const u8, &b.any)[0..b.getOsSockLen()];324 const b_bytes = @ptrCast([*]const u8, &b.any)[0..b.getOsSockLen()];
324 return mem.eql(u8, a_bytes, b_bytes);325 return mem.eql(u8, a_bytes, b_bytes);
325 }326 }
326327
327 fn getOsSockLen(self: IpAddress) os.socklen_t {328 fn getOsSockLen(self: Address) os.socklen_t {
328 switch (self.any.family) {329 switch (self.any.family) {
329 os.AF_INET => return @sizeOf(os.sockaddr_in),330 os.AF_INET => return @sizeOf(os.sockaddr_in),
330 os.AF_INET6 => return @sizeOf(os.sockaddr_in6),331 os.AF_INET6 => return @sizeOf(os.sockaddr_in6),
...@@ -358,7 +359,7 @@ pub fn connectUnixSocket(path: []const u8) !fs.File {...@@ -358,7 +359,7 @@ pub fn connectUnixSocket(path: []const u8) !fs.File {
358359
359pub const AddressList = struct {360pub const AddressList = struct {
360 arena: std.heap.ArenaAllocator,361 arena: std.heap.ArenaAllocator,
361 addrs: []IpAddress,362 addrs: []Address,
362 canon_name: ?[]u8,363 canon_name: ?[]u8,
363364
364 fn deinit(self: *AddressList) void {365 fn deinit(self: *AddressList) void {
...@@ -381,7 +382,7 @@ pub fn tcpConnectToHost(allocator: *mem.Allocator, name: []const u8, port: u16)...@@ -381,7 +382,7 @@ pub fn tcpConnectToHost(allocator: *mem.Allocator, name: []const u8, port: u16)
381 return tcpConnectToAddress(addrs[0], port);382 return tcpConnectToAddress(addrs[0], port);
382}383}
383384
384pub fn tcpConnectToAddress(address: IpAddress) !fs.File {385pub fn tcpConnectToAddress(address: Address) !fs.File {
385 const nonblock = if (std.io.is_async) os.SOCK_NONBLOCK else 0;386 const nonblock = if (std.io.is_async) os.SOCK_NONBLOCK else 0;
386 const sock_flags = os.SOCK_STREAM | os.SOCK_CLOEXEC | nonblock;387 const sock_flags = os.SOCK_STREAM | os.SOCK_CLOEXEC | nonblock;
387 const sockfd = try os.socket(address.any.family, sock_flags, os.IPPROTO_TCP);388 const sockfd = try os.socket(address.any.family, sock_flags, os.IPPROTO_TCP);
...@@ -456,13 +457,13 @@ pub fn getAddressList(allocator: *mem.Allocator, name: []const u8, port: u16) !*...@@ -456,13 +457,13 @@ pub fn getAddressList(allocator: *mem.Allocator, name: []const u8, port: u16) !*
456 }457 }
457 break :blk count;458 break :blk count;
458 };459 };
459 result.addrs = try arena.alloc(IpAddress, addr_count);460 result.addrs = try arena.alloc(Address, addr_count);
460461
461 var it: ?*os.addrinfo = res;462 var it: ?*os.addrinfo = res;
462 var i: usize = 0;463 var i: usize = 0;
463 while (it) |info| : (it = info.next) {464 while (it) |info| : (it = info.next) {
464 const addr = info.addr orelse continue;465 const addr = info.addr orelse continue;
465 result.addrs[i] = IpAddress.initPosix(@alignCast(4, addr));466 result.addrs[i] = Address.initPosix(@alignCast(4, addr));
466467
467 if (info.canonname) |n| {468 if (info.canonname) |n| {
468 if (result.canon_name == null) {469 if (result.canon_name == null) {
...@@ -485,7 +486,7 @@ pub fn getAddressList(allocator: *mem.Allocator, name: []const u8, port: u16) !*...@@ -485,7 +486,7 @@ pub fn getAddressList(allocator: *mem.Allocator, name: []const u8, port: u16) !*
485486
486 try linuxLookupName(&lookup_addrs, &canon, name, family, flags, port);487 try linuxLookupName(&lookup_addrs, &canon, name, family, flags, port);
487488
488 result.addrs = try arena.alloc(IpAddress, lookup_addrs.len);489 result.addrs = try arena.alloc(Address, lookup_addrs.len);
489 if (!canon.isNull()) {490 if (!canon.isNull()) {
490 result.canon_name = canon.toOwnedSlice();491 result.canon_name = canon.toOwnedSlice();
491 }492 }
...@@ -501,7 +502,7 @@ pub fn getAddressList(allocator: *mem.Allocator, name: []const u8, port: u16) !*...@@ -501,7 +502,7 @@ pub fn getAddressList(allocator: *mem.Allocator, name: []const u8, port: u16) !*
501}502}
502503
503const LookupAddr = struct {504const LookupAddr = struct {
504 addr: IpAddress,505 addr: Address,
505 sortkey: i32 = 0,506 sortkey: i32 = 0,
506};507};
507508
...@@ -524,7 +525,7 @@ fn linuxLookupName(...@@ -524,7 +525,7 @@ fn linuxLookupName(
524 if (opt_name) |name| {525 if (opt_name) |name| {
525 // reject empty name and check len so it fits into temp bufs526 // reject empty name and check len so it fits into temp bufs
526 try canon.replaceContents(name);527 try canon.replaceContents(name);
527 if (IpAddress.parseExpectingFamily(name, family, port)) |addr| {528 if (Address.parseExpectingFamily(name, family, port)) |addr| {
528 try addrs.append(LookupAddr{ .addr = addr });529 try addrs.append(LookupAddr{ .addr = addr });
529 } else |name_err| if ((flags & std.c.AI_NUMERICHOST) != 0) {530 } else |name_err| if ((flags & std.c.AI_NUMERICHOST) != 0) {
530 return name_err;531 return name_err;
...@@ -751,23 +752,23 @@ fn linuxLookupNameFromNull(...@@ -751,23 +752,23 @@ fn linuxLookupNameFromNull(
751 if ((flags & std.c.AI_PASSIVE) != 0) {752 if ((flags & std.c.AI_PASSIVE) != 0) {
752 if (family != os.AF_INET6) {753 if (family != os.AF_INET6) {
753 (try addrs.addOne()).* = LookupAddr{754 (try addrs.addOne()).* = LookupAddr{
754 .addr = IpAddress.initIp4([1]u8{0} ** 4, port),755 .addr = Address.initIp4([1]u8{0} ** 4, port),
755 };756 };
756 }757 }
757 if (family != os.AF_INET) {758 if (family != os.AF_INET) {
758 (try addrs.addOne()).* = LookupAddr{759 (try addrs.addOne()).* = LookupAddr{
759 .addr = IpAddress.initIp6([1]u8{0} ** 16, port, 0, 0),760 .addr = Address.initIp6([1]u8{0} ** 16, port, 0, 0),
760 };761 };
761 }762 }
762 } else {763 } else {
763 if (family != os.AF_INET6) {764 if (family != os.AF_INET6) {
764 (try addrs.addOne()).* = LookupAddr{765 (try addrs.addOne()).* = LookupAddr{
765 .addr = IpAddress.initIp4([4]u8{ 127, 0, 0, 1 }, port),766 .addr = Address.initIp4([4]u8{ 127, 0, 0, 1 }, port),
766 };767 };
767 }768 }
768 if (family != os.AF_INET) {769 if (family != os.AF_INET) {
769 (try addrs.addOne()).* = LookupAddr{770 (try addrs.addOne()).* = LookupAddr{
770 .addr = IpAddress.initIp6(([1]u8{0} ** 15) ++ [1]u8{1}, port, 0, 0),771 .addr = Address.initIp6(([1]u8{0} ** 15) ++ [1]u8{1}, port, 0, 0),
771 };772 };
772 }773 }
773 }774 }
...@@ -812,7 +813,7 @@ fn linuxLookupNameFromHosts(...@@ -812,7 +813,7 @@ fn linuxLookupNameFromHosts(
812 }813 }
813 } else continue;814 } else continue;
814815
815 const addr = IpAddress.parseExpectingFamily(ip_text, family, port) catch |err| switch (err) {816 const addr = Address.parseExpectingFamily(ip_text, family, port) catch |err| switch (err) {
816 error.Overflow,817 error.Overflow,
817 error.InvalidEnd,818 error.InvalidEnd,
818 error.InvalidCharacter,819 error.InvalidCharacter,
...@@ -1033,7 +1034,7 @@ fn linuxLookupNameFromNumericUnspec(...@@ -1033,7 +1034,7 @@ fn linuxLookupNameFromNumericUnspec(
1033 name: []const u8,1034 name: []const u8,
1034 port: u16,1035 port: u16,
1035) !void {1036) !void {
1036 const addr = try IpAddress.parse(name, port);1037 const addr = try Address.parse(name, port);
1037 (try addrs.addOne()).* = LookupAddr{ .addr = addr };1038 (try addrs.addOne()).* = LookupAddr{ .addr = addr };
1038}1039}
10391040
...@@ -1049,7 +1050,7 @@ fn resMSendRc(...@@ -1049,7 +1050,7 @@ fn resMSendRc(
1049 var sl: os.socklen_t = @sizeOf(os.sockaddr_in);1050 var sl: os.socklen_t = @sizeOf(os.sockaddr_in);
1050 var family: os.sa_family_t = os.AF_INET;1051 var family: os.sa_family_t = os.AF_INET;
10511052
1052 var ns_list = std.ArrayList(IpAddress).init(rc.ns.allocator);1053 var ns_list = std.ArrayList(Address).init(rc.ns.allocator);
1053 defer ns_list.deinit();1054 defer ns_list.deinit();
10541055
1055 try ns_list.resize(rc.ns.len);1056 try ns_list.resize(rc.ns.len);
...@@ -1065,8 +1066,8 @@ fn resMSendRc(...@@ -1065,8 +1066,8 @@ fn resMSendRc(
1065 }1066 }
10661067
1067 // Get local address and open/bind a socket1068 // Get local address and open/bind a socket
1068 var sa: IpAddress = undefined;1069 var sa: Address = undefined;
1069 @memset(@ptrCast([*]u8, &sa), 0, @sizeOf(IpAddress));1070 @memset(@ptrCast([*]u8, &sa), 0, @sizeOf(Address));
1070 sa.any.family = family;1071 sa.any.family = family;
1071 const flags = os.SOCK_DGRAM | os.SOCK_CLOEXEC | os.SOCK_NONBLOCK;1072 const flags = os.SOCK_DGRAM | os.SOCK_CLOEXEC | os.SOCK_NONBLOCK;
1072 const fd = os.socket(family, flags, 0) catch |err| switch (err) {1073 const fd = os.socket(family, flags, 0) catch |err| switch (err) {
...@@ -1224,7 +1225,7 @@ fn dnsParseCallback(ctx: dpc_ctx, rr: u8, data: []const u8, packet: []const u8)...@@ -1224,7 +1225,7 @@ fn dnsParseCallback(ctx: dpc_ctx, rr: u8, data: []const u8, packet: []const u8)
1224 const new_addr = try ctx.addrs.addOne();1225 const new_addr = try ctx.addrs.addOne();
1225 new_addr.* = LookupAddr{1226 new_addr.* = LookupAddr{
1226 // TODO slice [0..4] to make this *[4]u8 without @ptrCast1227 // TODO slice [0..4] to make this *[4]u8 without @ptrCast
1227 .addr = IpAddress.initIp4(@ptrCast(*const [4]u8, data.ptr).*, ctx.port),1228 .addr = Address.initIp4(@ptrCast(*const [4]u8, data.ptr).*, ctx.port),
1228 };1229 };
1229 },1230 },
1230 os.RR_AAAA => {1231 os.RR_AAAA => {
...@@ -1232,7 +1233,7 @@ fn dnsParseCallback(ctx: dpc_ctx, rr: u8, data: []const u8, packet: []const u8)...@@ -1232,7 +1233,7 @@ fn dnsParseCallback(ctx: dpc_ctx, rr: u8, data: []const u8, packet: []const u8)
1232 const new_addr = try ctx.addrs.addOne();1233 const new_addr = try ctx.addrs.addOne();
1233 new_addr.* = LookupAddr{1234 new_addr.* = LookupAddr{
1234 // TODO slice [0..16] to make this *[16]u8 without @ptrCast1235 // TODO slice [0..16] to make this *[16]u8 without @ptrCast
1235 .addr = IpAddress.initIp6(@ptrCast(*const [16]u8, data.ptr).*, ctx.port, 0, 0),1236 .addr = Address.initIp6(@ptrCast(*const [16]u8, data.ptr).*, ctx.port, 0, 0),
1236 };1237 };
1237 },1238 },
1238 os.RR_CNAME => {1239 os.RR_CNAME => {
...@@ -1253,7 +1254,7 @@ pub const TcpServer = struct {...@@ -1253,7 +1254,7 @@ pub const TcpServer = struct {
1253 kernel_backlog: u32,1254 kernel_backlog: u32,
12541255
1255 /// `undefined` until `listen` returns successfully.1256 /// `undefined` until `listen` returns successfully.
1256 listen_address: IpAddress,1257 listen_address: Address,
12571258
1258 sockfd: ?os.fd_t,1259 sockfd: ?os.fd_t,
12591260
...@@ -1280,7 +1281,7 @@ pub const TcpServer = struct {...@@ -1280,7 +1281,7 @@ pub const TcpServer = struct {
1280 self.* = undefined;1281 self.* = undefined;
1281 }1282 }
12821283
1283 pub fn listen(self: *TcpServer, address: IpAddress) !void {1284 pub fn listen(self: *TcpServer, address: Address) !void {
1284 const nonblock = if (std.io.is_async) os.SOCK_NONBLOCK else 0;1285 const nonblock = if (std.io.is_async) os.SOCK_NONBLOCK else 0;
1285 const sock_flags = os.SOCK_STREAM | os.SOCK_CLOEXEC | nonblock;1286 const sock_flags = os.SOCK_STREAM | os.SOCK_CLOEXEC | nonblock;
1286 const sockfd = try os.socket(os.AF_INET, sock_flags, os.IPPROTO_TCP);1287 const sockfd = try os.socket(os.AF_INET, sock_flags, os.IPPROTO_TCP);
...@@ -1330,8 +1331,8 @@ pub const TcpServer = struct {...@@ -1330,8 +1331,8 @@ pub const TcpServer = struct {
1330 pub fn accept(self: *TcpServer) AcceptError!fs.File {1331 pub fn accept(self: *TcpServer) AcceptError!fs.File {
1331 const nonblock = if (std.io.is_async) os.SOCK_NONBLOCK else 0;1332 const nonblock = if (std.io.is_async) os.SOCK_NONBLOCK else 0;
1332 const accept_flags = nonblock | os.SOCK_CLOEXEC;1333 const accept_flags = nonblock | os.SOCK_CLOEXEC;
1333 var accepted_addr: IpAddress = undefined;1334 var accepted_addr: Address = undefined;
1334 var adr_len: os.socklen_t = @sizeOf(IpAddress);1335 var adr_len: os.socklen_t = @sizeOf(Address);
1335 if (os.accept4(self.sockfd.?, &accepted_addr.any, &adr_len, accept_flags)) |fd| {1336 if (os.accept4(self.sockfd.?, &accepted_addr.any, &adr_len, accept_flags)) |fd| {
1336 return fs.File.openHandle(fd);1337 return fs.File.openHandle(fd);
1337 } else |err| switch (err) {1338 } else |err| switch (err) {
lib/std/net/test.zig+15-15
...@@ -28,17 +28,17 @@ test "parse and render IPv6 addresses" {...@@ -28,17 +28,17 @@ test "parse and render IPv6 addresses" {
28 "::ffff:123.5.123.5",28 "::ffff:123.5.123.5",
29 };29 };
30 for (ips) |ip, i| {30 for (ips) |ip, i| {
31 var addr = net.IpAddress.parseIp6(ip, 0) catch unreachable;31 var addr = net.Address.parseIp6(ip, 0) catch unreachable;
32 var newIp = std.fmt.bufPrint(buffer[0..], "{}", addr) catch unreachable;32 var newIp = std.fmt.bufPrint(buffer[0..], "{}", addr) catch unreachable;
33 std.testing.expect(std.mem.eql(u8, printed[i], newIp[1 .. newIp.len - 3]));33 std.testing.expect(std.mem.eql(u8, printed[i], newIp[1 .. newIp.len - 3]));
34 }34 }
3535
36 testing.expectError(error.InvalidCharacter, net.IpAddress.parseIp6(":::", 0));36 testing.expectError(error.InvalidCharacter, net.Address.parseIp6(":::", 0));
37 testing.expectError(error.Overflow, net.IpAddress.parseIp6("FF001::FB", 0));37 testing.expectError(error.Overflow, net.Address.parseIp6("FF001::FB", 0));
38 testing.expectError(error.InvalidCharacter, net.IpAddress.parseIp6("FF01::Fb:zig", 0));38 testing.expectError(error.InvalidCharacter, net.Address.parseIp6("FF01::Fb:zig", 0));
39 testing.expectError(error.InvalidEnd, net.IpAddress.parseIp6("FF01:0:0:0:0:0:0:FB:", 0));39 testing.expectError(error.InvalidEnd, net.Address.parseIp6("FF01:0:0:0:0:0:0:FB:", 0));
40 testing.expectError(error.Incomplete, net.IpAddress.parseIp6("FF01:", 0));40 testing.expectError(error.Incomplete, net.Address.parseIp6("FF01:", 0));
41 testing.expectError(error.InvalidIpv4Mapping, net.IpAddress.parseIp6("::123.123.123.123", 0));41 testing.expectError(error.InvalidIpv4Mapping, net.Address.parseIp6("::123.123.123.123", 0));
42}42}
4343
44test "parse and render IPv4 addresses" {44test "parse and render IPv4 addresses" {
...@@ -50,16 +50,16 @@ test "parse and render IPv4 addresses" {...@@ -50,16 +50,16 @@ test "parse and render IPv4 addresses" {
50 "123.255.0.91",50 "123.255.0.91",
51 "127.0.0.1",51 "127.0.0.1",
52 }) |ip| {52 }) |ip| {
53 var addr = net.IpAddress.parseIp4(ip, 0) catch unreachable;53 var addr = net.Address.parseIp4(ip, 0) catch unreachable;
54 var newIp = std.fmt.bufPrint(buffer[0..], "{}", addr) catch unreachable;54 var newIp = std.fmt.bufPrint(buffer[0..], "{}", addr) catch unreachable;
55 std.testing.expect(std.mem.eql(u8, ip, newIp[0 .. newIp.len - 2]));55 std.testing.expect(std.mem.eql(u8, ip, newIp[0 .. newIp.len - 2]));
56 }56 }
5757
58 testing.expectError(error.Overflow, net.IpAddress.parseIp4("256.0.0.1", 0));58 testing.expectError(error.Overflow, net.Address.parseIp4("256.0.0.1", 0));
59 testing.expectError(error.InvalidCharacter, net.IpAddress.parseIp4("x.0.0.1", 0));59 testing.expectError(error.InvalidCharacter, net.Address.parseIp4("x.0.0.1", 0));
60 testing.expectError(error.InvalidEnd, net.IpAddress.parseIp4("127.0.0.1.1", 0));60 testing.expectError(error.InvalidEnd, net.Address.parseIp4("127.0.0.1.1", 0));
61 testing.expectError(error.Incomplete, net.IpAddress.parseIp4("127.0.0.", 0));61 testing.expectError(error.Incomplete, net.Address.parseIp4("127.0.0.", 0));
62 testing.expectError(error.InvalidCharacter, net.IpAddress.parseIp4("100..0.1", 0));62 testing.expectError(error.InvalidCharacter, net.Address.parseIp4("100..0.1", 0));
63}63}
6464
65test "resolve DNS" {65test "resolve DNS" {
...@@ -91,7 +91,7 @@ test "listen on a port, send bytes, receive bytes" {...@@ -91,7 +91,7 @@ test "listen on a port, send bytes, receive bytes" {
91 }91 }
9292
93 // TODO doing this at comptime crashed the compiler93 // TODO doing this at comptime crashed the compiler
94 const localhost = net.IpAddress.parse("127.0.0.1", 0);94 const localhost = net.Address.parse("127.0.0.1", 0);
9595
96 var server = net.TcpServer.init(net.TcpServer.Options{});96 var server = net.TcpServer.init(net.TcpServer.Options{});
97 defer server.deinit();97 defer server.deinit();
...@@ -104,7 +104,7 @@ test "listen on a port, send bytes, receive bytes" {...@@ -104,7 +104,7 @@ test "listen on a port, send bytes, receive bytes" {
104 try await client_frame;104 try await client_frame;
105}105}
106106
107fn testClient(addr: net.IpAddress) anyerror!void {107fn testClient(addr: net.Address) anyerror!void {
108 const socket_file = try net.tcpConnectToAddress(addr);108 const socket_file = try net.tcpConnectToAddress(addr);
109 defer socket_file.close();109 defer socket_file.close();
110110