aboutsummaryrefslogtreecommitdiff
path: root/lib/std/net.zig
diff options
context:
space:
mode:
authorLoris Cro <kappaloris@gmail.com>2020-06-16 22:39:09 +0200
committerLoris Cro <kappaloris@gmail.com>2020-09-24 21:56:27 +0200
commit730428bfd615cab415b2942fc9b781428a0ff692 (patch)
tree9741033742a82f8f3023acd9d1dfde790ec0c0ba /lib/std/net.zig
parente85c89630e78ccc0e4bab44064779a07a029cecd (diff)
downloadzig-730428bfd615cab415b2942fc9b781428a0ff692.tar.gz
zig-730428bfd615cab415b2942fc9b781428a0ff692.zip
connect
Signed-off-by: Loris Cro <kappaloris@gmail.com>
Diffstat (limited to 'lib/std/net.zig')
-rw-r--r--lib/std/net.zig18
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/std/net.zig b/lib/std/net.zig
index 6b6d234843..928ebbbce5 100644
--- a/lib/std/net.zig
+++ b/lib/std/net.zig
@@ -614,11 +614,11 @@ pub fn connectUnixSocket(path: []const u8) !fs.File {
var addr = try std.net.Address.initUnix(path);
- try os.connect(
- sockfd,
- &addr.any,
- addr.getOsSockLen(),
- );
+ if (std.io.is_async) {
+ try loop.connect(sockfd, &addr.any, addr.getOsSockLen());
+ } else {
+ try os.connect(sockfd, &addr.any, addr.getOsSockLen());
+ }
return fs.File{
.handle = sockfd,
@@ -677,7 +677,13 @@ pub fn tcpConnectToAddress(address: Address) !fs.File {
(if (builtin.os.tag == .windows) 0 else os.SOCK_CLOEXEC);
const sockfd = try os.socket(address.any.family, sock_flags, os.IPPROTO_TCP);
errdefer os.close(sockfd);
- try os.connect(sockfd, &address.any, address.getOsSockLen());
+
+ if (std.io.is_async) {
+ const loop = std.event.Loop.instance orelse return error.WouldBlock;
+ try loop.connect(sockfd, &address.any, address.getOsSockLen());
+ } else {
+ try os.connect(sockfd, &address.any, address.getOsSockLen());
+ }
return fs.File{ .handle = sockfd };
}