diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2018-01-24 11:41:13 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-01-24 11:41:13 +0100 |
| commit | 9a6ff11ff98e8137871648ee1a35a0a0e0b57adb (patch) | |
| tree | ff121693f1796b8d735a5a78bd6741f4391085f8 /sys/linux | |
| parent | ef6d3c0e038ea61d82b6140ea71ce96929d4a274 (diff) | |
sys/linux: fix devname_mask alignment
Since we use int64, it has 8-byte alignment.
It's wrong, it must have 1-byte alignment.
Use int8 instead.
Diffstat (limited to 'sys/linux')
| -rw-r--r-- | sys/linux/386.go | 9 | ||||
| -rw-r--r-- | sys/linux/amd64.go | 9 | ||||
| -rw-r--r-- | sys/linux/arm.go | 9 | ||||
| -rw-r--r-- | sys/linux/arm64.go | 9 | ||||
| -rw-r--r-- | sys/linux/ppc64le.go | 9 | ||||
| -rw-r--r-- | sys/linux/socket.txt | 4 |
6 files changed, 22 insertions, 27 deletions
diff --git a/sys/linux/386.go b/sys/linux/386.go index 6d10c6f27..f68e73773 100644 --- a/sys/linux/386.go +++ b/sys/linux/386.go @@ -933,8 +933,8 @@ var structDescs_386 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "syzn_devname", Dir: 2}, FldName: "syzn"}, }}}, {Key: StructKey{Name: "devname_mask"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "devname_mask", TypeSize: 16}, Fields: []Type{ - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "devname_mask_values", FldName: "lo", TypeSize: 8}}, Vals: []uint64{0, 255}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "hi", TypeSize: 8}}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "devname_mask_values", FldName: "lo", TypeSize: 1}}, Vals: []uint64{0, 255}}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "hi", TypeSize: 15}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 1}}}, Kind: 1, RangeBegin: 15, RangeEnd: 15}, }}}, {Key: StructKey{Name: "dlci_add"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dlci_add", TypeSize: 18}, Fields: []Type{ &UnionType{Key: StructKey{Name: "devname"}, FldName: "devname"}, @@ -2661,7 +2661,7 @@ var structDescs_386 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xt_counters"}, FldName: "counters"}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "matches", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "xt_entry_match"}}}, }}}, - {Key: StructKey{Name: "ipt_ip"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipt_ip", TypeSize: 88}, Fields: []Type{ + {Key: StructKey{Name: "ipt_ip"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipt_ip", TypeSize: 84}, Fields: []Type{ &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "src"}, &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "dst"}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_addr_mask_vals", FldName: "smsk", TypeSize: 4}, BigEndian: true}, Vals: []uint64{0, 4278190080, 4294967040, 4294967295, 255}}, @@ -2673,7 +2673,6 @@ var structDescs_386 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_types", FldName: "proto", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 4, 6, 8, 12, 17, 22, 29, 33, 41, 46, 47, 50, 51, 92, 94, 98, 103, 108, 132, 136, 137, 255, 115}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipt_ip_flags", FldName: "flags", TypeSize: 1}}, Vals: []uint64{1, 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipt_ip_invflags", FldName: "invflags", TypeSize: 1}}, Vals: []uint64{1, 2, 4, 8, 16, 32, 64}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, }}}, {Key: StructKey{Name: "ipt_replace"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipt_replace", IsVarlen: true}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 32}, Kind: 2, SubKind: "ipt_tables", Values: []string{"filter\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "mangle\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "nat\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "raw\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "security\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, @@ -21382,4 +21381,4 @@ var consts_386 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_386 = "c7ae775d11312aff5f46452251a34d8f2fbc23db" +const revision_386 = "e40ab07d179f415c45cf2ecb376828bda26f4141" diff --git a/sys/linux/amd64.go b/sys/linux/amd64.go index efc3a45b3..200220b49 100644 --- a/sys/linux/amd64.go +++ b/sys/linux/amd64.go @@ -936,8 +936,8 @@ var structDescs_amd64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "syzn_devname", Dir: 2}, FldName: "syzn"}, }}}, {Key: StructKey{Name: "devname_mask"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "devname_mask", TypeSize: 16}, Fields: []Type{ - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "devname_mask_values", FldName: "lo", TypeSize: 8}}, Vals: []uint64{0, 255}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "hi", TypeSize: 8}}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "devname_mask_values", FldName: "lo", TypeSize: 1}}, Vals: []uint64{0, 255}}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "hi", TypeSize: 15}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 1}}}, Kind: 1, RangeBegin: 15, RangeEnd: 15}, }}}, {Key: StructKey{Name: "dlci_add"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dlci_add", TypeSize: 18}, Fields: []Type{ &UnionType{Key: StructKey{Name: "devname"}, FldName: "devname"}, @@ -2693,7 +2693,7 @@ var structDescs_amd64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xt_counters"}, FldName: "counters"}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "matches", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "xt_entry_match"}}}, }}}, - {Key: StructKey{Name: "ipt_ip"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipt_ip", TypeSize: 88}, Fields: []Type{ + {Key: StructKey{Name: "ipt_ip"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipt_ip", TypeSize: 84}, Fields: []Type{ &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "src"}, &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "dst"}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_addr_mask_vals", FldName: "smsk", TypeSize: 4}, BigEndian: true}, Vals: []uint64{0, 4278190080, 4294967040, 4294967295, 255}}, @@ -2705,7 +2705,6 @@ var structDescs_amd64 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_types", FldName: "proto", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 4, 6, 8, 12, 17, 22, 29, 33, 41, 46, 47, 50, 51, 92, 94, 98, 103, 108, 132, 136, 137, 255, 115}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipt_ip_flags", FldName: "flags", TypeSize: 1}}, Vals: []uint64{1, 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipt_ip_invflags", FldName: "invflags", TypeSize: 1}}, Vals: []uint64{1, 2, 4, 8, 16, 32, 64}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, }}}, {Key: StructKey{Name: "ipt_replace"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipt_replace", IsVarlen: true}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 32}, Kind: 2, SubKind: "ipt_tables", Values: []string{"filter\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "mangle\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "nat\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "raw\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "security\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, @@ -21854,4 +21853,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "51a9ac6497f8ef0c97cc5e4a302d551efed4bbd9" +const revision_amd64 = "94bcfe970dc4e9b561898e0fac423f4472ebae6a" diff --git a/sys/linux/arm.go b/sys/linux/arm.go index b4d29d68d..576e241dd 100644 --- a/sys/linux/arm.go +++ b/sys/linux/arm.go @@ -938,8 +938,8 @@ var structDescs_arm = []*KeyedStruct{ &StructType{Key: StructKey{Name: "syzn_devname", Dir: 2}, FldName: "syzn"}, }}}, {Key: StructKey{Name: "devname_mask"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "devname_mask", TypeSize: 16}, Fields: []Type{ - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "devname_mask_values", FldName: "lo", TypeSize: 8}}, Vals: []uint64{0, 255}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "hi", TypeSize: 8}}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "devname_mask_values", FldName: "lo", TypeSize: 1}}, Vals: []uint64{0, 255}}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "hi", TypeSize: 15}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 1}}}, Kind: 1, RangeBegin: 15, RangeEnd: 15}, }}}, {Key: StructKey{Name: "dlci_add"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dlci_add", TypeSize: 18}, Fields: []Type{ &UnionType{Key: StructKey{Name: "devname"}, FldName: "devname"}, @@ -2678,7 +2678,7 @@ var structDescs_arm = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xt_counters"}, FldName: "counters"}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "matches", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "xt_entry_match"}}}, }}}, - {Key: StructKey{Name: "ipt_ip"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipt_ip", TypeSize: 88}, Fields: []Type{ + {Key: StructKey{Name: "ipt_ip"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipt_ip", TypeSize: 84}, Fields: []Type{ &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "src"}, &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "dst"}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_addr_mask_vals", FldName: "smsk", TypeSize: 4}, BigEndian: true}, Vals: []uint64{0, 4278190080, 4294967040, 4294967295, 255}}, @@ -2690,7 +2690,6 @@ var structDescs_arm = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_types", FldName: "proto", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 4, 6, 8, 12, 17, 22, 29, 33, 41, 46, 47, 50, 51, 92, 94, 98, 103, 108, 132, 136, 137, 255, 115}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipt_ip_flags", FldName: "flags", TypeSize: 1}}, Vals: []uint64{1, 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipt_ip_invflags", FldName: "invflags", TypeSize: 1}}, Vals: []uint64{1, 2, 4, 8, 16, 32, 64}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, }}}, {Key: StructKey{Name: "ipt_replace"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipt_replace", IsVarlen: true}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 32}, Kind: 2, SubKind: "ipt_tables", Values: []string{"filter\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "mangle\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "nat\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "raw\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "security\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, @@ -21250,4 +21249,4 @@ var consts_arm = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm = "5040bc46cb46350b7c682fd6d8b6cae448d64a9c" +const revision_arm = "ede3e4008d609f29bd0f3b8347254e4b85aef2a4" diff --git a/sys/linux/arm64.go b/sys/linux/arm64.go index 6a07bebb7..eabec7239 100644 --- a/sys/linux/arm64.go +++ b/sys/linux/arm64.go @@ -936,8 +936,8 @@ var structDescs_arm64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "syzn_devname", Dir: 2}, FldName: "syzn"}, }}}, {Key: StructKey{Name: "devname_mask"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "devname_mask", TypeSize: 16}, Fields: []Type{ - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "devname_mask_values", FldName: "lo", TypeSize: 8}}, Vals: []uint64{0, 255}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "hi", TypeSize: 8}}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "devname_mask_values", FldName: "lo", TypeSize: 1}}, Vals: []uint64{0, 255}}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "hi", TypeSize: 15}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 1}}}, Kind: 1, RangeBegin: 15, RangeEnd: 15}, }}}, {Key: StructKey{Name: "dlci_add"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dlci_add", TypeSize: 18}, Fields: []Type{ &UnionType{Key: StructKey{Name: "devname"}, FldName: "devname"}, @@ -2693,7 +2693,7 @@ var structDescs_arm64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xt_counters"}, FldName: "counters"}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "matches", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "xt_entry_match"}}}, }}}, - {Key: StructKey{Name: "ipt_ip"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipt_ip", TypeSize: 88}, Fields: []Type{ + {Key: StructKey{Name: "ipt_ip"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipt_ip", TypeSize: 84}, Fields: []Type{ &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "src"}, &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "dst"}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_addr_mask_vals", FldName: "smsk", TypeSize: 4}, BigEndian: true}, Vals: []uint64{0, 4278190080, 4294967040, 4294967295, 255}}, @@ -2705,7 +2705,6 @@ var structDescs_arm64 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_types", FldName: "proto", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 4, 6, 8, 12, 17, 22, 29, 33, 41, 46, 47, 50, 51, 92, 94, 98, 103, 108, 132, 136, 137, 255, 115}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipt_ip_flags", FldName: "flags", TypeSize: 1}}, Vals: []uint64{1, 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipt_ip_invflags", FldName: "invflags", TypeSize: 1}}, Vals: []uint64{1, 2, 4, 8, 16, 32, 64}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, }}}, {Key: StructKey{Name: "ipt_replace"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipt_replace", IsVarlen: true}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 32}, Kind: 2, SubKind: "ipt_tables", Values: []string{"filter\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "mangle\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "nat\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "raw\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "security\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, @@ -21236,4 +21235,4 @@ var consts_arm64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm64 = "acf2563bc8290086485a8002ccdd1078caa8595d" +const revision_arm64 = "42b28c68ad2166ea4c3543065f25bf48d8c40d64" diff --git a/sys/linux/ppc64le.go b/sys/linux/ppc64le.go index 76f461d30..fa33c2009 100644 --- a/sys/linux/ppc64le.go +++ b/sys/linux/ppc64le.go @@ -929,8 +929,8 @@ var structDescs_ppc64le = []*KeyedStruct{ &StructType{Key: StructKey{Name: "syzn_devname", Dir: 2}, FldName: "syzn"}, }}}, {Key: StructKey{Name: "devname_mask"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "devname_mask", TypeSize: 16}, Fields: []Type{ - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "devname_mask_values", FldName: "lo", TypeSize: 8}}, Vals: []uint64{0, 255}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "hi", TypeSize: 8}}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "devname_mask_values", FldName: "lo", TypeSize: 1}}, Vals: []uint64{0, 255}}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "hi", TypeSize: 15}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 1}}}, Kind: 1, RangeBegin: 15, RangeEnd: 15}, }}}, {Key: StructKey{Name: "dlci_add"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dlci_add", TypeSize: 18}, Fields: []Type{ &UnionType{Key: StructKey{Name: "devname"}, FldName: "devname"}, @@ -2673,7 +2673,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xt_counters"}, FldName: "counters"}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "matches", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "xt_entry_match"}}}, }}}, - {Key: StructKey{Name: "ipt_ip"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipt_ip", TypeSize: 88}, Fields: []Type{ + {Key: StructKey{Name: "ipt_ip"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipt_ip", TypeSize: 84}, Fields: []Type{ &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "src"}, &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "dst"}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_addr_mask_vals", FldName: "smsk", TypeSize: 4}, BigEndian: true}, Vals: []uint64{0, 4278190080, 4294967040, 4294967295, 255}}, @@ -2685,7 +2685,6 @@ var structDescs_ppc64le = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_types", FldName: "proto", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 4, 6, 8, 12, 17, 22, 29, 33, 41, 46, 47, 50, 51, 92, 94, 98, 103, 108, 132, 136, 137, 255, 115}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipt_ip_flags", FldName: "flags", TypeSize: 1}}, Vals: []uint64{1, 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipt_ip_invflags", FldName: "invflags", TypeSize: 1}}, Vals: []uint64{1, 2, 4, 8, 16, 32, 64}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, }}}, {Key: StructKey{Name: "ipt_replace"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipt_replace", IsVarlen: true}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 32}, Kind: 2, SubKind: "ipt_tables", Values: []string{"filter\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "mangle\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "nat\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "raw\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "security\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, @@ -20981,4 +20980,4 @@ var consts_ppc64le = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_ppc64le = "068174377e48c8013c70e9ceef6fdcb0d62828c4" +const revision_ppc64le = "442772ac6b8522876e25582e1d1d0e4dd1c1f371" diff --git a/sys/linux/socket.txt b/sys/linux/socket.txt index a4d143172..ed8e5f6f2 100644 --- a/sys/linux/socket.txt +++ b/sys/linux/socket.txt @@ -315,8 +315,8 @@ devname [ ] devname_mask { - lo flags[devname_mask_values, int64] - hi const[0, int64] + lo flags[devname_mask_values, int8] + hi array[const[0, int8], 15] } devname_mask_values = 0, 0xff |
