authorgravatar for git@l4.pmLuna <git@l4.pm> 2020-04-20 16:37:16-03:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-06-02 14:56:19-04:00
log09c01ea7b9a8d80f3ad0eec1e20303996fdcba9b
tree84bdd86619385bc190c59bff2477740428dfd9c2
parentc8468bed42db773cc0622c6ea2e18d5e17808f2b

Use resolveIp when looking up addresses on linux

1 files changed, 3 insertions(+), 2 deletions(-)

lib/std/net.zig+3-2
......@@ -61,6 +61,7 @@ pub const Address = extern union {
6161 error.Incomplete,
6262 error.InvalidIpv4Mapping,
6363 => {},
64 else => return err,
6465 }
6566
6667 return error.InvalidIPAddressFormat;
......@@ -545,7 +546,7 @@ fn if_nametoindex(name: []const u8) !u32 {
545546 std.mem.copy(u8, &ifr.ifr_ifrn.name, name);
546547 ifr.ifr_ifrn.name[name.len] = 0;
547548
548 std.os.ioctl(sockfd, os.linux.SIOCGIFINDEX, @ptrToInt(&ifr)) catch |err| {
549 os.ioctl(sockfd, os.linux.SIOCGIFINDEX, @ptrToInt(&ifr)) catch |err| {
549550 switch (err) {
550551 error.NoDevice => return error.InterfaceNotFound,
551552 else => return err,
......@@ -1246,7 +1247,7 @@ fn linuxLookupNameFromNumericUnspec(
12461247 name: []const u8,
12471248 port: u16,
12481249) !void {
1249 const addr = try Address.parseIp(name, port);
1250 const addr = try Address.resolveIp(name, port);
12501251 (try addrs.addOne()).* = LookupAddr{ .addr = addr };
12511252}
12521253