Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'testAddresses' of https://github.com/marler8997/zig into std.net

master
Andrew Kelley 2019-10-30 12:33:47 -04:00
parent 0fb1388031 4e0c2ed443
commit f5ff36271b
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/std/net.zig
View File

@ -29,16 +29,30 @@ pub const Address = struct {
//pub const localhost = initIp4(parseIp4("127.0.0.1") catch unreachable, 0);
pub fn initIp4(ip4: u32, _port: u16) Address {
return Address{
.os_addr = os.sockaddr{
.in = os.sockaddr_in{
.family = os.AF_INET,
.port = mem.nativeToBig(u16, _port),
.addr = ip4,
.zero = [_]u8{0} ** 8,
switch (builtin.os) {
.macosx, .ios, .watchos, .tvos, .freebsd, .netbsd => return Address{
.os_addr = os.sockaddr{
.in = os.sockaddr_in{
.len = @sizeOf(os.sockaddr_in),
.family = os.AF_INET,
.port = mem.nativeToBig(u16, _port),
.addr = ip4,
.zero = [_]u8{0} ** 8,
},
},
},
};
.linux => return Address{
.os_addr = os.sockaddr{
.in = os.sockaddr_in{
.family = os.AF_INET,
.port = mem.nativeToBig(u16, _port),
.addr = ip4,
.zero = [_]u8{0} ** 8,
},
},
},
else => @compileError("Address.initIp4 not implemented for this platform"),
}
}
pub fn initIp6(ip6: Ip6Addr, _port: u16) Address {

18
lib/std/net/test.zig
View File

@ -3,7 +3,7 @@ const net = std.net;
const mem = std.mem;
const testing = std.testing;
test "std.net.parseIp4" {
test "parseIp4" {
testing.expect((try net.parseIp4("127.0.0.1")) == mem.bigToNative(u32, 0x7f000001));
testParseIp4Fail("256.0.0.1", error.Overflow);
@ -21,7 +21,7 @@ fn testParseIp4Fail(buf: []const u8, expected_err: anyerror) void {
}
}
test "std.net.parseIp6" {
test "parseIp6" {
const ip6 = try net.parseIp6("FF01:0:0:0:0:0:0:FB");
const addr = net.Address.initIp6(ip6, 80);
var buf: [100]u8 = undefined;
@ -29,6 +29,20 @@ test "std.net.parseIp6" {
std.testing.expect(mem.eql(u8, "[ff01::fb]:80", printed));
}
test "ip4s" {
var buffer: [18]u8 = undefined;
for ([_][]const u8{
"0.0.0.0",
"255.255.255.255",
"1.2.3.4",
"123.255.0.91",
}) |ip| {
var addr = Address.initIp4(parseIp4(ip) catch unreachable, 0);
var newIp = std.fmt.bufPrint(buffer[0..], "{}", addr) catch unreachable;
std.testing.expect(std.mem.eql(u8, ip, newIp[0 .. newIp.len - 2]));
}
}
test "resolve DNS" {
if (std.builtin.os == .windows) {
// DNS resolution not implemented on Windows yet.