zig

commit c75ae8b66d57d9e7c195121e1d8d8ff5ca98e73d (tree)
parent 785a6c1aa9a7979a962db9d741a53897c423cb92
Author: lithdew <kenta@lithdew.net>
Date:   Wed,  5 May 2021 16:09:08 +0900

x/net: fix tcp tests for openbsd and add missing `fmt` import

On OpenBSD, connecting to a newly-allocated port on an unspecified IPv4
host address causes EINVAL. This was found by @mikdusan when running TCP
tests on OpenBSD.

This commit fixes TCP tests on OpenBSD by having all tests that allocate
a new host-port pair to have the host IPv4/IPv6 address point to the
host's loopback adapter (on localhost).

Diffstat:
M
lib/std/x/net/ip.zig
 | 
2
++
M
lib/std/x/net/tcp.zig
 | 
12
++++++++++--
M
lib/std/x/os/Socket.zig
 | 
1
+

3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/lib/std/x/net/ip.zig b/lib/std/x/net/ip.zig
@@ -6,6 +6,8 @@
 
 const std = @import("../../std.zig");
 
+const fmt = std.fmt;
+
 const IPv4 = std.x.os.IPv4;
 const IPv6 = std.x.os.IPv6;
 const Socket = std.x.os.Socket;
diff --git a/lib/std/x/net/tcp.zig b/lib/std/x/net/tcp.zig
@@ -282,7 +282,11 @@ test "tcp: create client/listener pair" {
     try listener.bind(ip.Address.initIPv4(IPv4.unspecified, 0));
     try listener.listen(128);
 
-    const binded_address = try listener.getLocalAddress();
+    var binded_address = try listener.getLocalAddress();
+    switch (binded_address) {
+        .ipv4 => |*ipv4| ipv4.host = IPv4.localhost,
+        .ipv6 => |*ipv6| ipv6.host = IPv6.localhost,
+    }
 
     const client = try tcp.Client.init(.ip, os.SOCK_CLOEXEC);
     defer client.deinit();
@@ -302,7 +306,11 @@ test "tcp/client: set read timeout of 1 millisecond on blocking client" {
     try listener.bind(ip.Address.initIPv4(IPv4.unspecified, 0));
     try listener.listen(128);
 
-    const binded_address = try listener.getLocalAddress();
+    var binded_address = try listener.getLocalAddress();
+    switch (binded_address) {
+        .ipv4 => |*ipv4| ipv4.host = IPv4.localhost,
+        .ipv6 => |*ipv6| ipv6.host = IPv6.localhost,
+    }
 
     const client = try tcp.Client.init(.ip, os.SOCK_CLOEXEC);
     defer client.deinit();
diff --git a/lib/std/x/os/Socket.zig b/lib/std/x/os/Socket.zig
@@ -8,6 +8,7 @@ const std = @import("../../std.zig");
 const net = @import("net.zig");
 
 const os = std.os;
+const fmt = std.fmt;
 const mem = std.mem;
 const time = std.time;