authorgravatar for git@l4.pmLuna <git@l4.pm> 2020-03-30 17:06:45-03:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-06-02 14:56:06-04:00
logcb649b769c4a8d1d5d703994976c2c9e4ae4e03b
treed29373e45bccffc7d9c55b0b996392588663fb17
parentc50ac9a764c9022e69c9885b17083d70223cb1aa

Fix ifreq definition

2 files changed, 10 insertions(+), 10 deletions(-)

lib/std/net.zig+1-1
......@@ -551,7 +551,7 @@ fn if_nametoindex(name: []const u8) !u32 {
551551 else => {},
552552 }
553553
554 std.debug.warn("ival={}\n", .{ifr.ifr_ifru.ifru_ivalue});
554 std.debug.warn("ival={}, rest={}\n", .{ ifr.ifr_ifru.ifru_ivalue, ifr.ifr_ifru });
555555
556556 return @bitCast(u32, ifr.ifr_ifru.ifru_ivalue);
557557}
lib/std/os/bits/linux.zig+9-9
......@@ -1709,31 +1709,31 @@ pub const termios = extern struct {
17091709pub const SIOCGIFINDEX = 0x8933;
17101710pub const IFNAMESIZE = 16;
17111711
1712pub const ifmap = struct {
1713 mem_start: u32,
1714 mem_end: u32,
1715 base_addr: i16,
1712pub const ifmap = extern struct {
1713 mem_start: c_ulong,
1714 mem_end: c_ulong,
1715 base_addr: c_ushort,
17161716 irq: u8,
17171717 dma: u8,
17181718 port: u8,
17191719};
17201720
1721pub const ifreq = extern union {
1722 ifr_ifrn: struct {
1721pub const ifreq = extern struct {
1722 ifr_ifrn: extern union {
17231723 name: [IFNAMESIZE]u8,
17241724 },
1725 ifr_ifru: struct {
1725 ifr_ifru: extern union {
17261726 ifru_addr: sockaddr,
17271727 ifru_dstaddr: sockaddr,
17281728 ifru_broadaddr: sockaddr,
17291729 ifru_netmask: sockaddr,
17301730 ifru_hwaddr: sockaddr,
1731 ifru_flags: i16,
1731 ifru_flags: c_short,
17321732 ifru_ivalue: i32,
17331733 ifru_mtu: i32,
17341734 ifru_map: ifmap,
17351735 ifru_slave: [IFNAMESIZE]u8,
17361736 ifru_newname: [IFNAMESIZE]u8,
1737 ifru_data: [*:0]u8,
1737 ifru_data: [*c]u8,
17381738 },
17391739};