diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-03-17 17:13:26 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-03-17 21:19:13 +0100 |
| commit | 97bc55cead011ec5d60af8c3696ee2724b78fea5 (patch) | |
| tree | e59b94f9ea8d5631fdc1c3e16f5cb60b5b84cb33 /sys/linux | |
| parent | 61e9cc09afc5bf1afdd993a6863ba063b07f0bb2 (diff) | |
pkg/compiler: check that flags values fit into base type
flags[foo, int8]
foo = 0x12345678
is always an error, detect these cases.
Found some bugs in mptcp, packet sockets, kvm.
Diffstat (limited to 'sys/linux')
| -rw-r--r-- | sys/linux/dev_kvm.txt | 2 | ||||
| -rw-r--r-- | sys/linux/gen/386.go | 21 | ||||
| -rw-r--r-- | sys/linux/gen/amd64.go | 21 | ||||
| -rw-r--r-- | sys/linux/gen/arm.go | 21 | ||||
| -rw-r--r-- | sys/linux/gen/arm64.go | 19 | ||||
| -rw-r--r-- | sys/linux/gen/mips64le.go | 19 | ||||
| -rw-r--r-- | sys/linux/gen/ppc64le.go | 21 | ||||
| -rw-r--r-- | sys/linux/mptcp.txt | 5 | ||||
| -rw-r--r-- | sys/linux/netfilter.txt | 6 | ||||
| -rw-r--r-- | sys/linux/socket_netlink_route.txt | 3 | ||||
| -rw-r--r-- | sys/linux/socket_packet.txt | 8 |
11 files changed, 72 insertions, 74 deletions
diff --git a/sys/linux/dev_kvm.txt b/sys/linux/dev_kvm.txt index eba775bd0..7b67c9d5d 100644 --- a/sys/linux/dev_kvm.txt +++ b/sys/linux/dev_kvm.txt @@ -654,7 +654,7 @@ kvm_segment { kvm_dtable { base flags[kvm_guest_addrs, int64] - limit flags[kvm_guest_addrs, int16] + limit int16 pad array[const[0, int16], 3] } diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go index 3825f9735..fc91da95e 100644 --- a/sys/linux/gen/386.go +++ b/sys/linux/gen/386.go @@ -9249,14 +9249,14 @@ var structDescs_386 = []*KeyedStruct{ {StructKey{Name: "ifaddrmsg[AF_INET6]"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "ifaddrmsg[AF_INET6]", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "ifa_family", TypeSize: 1}}, Val: 10}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_prefixlen", FldName: "ifa_prefixlen", TypeSize: 1}}, Vals: []uint64{0, 1, 8, 16, 24, 31, 32, 56, 63, 64, 120, 128}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags8", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "rt_scope_t", FldName: "ifa_scope", TypeSize: 1}}, Vals: []uint64{0, 200, 253, 254, 255}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}}, }}}, {StructKey{Name: "ifaddrmsg[AF_INET]"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "ifaddrmsg[AF_INET]", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "ifa_family", TypeSize: 1}}, Val: 2}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_prefixlen", FldName: "ifa_prefixlen", TypeSize: 1}}, Vals: []uint64{0, 1, 8, 16, 24, 31, 32, 56, 63, 64, 120, 128}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags8", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "rt_scope_t", FldName: "ifa_scope", TypeSize: 1}}, Vals: []uint64{0, 200, 253, 254, 255}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}}, }}}, @@ -13202,12 +13202,12 @@ var structDescs_386 = []*KeyedStruct{ }}}, {StructKey{Name: "kvm_dtable"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_dtable", TypeSize: 16}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "base", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "limit", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "limit", TypeSize: 2}}}, &ArrayType{TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 6}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 2}}}, 1, 3, 3}, }}}, {StructKey{"kvm_dtable", 1}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_dtable", TypeSize: 16, ArgDir: 1}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "base", TypeSize: 8, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "limit", TypeSize: 2, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "limit", TypeSize: 2, ArgDir: 1}}}, &ArrayType{TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 6, ArgDir: 1}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 2, ArgDir: 1}}}, 1, 3, 3}, }}}, {StructKey{Name: "kvm_enable_cap_cpu"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_enable_cap_cpu", TypeSize: 104}, Fields: []Type{ @@ -14614,7 +14614,7 @@ var structDescs_386 = []*KeyedStruct{ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "receiver", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64be", TypeSize: 8}, ArgFormat: 1}}, Kind: 1, RangeEnd: 1}, }}}, {StructKey{Name: "mptcp_generic_option"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "mptcp_generic_option", IsVarlen: true}, Fields: []Type{ - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "mptcp_sub_types", FldName: "type", TypeSize: 1}}, []uint64{1, 2, 4, 8, 32, 64, 128, 256}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "mptcp_sub_types", FldName: "type", TypeSize: 1}}, []uint64{1, 2, 4, 8, 32, 64, 128}, true}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "length", TypeSize: 1}}, Path: []string{"parent"}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 16}, }}}, @@ -37212,9 +37212,8 @@ var structDescs_386 = []*KeyedStruct{ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "wqid", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "p9_qid"}}}, }}}, {StructKey{Name: "packet_fanout_val"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "packet_fanout_val", TypeSize: 4}, Fields: []Type{ - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "id", TypeSize: 2}}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_types", FldName: "type", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_flags", FldName: "flags", TypeSize: 1}}, []uint64{4096, 8192, 32768}, true}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "id", TypeSize: 2}}, Kind: 1, RangeEnd: 4}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_types", FldName: "type", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 4096, 8192, 32768}}, }}}, {StructKey{Name: "packet_mreq"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "packet_mreq", TypeSize: 16}, Fields: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "mr_ifindex", TypeSize: 4}}, @@ -47610,8 +47609,8 @@ var structDescs_386 = []*KeyedStruct{ }}}, {StructKey{Name: "xt_conntrack_mtinfo1"}, &StructDesc{TypeCommon{TypeName: "xt_conntrack_mtinfo1", TypeSize: 152}, []Type{ &StructType{Key: StructKey{Name: "xt_conntrack_mtinfo_common"}, FldName: "common"}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_state", FldName: "state_mask", TypeSize: 1}}, []uint64{1, 64, 128, 256}, true}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_status", FldName: "status_mask", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_state8", FldName: "state_mask", TypeSize: 1}}, []uint64{1, 64, 128}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_status8", FldName: "status_mask", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, }, 4}}, {StructKey{Name: "xt_conntrack_mtinfo2"}, &StructDesc{TypeCommon{TypeName: "xt_conntrack_mtinfo2", TypeSize: 156}, []Type{ &StructType{Key: StructKey{Name: "xt_conntrack_mtinfo_common"}, FldName: "common"}, @@ -77592,4 +77591,4 @@ var consts_386 = []ConstValue{ {"ethtool_per_queue_op_size", 128}, } -const revision_386 = "7b2ff21add1b93e31ac4f6c8366cc01f609c8273" +const revision_386 = "3e11e082d244cd0a541b74f364178ddba58f761d" diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go index c49a5e56f..c5f1cbabc 100644 --- a/sys/linux/gen/amd64.go +++ b/sys/linux/gen/amd64.go @@ -9395,14 +9395,14 @@ var structDescs_amd64 = []*KeyedStruct{ {StructKey{Name: "ifaddrmsg[AF_INET6]"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "ifaddrmsg[AF_INET6]", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "ifa_family", TypeSize: 1}}, Val: 10}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_prefixlen", FldName: "ifa_prefixlen", TypeSize: 1}}, Vals: []uint64{0, 1, 8, 16, 24, 31, 32, 56, 63, 64, 120, 128}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags8", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "rt_scope_t", FldName: "ifa_scope", TypeSize: 1}}, Vals: []uint64{0, 200, 253, 254, 255}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}}, }}}, {StructKey{Name: "ifaddrmsg[AF_INET]"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "ifaddrmsg[AF_INET]", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "ifa_family", TypeSize: 1}}, Val: 2}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_prefixlen", FldName: "ifa_prefixlen", TypeSize: 1}}, Vals: []uint64{0, 1, 8, 16, 24, 31, 32, 56, 63, 64, 120, 128}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags8", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "rt_scope_t", FldName: "ifa_scope", TypeSize: 1}}, Vals: []uint64{0, 200, 253, 254, 255}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}}, }}}, @@ -13366,12 +13366,12 @@ var structDescs_amd64 = []*KeyedStruct{ }}}, {StructKey{Name: "kvm_dtable"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_dtable", TypeSize: 16}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "base", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "limit", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "limit", TypeSize: 2}}}, &ArrayType{TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 6}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 2}}}, 1, 3, 3}, }}}, {StructKey{"kvm_dtable", 1}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_dtable", TypeSize: 16, ArgDir: 1}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "base", TypeSize: 8, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "limit", TypeSize: 2, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "limit", TypeSize: 2, ArgDir: 1}}}, &ArrayType{TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 6, ArgDir: 1}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 2, ArgDir: 1}}}, 1, 3, 3}, }}}, {StructKey{Name: "kvm_enable_cap_cpu"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_enable_cap_cpu", TypeSize: 104}, Fields: []Type{ @@ -14787,7 +14787,7 @@ var structDescs_amd64 = []*KeyedStruct{ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "receiver", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64be", TypeSize: 8}, ArgFormat: 1}}, Kind: 1, RangeEnd: 1}, }}}, {StructKey{Name: "mptcp_generic_option"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "mptcp_generic_option", IsVarlen: true}, Fields: []Type{ - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "mptcp_sub_types", FldName: "type", TypeSize: 1}}, []uint64{1, 2, 4, 8, 32, 64, 128, 256}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "mptcp_sub_types", FldName: "type", TypeSize: 1}}, []uint64{1, 2, 4, 8, 32, 64, 128}, true}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "length", TypeSize: 1}}, Path: []string{"parent"}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 16}, }}}, @@ -37968,9 +37968,8 @@ var structDescs_amd64 = []*KeyedStruct{ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "wqid", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "p9_qid"}}}, }}}, {StructKey{Name: "packet_fanout_val"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "packet_fanout_val", TypeSize: 4}, Fields: []Type{ - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "id", TypeSize: 2}}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_types", FldName: "type", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_flags", FldName: "flags", TypeSize: 1}}, []uint64{4096, 8192, 32768}, true}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "id", TypeSize: 2}}, Kind: 1, RangeEnd: 4}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_types", FldName: "type", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 4096, 8192, 32768}}, }}}, {StructKey{Name: "packet_mreq"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "packet_mreq", TypeSize: 16}, Fields: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "mr_ifindex", TypeSize: 4}}, @@ -48486,8 +48485,8 @@ var structDescs_amd64 = []*KeyedStruct{ }}}, {StructKey{Name: "xt_conntrack_mtinfo1"}, &StructDesc{TypeCommon{TypeName: "xt_conntrack_mtinfo1", TypeSize: 152}, []Type{ &StructType{Key: StructKey{Name: "xt_conntrack_mtinfo_common"}, FldName: "common"}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_state", FldName: "state_mask", TypeSize: 1}}, []uint64{1, 64, 128, 256}, true}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_status", FldName: "status_mask", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_state8", FldName: "state_mask", TypeSize: 1}}, []uint64{1, 64, 128}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_status8", FldName: "status_mask", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, }, 4}}, {StructKey{Name: "xt_conntrack_mtinfo2"}, &StructDesc{TypeCommon{TypeName: "xt_conntrack_mtinfo2", TypeSize: 156}, []Type{ &StructType{Key: StructKey{Name: "xt_conntrack_mtinfo_common"}, FldName: "common"}, @@ -78632,4 +78631,4 @@ var consts_amd64 = []ConstValue{ {"ethtool_per_queue_op_size", 128}, } -const revision_amd64 = "a29ff0c81a5e44bc22f432944a60e6b6c53e738f" +const revision_amd64 = "23cf7cfbfb32ba400830bdf394c116930682f977" diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go index 44b115c25..74128a38d 100644 --- a/sys/linux/gen/arm.go +++ b/sys/linux/gen/arm.go @@ -9286,14 +9286,14 @@ var structDescs_arm = []*KeyedStruct{ {StructKey{Name: "ifaddrmsg[AF_INET6]"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "ifaddrmsg[AF_INET6]", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "ifa_family", TypeSize: 1}}, Val: 10}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_prefixlen", FldName: "ifa_prefixlen", TypeSize: 1}}, Vals: []uint64{0, 1, 8, 16, 24, 31, 32, 56, 63, 64, 120, 128}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags8", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "rt_scope_t", FldName: "ifa_scope", TypeSize: 1}}, Vals: []uint64{0, 200, 253, 254, 255}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}}, }}}, {StructKey{Name: "ifaddrmsg[AF_INET]"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "ifaddrmsg[AF_INET]", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "ifa_family", TypeSize: 1}}, Val: 2}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_prefixlen", FldName: "ifa_prefixlen", TypeSize: 1}}, Vals: []uint64{0, 1, 8, 16, 24, 31, 32, 56, 63, 64, 120, 128}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags8", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "rt_scope_t", FldName: "ifa_scope", TypeSize: 1}}, Vals: []uint64{0, 200, 253, 254, 255}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}}, }}}, @@ -13192,12 +13192,12 @@ var structDescs_arm = []*KeyedStruct{ }}}, {StructKey{Name: "kvm_dtable"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_dtable", TypeSize: 16}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "base", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "limit", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "limit", TypeSize: 2}}}, &ArrayType{TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 6}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 2}}}, 1, 3, 3}, }}}, {StructKey{"kvm_dtable", 1}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_dtable", TypeSize: 16, ArgDir: 1}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "base", TypeSize: 8, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "limit", TypeSize: 2, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "limit", TypeSize: 2, ArgDir: 1}}}, &ArrayType{TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 6, ArgDir: 1}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 2, ArgDir: 1}}}, 1, 3, 3}, }}}, {StructKey{Name: "kvm_enable_cap_cpu"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_enable_cap_cpu", TypeSize: 104}, Fields: []Type{ @@ -14475,7 +14475,7 @@ var structDescs_arm = []*KeyedStruct{ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "receiver", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64be", TypeSize: 8}, ArgFormat: 1}}, Kind: 1, RangeEnd: 1}, }}}, {StructKey{Name: "mptcp_generic_option"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "mptcp_generic_option", IsVarlen: true}, Fields: []Type{ - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "mptcp_sub_types", FldName: "type", TypeSize: 1}}, []uint64{1, 2, 4, 8, 32, 64, 128, 256}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "mptcp_sub_types", FldName: "type", TypeSize: 1}}, []uint64{1, 2, 4, 8, 32, 64, 128}, true}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "length", TypeSize: 1}}, Path: []string{"parent"}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 16}, }}}, @@ -37074,9 +37074,8 @@ var structDescs_arm = []*KeyedStruct{ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "wqid", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "p9_qid"}}}, }}}, {StructKey{Name: "packet_fanout_val"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "packet_fanout_val", TypeSize: 4}, Fields: []Type{ - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "id", TypeSize: 2}}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_types", FldName: "type", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_flags", FldName: "flags", TypeSize: 1}}, []uint64{4096, 8192, 32768}, true}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "id", TypeSize: 2}}, Kind: 1, RangeEnd: 4}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_types", FldName: "type", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 4096, 8192, 32768}}, }}}, {StructKey{Name: "packet_mreq"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "packet_mreq", TypeSize: 16}, Fields: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "mr_ifindex", TypeSize: 4}}, @@ -47487,8 +47486,8 @@ var structDescs_arm = []*KeyedStruct{ }}}, {StructKey{Name: "xt_conntrack_mtinfo1"}, &StructDesc{TypeCommon{TypeName: "xt_conntrack_mtinfo1", TypeSize: 152}, []Type{ &StructType{Key: StructKey{Name: "xt_conntrack_mtinfo_common"}, FldName: "common"}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_state", FldName: "state_mask", TypeSize: 1}}, []uint64{1, 64, 128, 256}, true}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_status", FldName: "status_mask", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_state8", FldName: "state_mask", TypeSize: 1}}, []uint64{1, 64, 128}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_status8", FldName: "status_mask", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, }, 4}}, {StructKey{Name: "xt_conntrack_mtinfo2"}, &StructDesc{TypeCommon{TypeName: "xt_conntrack_mtinfo2", TypeSize: 156}, []Type{ &StructType{Key: StructKey{Name: "xt_conntrack_mtinfo_common"}, FldName: "common"}, @@ -77244,4 +77243,4 @@ var consts_arm = []ConstValue{ {"ethtool_per_queue_op_size", 128}, } -const revision_arm = "2c0ba19495146d9f937a05c4b028b32deccfa93f" +const revision_arm = "32b36ea943d76f76b867acf3785f29786bb44137" diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go index 05707f014..6fa1cbf3d 100644 --- a/sys/linux/gen/arm64.go +++ b/sys/linux/gen/arm64.go @@ -9395,14 +9395,14 @@ var structDescs_arm64 = []*KeyedStruct{ {StructKey{Name: "ifaddrmsg[AF_INET6]"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "ifaddrmsg[AF_INET6]", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "ifa_family", TypeSize: 1}}, Val: 10}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_prefixlen", FldName: "ifa_prefixlen", TypeSize: 1}}, Vals: []uint64{0, 1, 8, 16, 24, 31, 32, 56, 63, 64, 120, 128}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags8", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "rt_scope_t", FldName: "ifa_scope", TypeSize: 1}}, Vals: []uint64{0, 200, 253, 254, 255}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}}, }}}, {StructKey{Name: "ifaddrmsg[AF_INET]"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "ifaddrmsg[AF_INET]", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "ifa_family", TypeSize: 1}}, Val: 2}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_prefixlen", FldName: "ifa_prefixlen", TypeSize: 1}}, Vals: []uint64{0, 1, 8, 16, 24, 31, 32, 56, 63, 64, 120, 128}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags8", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "rt_scope_t", FldName: "ifa_scope", TypeSize: 1}}, Vals: []uint64{0, 200, 253, 254, 255}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}}, }}}, @@ -13309,12 +13309,12 @@ var structDescs_arm64 = []*KeyedStruct{ }}}, {StructKey{Name: "kvm_dtable"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_dtable", TypeSize: 16}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "base", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "limit", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "limit", TypeSize: 2}}}, &ArrayType{TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 6}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 2}}}, 1, 3, 3}, }}}, {StructKey{"kvm_dtable", 1}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_dtable", TypeSize: 16, ArgDir: 1}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "base", TypeSize: 8, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "limit", TypeSize: 2, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "limit", TypeSize: 2, ArgDir: 1}}}, &ArrayType{TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 6, ArgDir: 1}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 2, ArgDir: 1}}}, 1, 3, 3}, }}}, {StructKey{Name: "kvm_enable_cap_cpu"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_enable_cap_cpu", TypeSize: 104}, Fields: []Type{ @@ -37777,9 +37777,8 @@ var structDescs_arm64 = []*KeyedStruct{ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "wqid", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "p9_qid"}}}, }}}, {StructKey{Name: "packet_fanout_val"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "packet_fanout_val", TypeSize: 4}, Fields: []Type{ - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "id", TypeSize: 2}}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_types", FldName: "type", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_flags", FldName: "flags", TypeSize: 1}}, []uint64{4096, 8192, 32768}, true}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "id", TypeSize: 2}}, Kind: 1, RangeEnd: 4}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_types", FldName: "type", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 4096, 8192, 32768}}, }}}, {StructKey{Name: "packet_mreq"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "packet_mreq", TypeSize: 16}, Fields: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "mr_ifindex", TypeSize: 4}}, @@ -48270,8 +48269,8 @@ var structDescs_arm64 = []*KeyedStruct{ }}}, {StructKey{Name: "xt_conntrack_mtinfo1"}, &StructDesc{TypeCommon{TypeName: "xt_conntrack_mtinfo1", TypeSize: 152}, []Type{ &StructType{Key: StructKey{Name: "xt_conntrack_mtinfo_common"}, FldName: "common"}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_state", FldName: "state_mask", TypeSize: 1}}, []uint64{1, 64, 128, 256}, true}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_status", FldName: "status_mask", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_state8", FldName: "state_mask", TypeSize: 1}}, []uint64{1, 64, 128}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_status8", FldName: "status_mask", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, }, 4}}, {StructKey{Name: "xt_conntrack_mtinfo2"}, &StructDesc{TypeCommon{TypeName: "xt_conntrack_mtinfo2", TypeSize: 156}, []Type{ &StructType{Key: StructKey{Name: "xt_conntrack_mtinfo_common"}, FldName: "common"}, @@ -77977,4 +77976,4 @@ var consts_arm64 = []ConstValue{ {"ethtool_per_queue_op_size", 128}, } -const revision_arm64 = "5f681c09be55c552ff1d317a4eeebc050f14ed4c" +const revision_arm64 = "1c50b5f40904f5c04c6c1c3f459f86d5068d2218" diff --git a/sys/linux/gen/mips64le.go b/sys/linux/gen/mips64le.go index f9e72ffae..e9d094194 100644 --- a/sys/linux/gen/mips64le.go +++ b/sys/linux/gen/mips64le.go @@ -9392,14 +9392,14 @@ var structDescs_mips64le = []*KeyedStruct{ {StructKey{Name: "ifaddrmsg[AF_INET6]"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "ifaddrmsg[AF_INET6]", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "ifa_family", TypeSize: 1}}, Val: 10}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_prefixlen", FldName: "ifa_prefixlen", TypeSize: 1}}, Vals: []uint64{0, 1, 8, 16, 24, 31, 32, 56, 63, 64, 120, 128}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags8", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "rt_scope_t", FldName: "ifa_scope", TypeSize: 1}}, Vals: []uint64{0, 200, 253, 254, 255}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}}, }}}, {StructKey{Name: "ifaddrmsg[AF_INET]"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "ifaddrmsg[AF_INET]", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "ifa_family", TypeSize: 1}}, Val: 2}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_prefixlen", FldName: "ifa_prefixlen", TypeSize: 1}}, Vals: []uint64{0, 1, 8, 16, 24, 31, 32, 56, 63, 64, 120, 128}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags8", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "rt_scope_t", FldName: "ifa_scope", TypeSize: 1}}, Vals: []uint64{0, 200, 253, 254, 255}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}}, }}}, @@ -13306,12 +13306,12 @@ var structDescs_mips64le = []*KeyedStruct{ }}}, {StructKey{Name: "kvm_dtable"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_dtable", TypeSize: 16}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "base", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "limit", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "limit", TypeSize: 2}}}, &ArrayType{TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 6}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 2}}}, 1, 3, 3}, }}}, {StructKey{"kvm_dtable", 1}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_dtable", TypeSize: 16, ArgDir: 1}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "base", TypeSize: 8, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "limit", TypeSize: 2, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "limit", TypeSize: 2, ArgDir: 1}}}, &ArrayType{TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 6, ArgDir: 1}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 2, ArgDir: 1}}}, 1, 3, 3}, }}}, {StructKey{Name: "kvm_enable_cap_cpu"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_enable_cap_cpu", TypeSize: 104}, Fields: []Type{ @@ -37721,9 +37721,8 @@ var structDescs_mips64le = []*KeyedStruct{ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "wqid", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "p9_qid"}}}, }}}, {StructKey{Name: "packet_fanout_val"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "packet_fanout_val", TypeSize: 4}, Fields: []Type{ - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "id", TypeSize: 2}}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_types", FldName: "type", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_flags", FldName: "flags", TypeSize: 1}}, []uint64{4096, 8192, 32768}, true}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "id", TypeSize: 2}}, Kind: 1, RangeEnd: 4}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_types", FldName: "type", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 4096, 8192, 32768}}, }}}, {StructKey{Name: "packet_mreq"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "packet_mreq", TypeSize: 16}, Fields: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "mr_ifindex", TypeSize: 4}}, @@ -47360,8 +47359,8 @@ var structDescs_mips64le = []*KeyedStruct{ }}}, {StructKey{Name: "xt_conntrack_mtinfo1"}, &StructDesc{TypeCommon{TypeName: "xt_conntrack_mtinfo1", TypeSize: 152}, []Type{ &StructType{Key: StructKey{Name: "xt_conntrack_mtinfo_common"}, FldName: "common"}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_state", FldName: "state_mask", TypeSize: 1}}, []uint64{1, 64, 128, 256}, true}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_status", FldName: "status_mask", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_state8", FldName: "state_mask", TypeSize: 1}}, []uint64{1, 64, 128}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_status8", FldName: "status_mask", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, }, 4}}, {StructKey{Name: "xt_conntrack_mtinfo2"}, &StructDesc{TypeCommon{TypeName: "xt_conntrack_mtinfo2", TypeSize: 156}, []Type{ &StructType{Key: StructKey{Name: "xt_conntrack_mtinfo_common"}, FldName: "common"}, @@ -75638,4 +75637,4 @@ var consts_mips64le = []ConstValue{ {"ethtool_per_queue_op_size", 128}, } -const revision_mips64le = "d90e31b62b1912bc315e730477cf324ce5f9565f" +const revision_mips64le = "c8af4ee3a8ef58e79e602504787d2d8dae941974" diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go index d65cce9e0..3dfe0603d 100644 --- a/sys/linux/gen/ppc64le.go +++ b/sys/linux/gen/ppc64le.go @@ -9394,14 +9394,14 @@ var structDescs_ppc64le = []*KeyedStruct{ {StructKey{Name: "ifaddrmsg[AF_INET6]"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "ifaddrmsg[AF_INET6]", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "ifa_family", TypeSize: 1}}, Val: 10}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_prefixlen", FldName: "ifa_prefixlen", TypeSize: 1}}, Vals: []uint64{0, 1, 8, 16, 24, 31, 32, 56, 63, 64, 120, 128}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags8", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "rt_scope_t", FldName: "ifa_scope", TypeSize: 1}}, Vals: []uint64{0, 200, 253, 254, 255}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}}, }}}, {StructKey{Name: "ifaddrmsg[AF_INET]"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "ifaddrmsg[AF_INET]", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "ifa_family", TypeSize: 1}}, Val: 2}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_prefixlen", FldName: "ifa_prefixlen", TypeSize: 1}}, Vals: []uint64{0, 1, 8, 16, 24, 31, 32, 56, 63, 64, 120, 128}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ifa_flags8", FldName: "ifa_flags", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "rt_scope_t", FldName: "ifa_scope", TypeSize: 1}}, Vals: []uint64{0, 200, 253, 254, 255}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "ifa_index", TypeSize: 4}}, }}}, @@ -13308,12 +13308,12 @@ var structDescs_ppc64le = []*KeyedStruct{ }}}, {StructKey{Name: "kvm_dtable"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_dtable", TypeSize: 16}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "base", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "limit", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "limit", TypeSize: 2}}}, &ArrayType{TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 6}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 2}}}, 1, 3, 3}, }}}, {StructKey{"kvm_dtable", 1}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_dtable", TypeSize: 16, ArgDir: 1}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "base", TypeSize: 8, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "limit", TypeSize: 2, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 65536, 1048576}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "limit", TypeSize: 2, ArgDir: 1}}}, &ArrayType{TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 6, ArgDir: 1}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 2, ArgDir: 1}}}, 1, 3, 3}, }}}, {StructKey{Name: "kvm_enable_cap_cpu"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_enable_cap_cpu", TypeSize: 104}, Fields: []Type{ @@ -14542,7 +14542,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "receiver", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64be", TypeSize: 8}, ArgFormat: 1}}, Kind: 1, RangeEnd: 1}, }}}, {StructKey{Name: "mptcp_generic_option"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "mptcp_generic_option", IsVarlen: true}, Fields: []Type{ - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "mptcp_sub_types", FldName: "type", TypeSize: 1}}, []uint64{1, 2, 4, 8, 32, 64, 128, 256}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "mptcp_sub_types", FldName: "type", TypeSize: 1}}, []uint64{1, 2, 4, 8, 32, 64, 128}, true}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "length", TypeSize: 1}}, Path: []string{"parent"}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 16}, }}}, @@ -37723,9 +37723,8 @@ var structDescs_ppc64le = []*KeyedStruct{ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "wqid", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "p9_qid"}}}, }}}, {StructKey{Name: "packet_fanout_val"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "packet_fanout_val", TypeSize: 4}, Fields: []Type{ - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "id", TypeSize: 2}}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_types", FldName: "type", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7}}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_flags", FldName: "flags", TypeSize: 1}}, []uint64{4096, 8192, 32768}, true}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "id", TypeSize: 2}}, Kind: 1, RangeEnd: 4}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "packet_fanout_types", FldName: "type", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 4096, 8192, 32768}}, }}}, {StructKey{Name: "packet_mreq"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "packet_mreq", TypeSize: 16}, Fields: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "mr_ifindex", TypeSize: 4}}, @@ -48173,8 +48172,8 @@ var structDescs_ppc64le = []*KeyedStruct{ }}}, {StructKey{Name: "xt_conntrack_mtinfo1"}, &StructDesc{TypeCommon{TypeName: "xt_conntrack_mtinfo1", TypeSize: 152}, []Type{ &StructType{Key: StructKey{Name: "xt_conntrack_mtinfo_common"}, FldName: "common"}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_state", FldName: "state_mask", TypeSize: 1}}, []uint64{1, 64, 128, 256}, true}, - &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_status", FldName: "status_mask", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_state8", FldName: "state_mask", TypeSize: 1}}, []uint64{1, 64, 128}, true}, + &FlagsType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xt_conntrack_status8", FldName: "status_mask", TypeSize: 1}}, []uint64{1, 2, 4, 8, 16, 32, 64, 128}, true}, }, 4}}, {StructKey{Name: "xt_conntrack_mtinfo2"}, &StructDesc{TypeCommon{TypeName: "xt_conntrack_mtinfo2", TypeSize: 156}, []Type{ &StructType{Key: StructKey{Name: "xt_conntrack_mtinfo_common"}, FldName: "common"}, @@ -77974,4 +77973,4 @@ var consts_ppc64le = []ConstValue{ {"ethtool_per_queue_op_size", 128}, } -const revision_ppc64le = "3a06326e1ca228e41b89b33630b25cd7451503ea" +const revision_ppc64le = "e9194fbf5f01847344cdb380692e284ab7cb6f42" diff --git a/sys/linux/mptcp.txt b/sys/linux/mptcp.txt index ad23c907d..637e3624f 100644 --- a/sys/linux/mptcp.txt +++ b/sys/linux/mptcp.txt @@ -25,7 +25,10 @@ tcp_mptcp_option [ remove_addr mptcp_remove_addr_option ] [varlen] -mptcp_sub_types = OPTION_TYPE_SYN, OPTION_TYPE_SYNACK, OPTION_TYPE_ACK, OPTION_MP_CAPABLE, OPTION_ADD_ADDR, OPTION_MP_JOIN, OPTION_MP_FCLOSE, OPTION_REMOVE_ADDR +mptcp_sub_types = OPTION_TYPE_SYN, OPTION_TYPE_SYNACK, OPTION_TYPE_ACK, OPTION_MP_CAPABLE, OPTION_ADD_ADDR, OPTION_MP_JOIN, OPTION_MP_FCLOSE + +# TODO: OPTION_REMOVE_ADDR was listed in mptcp_sub_types, but it does not fit into int8 below... +_ = OPTION_REMOVE_ADDR mptcp_generic_option { type flags[mptcp_sub_types, int8] diff --git a/sys/linux/netfilter.txt b/sys/linux/netfilter.txt index f73e69655..35c2bc600 100644 --- a/sys/linux/netfilter.txt +++ b/sys/linux/netfilter.txt @@ -316,8 +316,8 @@ xt_conntrack_mtinfo_common { xt_conntrack_mtinfo1 { common xt_conntrack_mtinfo_common - state_mask flags[xt_conntrack_state, int8] - status_mask flags[xt_conntrack_status, int8] + state_mask flags[xt_conntrack_state8, int8] + status_mask flags[xt_conntrack_status8, int8] } [align_4] xt_conntrack_mtinfo2 { @@ -337,7 +337,9 @@ xt_conntrack_mtinfo3 { } [align_4] xt_conntrack_flags = XT_CONNTRACK_STATE, XT_CONNTRACK_PROTO, XT_CONNTRACK_ORIGSRC, XT_CONNTRACK_ORIGDST, XT_CONNTRACK_REPLSRC, XT_CONNTRACK_REPLDST, XT_CONNTRACK_STATUS, XT_CONNTRACK_EXPIRES, XT_CONNTRACK_ORIGSRC_PORT, XT_CONNTRACK_ORIGDST_PORT, XT_CONNTRACK_REPLSRC_PORT, XT_CONNTRACK_REPLDST_PORT, XT_CONNTRACK_DIRECTION, XT_CONNTRACK_STATE_ALIAS +xt_conntrack_state8 = XT_CONNTRACK_STATE_INVALID, XT_CONNTRACK_STATE_SNAT, XT_CONNTRACK_STATE_DNAT xt_conntrack_state = XT_CONNTRACK_STATE_INVALID, XT_CONNTRACK_STATE_SNAT, XT_CONNTRACK_STATE_DNAT, XT_CONNTRACK_STATE_UNTRACKED +xt_conntrack_status8 = IPS_EXPECTED, IPS_SEEN_REPLY, IPS_ASSURED, IPS_CONFIRMED, IPS_SRC_NAT, IPS_DST_NAT, IPS_SEQ_ADJUST, IPS_SRC_NAT_DONE xt_conntrack_status = IPS_EXPECTED, IPS_SEEN_REPLY, IPS_ASSURED, IPS_CONFIRMED, IPS_SRC_NAT, IPS_DST_NAT, IPS_SEQ_ADJUST, IPS_SRC_NAT_DONE, IPS_DST_NAT_DONE, IPS_DYING, IPS_FIXED_TIMEOUT, IPS_TEMPLATE, IPS_UNTRACKED, IPS_HELPER xt_tcp { diff --git a/sys/linux/socket_netlink_route.txt b/sys/linux/socket_netlink_route.txt index 3207d556e..1de0c5e57 100644 --- a/sys/linux/socket_netlink_route.txt +++ b/sys/linux/socket_netlink_route.txt @@ -113,7 +113,7 @@ type ifinfomsg[FAMILY] { type ifaddrmsg[FAMILY] { ifa_family const[FAMILY, int8] ifa_prefixlen flags[ifa_prefixlen, int8] - ifa_flags flags[ifa_flags, int8] + ifa_flags flags[ifa_flags8, int8] ifa_scope flags[rt_scope_t, int8] ifa_index ifindex } @@ -920,6 +920,7 @@ cgw_csum_crc8_profile = CGW_CRC8PRF_UNSPEC, CGW_CRC8PRF_1U8, CGW_CRC8PRF_16U8, C rtnl_af = AF_INET, AF_INET6, AF_BRIDGE, AF_MPLS net_device_flags = IFF_UP, IFF_BROADCAST, IFF_DEBUG, IFF_LOOPBACK, IFF_POINTOPOINT, IFF_NOTRAILERS, IFF_RUNNING, IFF_NOARP, IFF_PROMISC, IFF_ALLMULTI, IFF_MASTER, IFF_SLAVE, IFF_MULTICAST, IFF_PORTSEL, IFF_AUTOMEDIA, IFF_DYNAMIC, IFF_LOWER_UP, IFF_DORMANT, IFF_ECHO ifa_flags = IFA_F_SECONDARY, IFA_F_NODAD, IFA_F_OPTIMISTIC, IFA_F_DADFAILED, IFA_F_HOMEADDRESS, IFA_F_DEPRECATED, IFA_F_TENTATIVE, IFA_F_PERMANENT, IFA_F_MANAGETEMPADDR, IFA_F_NOPREFIXROUTE, IFA_F_MCAUTOJOIN +ifa_flags8 = IFA_F_SECONDARY, IFA_F_NODAD, IFA_F_OPTIMISTIC, IFA_F_DADFAILED, IFA_F_HOMEADDRESS, IFA_F_DEPRECATED, IFA_F_TENTATIVE, IFA_F_PERMANENT rt_scope_t = RT_SCOPE_UNIVERSE, RT_SCOPE_SITE, RT_SCOPE_LINK, RT_SCOPE_HOST, RT_SCOPE_NOWHERE rtm_protocol = RTPROT_UNSPEC, RTPROT_REDIRECT, RTPROT_KERNEL, RTPROT_BOOT, RTPROT_STATIC rtm_type = RTN_UNSPEC, RTN_UNICAST, RTN_LOCAL, RTN_BROADCAST, RTN_ANYCAST, RTN_MULTICAST, RTN_BLACKHOLE, RTN_UNREACHABLE, RTN_PROHIBIT, RTN_THROW, RTN_NAT, RTN_XRESOLVE diff --git a/sys/linux/socket_packet.txt b/sys/linux/socket_packet.txt index 7c7ec3f39..44f4eb351 100644 --- a/sys/linux/socket_packet.txt +++ b/sys/linux/socket_packet.txt @@ -89,16 +89,14 @@ tpacket_req_u [ setsockopt$packet_rx_ring(fd sock_packet, level const[SOL_PACKET], optname const[PACKET_RX_RING], optval ptr[in, tpacket_req_u], optlen len[optval]) setsockopt$packet_tx_ring(fd sock_packet, level const[SOL_PACKET], optname const[PACKET_TX_RING], optval ptr[in, tpacket_req_u], optlen len[optval]) -packet_fanout_types = PACKET_FANOUT_HASH, PACKET_FANOUT_LB, PACKET_FANOUT_CPU, PACKET_FANOUT_ROLLOVER, PACKET_FANOUT_RND, PACKET_FANOUT_QM, PACKET_FANOUT_CBPF, PACKET_FANOUT_EBPF -packet_fanout_flags = PACKET_FANOUT_FLAG_ROLLOVER, PACKET_FANOUT_FLAG_DEFRAG, PACKET_FANOUT_FLAG_UNIQUEID +packet_fanout_types = PACKET_FANOUT_HASH, PACKET_FANOUT_LB, PACKET_FANOUT_CPU, PACKET_FANOUT_ROLLOVER, PACKET_FANOUT_RND, PACKET_FANOUT_QM, PACKET_FANOUT_CBPF, PACKET_FANOUT_EBPF, PACKET_FANOUT_FLAG_ROLLOVER, PACKET_FANOUT_FLAG_DEFRAG, PACKET_FANOUT_FLAG_UNIQUEID # TODO: Add descriptions _ = PACKET_MR_MULTICAST, PACKET_MR_PROMISC, PACKET_MR_ALLMULTI, PACKET_MR_UNICAST packet_fanout_val { - id int16 - type flags[packet_fanout_types, int8] - flags flags[packet_fanout_flags, int8] + id int16[0:4] + type flags[packet_fanout_types, int16] } setsockopt$packet_fanout(fd sock_packet, level const[SOL_PACKET], optname const[PACKET_FANOUT], optval ptr[in, packet_fanout_val], optlen len[optval]) |
