From 4b696a5daf040e6930be366eb66ab28401788932 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 19 Feb 2018 21:35:55 +0100 Subject: [PATCH] sys/linux: minor fixes to bt descriptions --- executor/syscalls_linux.h | 10 +++++----- sys/linux/386.go | 30 ++++++++++++++++++------------ sys/linux/amd64.go | 30 ++++++++++++++++++------------ sys/linux/arm.go | 30 ++++++++++++++++++------------ sys/linux/arm64.go | 30 ++++++++++++++++++------------ sys/linux/ppc64le.go | 30 ++++++++++++++++++------------ sys/linux/socket_bluetooth.txt | 10 +++++----- 7 files changed, 100 insertions(+), 70 deletions(-) diff --git a/executor/syscalls_linux.h b/executor/syscalls_linux.h index 1ab3ae3a..227f366a 100644 --- a/executor/syscalls_linux.h +++ b/executor/syscalls_linux.h @@ -2,7 +2,7 @@ #if defined(__i386__) || 0 #define GOARCH "386" -#define SYZ_REVISION "b929f179b63588d7863e12bf366a94131d298d62" +#define SYZ_REVISION "8fdb60d4bb97f8ba0a5c3013e9849cb604495f84" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 @@ -1597,7 +1597,7 @@ call_t syscalls[] = { #if defined(__x86_64__) || 0 #define GOARCH "amd64" -#define SYZ_REVISION "c435a4049b0d66eb274ace15ba074f712612089f" +#define SYZ_REVISION "1fe40e55c5ca8f426b4c56960dcd3d57c42ecfec" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 @@ -3245,7 +3245,7 @@ call_t syscalls[] = { #if defined(__arm__) || 0 #define GOARCH "arm" -#define SYZ_REVISION "b2c04d2363878d46a4caef68da118c0a7ef820d3" +#define SYZ_REVISION "5067581bdfd488a8007c90cb8de984853d046ff2" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 @@ -4850,7 +4850,7 @@ call_t syscalls[] = { #if defined(__aarch64__) || 0 #define GOARCH "arm64" -#define SYZ_REVISION "27522a3ac06b498716982a6db3ac9333b79a40c5" +#define SYZ_REVISION "1549416add43ab99966bf170357a517dd9a058c7" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 @@ -6427,7 +6427,7 @@ call_t syscalls[] = { #if defined(__ppc64__) || defined(__PPC64__) || defined(__powerpc64__) || 0 #define GOARCH "ppc64le" -#define SYZ_REVISION "a20d2dcf999e2e16e127517be71125e170dabd30" +#define SYZ_REVISION "bcb97366634096e72c134f863bf681a433f94b79" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 diff --git a/sys/linux/386.go b/sys/linux/386.go index 810931af..a5ce6bc9 100644 --- a/sys/linux/386.go +++ b/sys/linux/386.go @@ -485,23 +485,23 @@ var structDescs_386 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "bnep_conndel_req"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_conndel_req", TypeSize: 12}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4}}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "dst", TypeSize: 6}, Kind: 1, RangeBegin: 6, RangeEnd: 6}, + &UnionType{Key: StructKey{Name: "mac_addr"}, FldName: "dst"}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "bnep_conninfo"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_conninfo", TypeSize: 32}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "role", TypeSize: 2}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "state", TypeSize: 2}}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "dst", TypeSize: 6}, Kind: 1, RangeBegin: 6, RangeEnd: 6}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "device", TypeSize: 16}, Kind: 1, RangeBegin: 16, RangeEnd: 16}, + &UnionType{Key: StructKey{Name: "mac_addr"}, FldName: "dst"}, + &UnionType{Key: StructKey{Name: "devname"}, FldName: "device"}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "bnep_conninfo", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_conninfo", TypeSize: 32, ArgDir: 1}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4, ArgDir: 1}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "role", TypeSize: 2, ArgDir: 1}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "state", TypeSize: 2, ArgDir: 1}}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "dst", TypeSize: 6, ArgDir: 1}, Kind: 1, RangeBegin: 6, RangeEnd: 6}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "device", TypeSize: 16, ArgDir: 1}, Kind: 1, RangeBegin: 16, RangeEnd: 16}, + &UnionType{Key: StructKey{Name: "mac_addr", Dir: 1}, FldName: "dst"}, + &UnionType{Key: StructKey{Name: "devname", Dir: 1}, FldName: "device"}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "bnep_connlist_req"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_connlist_req", TypeSize: 8}, Fields: []Type{ @@ -8859,20 +8859,26 @@ var structDescs_386 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "socket_domain", FldName: "sa_family", TypeSize: 2, ArgDir: 2}}, Vals: []uint64{1, 2, 10, 4, 16, 9, 3, 8, 5, 17}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "sa_data", TypeSize: 14, ArgDir: 2}, Kind: 1, RangeBegin: 14, RangeEnd: 14}, }}}, - {Key: StructKey{Name: "sockaddr_hci"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 6}, Fields: []Type{ + {Key: StructKey{Name: "sockaddr_hci"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 12}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "fam", TypeSize: 2}}, Val: 31}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "dev", TypeSize: 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bt_chi_chan", FldName: "chan", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 3}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, - {Key: StructKey{Name: "sockaddr_hci", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 6, ArgDir: 1}, Fields: []Type{ + {Key: StructKey{Name: "sockaddr_hci", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 12, ArgDir: 1}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "fam", TypeSize: 2, ArgDir: 1}}, Val: 31}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2, ArgDir: 1}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "dev", TypeSize: 4, ArgDir: 1}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bt_chi_chan", FldName: "chan", TypeSize: 2, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 3}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, - {Key: StructKey{Name: "sockaddr_hci", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 6, ArgDir: 2}, Fields: []Type{ + {Key: StructKey{Name: "sockaddr_hci", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 12, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "fam", TypeSize: 2, ArgDir: 2}}, Val: 31}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2, ArgDir: 2}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "dev", TypeSize: 4, ArgDir: 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bt_chi_chan", FldName: "chan", TypeSize: 2, ArgDir: 2}}, Vals: []uint64{0, 1, 2, 3}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "sockaddr_in"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_in", TypeSize: 16}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "family", TypeSize: 2}}, Val: 2}, @@ -24983,4 +24989,4 @@ var consts_386 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_386 = "b929f179b63588d7863e12bf366a94131d298d62" +const revision_386 = "8fdb60d4bb97f8ba0a5c3013e9849cb604495f84" diff --git a/sys/linux/amd64.go b/sys/linux/amd64.go index 7eb6143e..c14b13a3 100644 --- a/sys/linux/amd64.go +++ b/sys/linux/amd64.go @@ -491,23 +491,23 @@ var structDescs_amd64 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "bnep_conndel_req"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_conndel_req", TypeSize: 12}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4}}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "dst", TypeSize: 6}, Kind: 1, RangeBegin: 6, RangeEnd: 6}, + &UnionType{Key: StructKey{Name: "mac_addr"}, FldName: "dst"}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "bnep_conninfo"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_conninfo", TypeSize: 32}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "role", TypeSize: 2}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "state", TypeSize: 2}}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "dst", TypeSize: 6}, Kind: 1, RangeBegin: 6, RangeEnd: 6}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "device", TypeSize: 16}, Kind: 1, RangeBegin: 16, RangeEnd: 16}, + &UnionType{Key: StructKey{Name: "mac_addr"}, FldName: "dst"}, + &UnionType{Key: StructKey{Name: "devname"}, FldName: "device"}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "bnep_conninfo", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_conninfo", TypeSize: 32, ArgDir: 1}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4, ArgDir: 1}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "role", TypeSize: 2, ArgDir: 1}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "state", TypeSize: 2, ArgDir: 1}}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "dst", TypeSize: 6, ArgDir: 1}, Kind: 1, RangeBegin: 6, RangeEnd: 6}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "device", TypeSize: 16, ArgDir: 1}, Kind: 1, RangeBegin: 16, RangeEnd: 16}, + &UnionType{Key: StructKey{Name: "mac_addr", Dir: 1}, FldName: "dst"}, + &UnionType{Key: StructKey{Name: "devname", Dir: 1}, FldName: "device"}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "bnep_connlist_req"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_connlist_req", TypeSize: 16}, Fields: []Type{ @@ -9043,20 +9043,26 @@ var structDescs_amd64 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "socket_domain", FldName: "sa_family", TypeSize: 2, ArgDir: 2}}, Vals: []uint64{1, 2, 10, 4, 16, 9, 3, 8, 5, 17}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "sa_data", TypeSize: 14, ArgDir: 2}, Kind: 1, RangeBegin: 14, RangeEnd: 14}, }}}, - {Key: StructKey{Name: "sockaddr_hci"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 6}, Fields: []Type{ + {Key: StructKey{Name: "sockaddr_hci"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 12}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "fam", TypeSize: 2}}, Val: 31}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "dev", TypeSize: 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bt_chi_chan", FldName: "chan", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 3}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, - {Key: StructKey{Name: "sockaddr_hci", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 6, ArgDir: 1}, Fields: []Type{ + {Key: StructKey{Name: "sockaddr_hci", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 12, ArgDir: 1}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "fam", TypeSize: 2, ArgDir: 1}}, Val: 31}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2, ArgDir: 1}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "dev", TypeSize: 4, ArgDir: 1}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bt_chi_chan", FldName: "chan", TypeSize: 2, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 3}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, - {Key: StructKey{Name: "sockaddr_hci", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 6, ArgDir: 2}, Fields: []Type{ + {Key: StructKey{Name: "sockaddr_hci", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 12, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "fam", TypeSize: 2, ArgDir: 2}}, Val: 31}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2, ArgDir: 2}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "dev", TypeSize: 4, ArgDir: 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bt_chi_chan", FldName: "chan", TypeSize: 2, ArgDir: 2}}, Vals: []uint64{0, 1, 2, 3}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "sockaddr_in"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_in", TypeSize: 16}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "family", TypeSize: 2}}, Val: 2}, @@ -25584,4 +25590,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "c435a4049b0d66eb274ace15ba074f712612089f" +const revision_amd64 = "1fe40e55c5ca8f426b4c56960dcd3d57c42ecfec" diff --git a/sys/linux/arm.go b/sys/linux/arm.go index 3fa72b9b..ffeda8d6 100644 --- a/sys/linux/arm.go +++ b/sys/linux/arm.go @@ -490,23 +490,23 @@ var structDescs_arm = []*KeyedStruct{ }}}, {Key: StructKey{Name: "bnep_conndel_req"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_conndel_req", TypeSize: 12}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4}}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "dst", TypeSize: 6}, Kind: 1, RangeBegin: 6, RangeEnd: 6}, + &UnionType{Key: StructKey{Name: "mac_addr"}, FldName: "dst"}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "bnep_conninfo"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_conninfo", TypeSize: 32}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "role", TypeSize: 2}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "state", TypeSize: 2}}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "dst", TypeSize: 6}, Kind: 1, RangeBegin: 6, RangeEnd: 6}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "device", TypeSize: 16}, Kind: 1, RangeBegin: 16, RangeEnd: 16}, + &UnionType{Key: StructKey{Name: "mac_addr"}, FldName: "dst"}, + &UnionType{Key: StructKey{Name: "devname"}, FldName: "device"}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "bnep_conninfo", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_conninfo", TypeSize: 32, ArgDir: 1}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4, ArgDir: 1}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "role", TypeSize: 2, ArgDir: 1}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "state", TypeSize: 2, ArgDir: 1}}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "dst", TypeSize: 6, ArgDir: 1}, Kind: 1, RangeBegin: 6, RangeEnd: 6}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "device", TypeSize: 16, ArgDir: 1}, Kind: 1, RangeBegin: 16, RangeEnd: 16}, + &UnionType{Key: StructKey{Name: "mac_addr", Dir: 1}, FldName: "dst"}, + &UnionType{Key: StructKey{Name: "devname", Dir: 1}, FldName: "device"}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "bnep_connlist_req"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_connlist_req", TypeSize: 8}, Fields: []Type{ @@ -8728,20 +8728,26 @@ var structDescs_arm = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "socket_domain", FldName: "sa_family", TypeSize: 2, ArgDir: 2}}, Vals: []uint64{1, 2, 10, 4, 16, 9, 3, 8, 5, 17}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "sa_data", TypeSize: 14, ArgDir: 2}, Kind: 1, RangeBegin: 14, RangeEnd: 14}, }}}, - {Key: StructKey{Name: "sockaddr_hci"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 6}, Fields: []Type{ + {Key: StructKey{Name: "sockaddr_hci"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 12}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "fam", TypeSize: 2}}, Val: 31}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "dev", TypeSize: 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bt_chi_chan", FldName: "chan", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 3}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, - {Key: StructKey{Name: "sockaddr_hci", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 6, ArgDir: 1}, Fields: []Type{ + {Key: StructKey{Name: "sockaddr_hci", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 12, ArgDir: 1}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "fam", TypeSize: 2, ArgDir: 1}}, Val: 31}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2, ArgDir: 1}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "dev", TypeSize: 4, ArgDir: 1}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bt_chi_chan", FldName: "chan", TypeSize: 2, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 3}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, - {Key: StructKey{Name: "sockaddr_hci", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 6, ArgDir: 2}, Fields: []Type{ + {Key: StructKey{Name: "sockaddr_hci", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 12, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "fam", TypeSize: 2, ArgDir: 2}}, Val: 31}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2, ArgDir: 2}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "dev", TypeSize: 4, ArgDir: 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bt_chi_chan", FldName: "chan", TypeSize: 2, ArgDir: 2}}, Vals: []uint64{0, 1, 2, 3}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "sockaddr_in"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_in", TypeSize: 16}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "family", TypeSize: 2}}, Val: 2}, @@ -24841,4 +24847,4 @@ var consts_arm = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm = "b2c04d2363878d46a4caef68da118c0a7ef820d3" +const revision_arm = "5067581bdfd488a8007c90cb8de984853d046ff2" diff --git a/sys/linux/arm64.go b/sys/linux/arm64.go index 97d5f251..f1869824 100644 --- a/sys/linux/arm64.go +++ b/sys/linux/arm64.go @@ -491,23 +491,23 @@ var structDescs_arm64 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "bnep_conndel_req"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_conndel_req", TypeSize: 12}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4}}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "dst", TypeSize: 6}, Kind: 1, RangeBegin: 6, RangeEnd: 6}, + &UnionType{Key: StructKey{Name: "mac_addr"}, FldName: "dst"}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "bnep_conninfo"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_conninfo", TypeSize: 32}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "role", TypeSize: 2}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "state", TypeSize: 2}}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "dst", TypeSize: 6}, Kind: 1, RangeBegin: 6, RangeEnd: 6}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "device", TypeSize: 16}, Kind: 1, RangeBegin: 16, RangeEnd: 16}, + &UnionType{Key: StructKey{Name: "mac_addr"}, FldName: "dst"}, + &UnionType{Key: StructKey{Name: "devname"}, FldName: "device"}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "bnep_conninfo", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_conninfo", TypeSize: 32, ArgDir: 1}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4, ArgDir: 1}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "role", TypeSize: 2, ArgDir: 1}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "state", TypeSize: 2, ArgDir: 1}}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "dst", TypeSize: 6, ArgDir: 1}, Kind: 1, RangeBegin: 6, RangeEnd: 6}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "device", TypeSize: 16, ArgDir: 1}, Kind: 1, RangeBegin: 16, RangeEnd: 16}, + &UnionType{Key: StructKey{Name: "mac_addr", Dir: 1}, FldName: "dst"}, + &UnionType{Key: StructKey{Name: "devname", Dir: 1}, FldName: "device"}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "bnep_connlist_req"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_connlist_req", TypeSize: 16}, Fields: []Type{ @@ -8848,20 +8848,26 @@ var structDescs_arm64 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "socket_domain", FldName: "sa_family", TypeSize: 2, ArgDir: 2}}, Vals: []uint64{1, 2, 10, 4, 16, 9, 3, 8, 5, 17}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "sa_data", TypeSize: 14, ArgDir: 2}, Kind: 1, RangeBegin: 14, RangeEnd: 14}, }}}, - {Key: StructKey{Name: "sockaddr_hci"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 6}, Fields: []Type{ + {Key: StructKey{Name: "sockaddr_hci"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 12}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "fam", TypeSize: 2}}, Val: 31}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "dev", TypeSize: 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bt_chi_chan", FldName: "chan", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 3}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, - {Key: StructKey{Name: "sockaddr_hci", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 6, ArgDir: 1}, Fields: []Type{ + {Key: StructKey{Name: "sockaddr_hci", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 12, ArgDir: 1}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "fam", TypeSize: 2, ArgDir: 1}}, Val: 31}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2, ArgDir: 1}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "dev", TypeSize: 4, ArgDir: 1}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bt_chi_chan", FldName: "chan", TypeSize: 2, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 3}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, - {Key: StructKey{Name: "sockaddr_hci", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 6, ArgDir: 2}, Fields: []Type{ + {Key: StructKey{Name: "sockaddr_hci", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 12, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "fam", TypeSize: 2, ArgDir: 2}}, Val: 31}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2, ArgDir: 2}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "dev", TypeSize: 4, ArgDir: 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bt_chi_chan", FldName: "chan", TypeSize: 2, ArgDir: 2}}, Vals: []uint64{0, 1, 2, 3}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "sockaddr_in"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_in", TypeSize: 16}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "family", TypeSize: 2}}, Val: 2}, @@ -24966,4 +24972,4 @@ var consts_arm64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm64 = "27522a3ac06b498716982a6db3ac9333b79a40c5" +const revision_arm64 = "1549416add43ab99966bf170357a517dd9a058c7" diff --git a/sys/linux/ppc64le.go b/sys/linux/ppc64le.go index cfdd45aa..0e740928 100644 --- a/sys/linux/ppc64le.go +++ b/sys/linux/ppc64le.go @@ -485,23 +485,23 @@ var structDescs_ppc64le = []*KeyedStruct{ }}}, {Key: StructKey{Name: "bnep_conndel_req"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_conndel_req", TypeSize: 12}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4}}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "dst", TypeSize: 6}, Kind: 1, RangeBegin: 6, RangeEnd: 6}, + &UnionType{Key: StructKey{Name: "mac_addr"}, FldName: "dst"}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "bnep_conninfo"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_conninfo", TypeSize: 32}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "role", TypeSize: 2}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "state", TypeSize: 2}}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "dst", TypeSize: 6}, Kind: 1, RangeBegin: 6, RangeEnd: 6}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "device", TypeSize: 16}, Kind: 1, RangeBegin: 16, RangeEnd: 16}, + &UnionType{Key: StructKey{Name: "mac_addr"}, FldName: "dst"}, + &UnionType{Key: StructKey{Name: "devname"}, FldName: "device"}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "bnep_conninfo", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_conninfo", TypeSize: 32, ArgDir: 1}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4, ArgDir: 1}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "role", TypeSize: 2, ArgDir: 1}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "state", TypeSize: 2, ArgDir: 1}}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "dst", TypeSize: 6, ArgDir: 1}, Kind: 1, RangeBegin: 6, RangeEnd: 6}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "device", TypeSize: 16, ArgDir: 1}, Kind: 1, RangeBegin: 16, RangeEnd: 16}, + &UnionType{Key: StructKey{Name: "mac_addr", Dir: 1}, FldName: "dst"}, + &UnionType{Key: StructKey{Name: "devname", Dir: 1}, FldName: "device"}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "bnep_connlist_req"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bnep_connlist_req", TypeSize: 16}, Fields: []Type{ @@ -8775,20 +8775,26 @@ var structDescs_ppc64le = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "socket_domain", FldName: "sa_family", TypeSize: 2, ArgDir: 2}}, Vals: []uint64{1, 2, 10, 4, 16, 9, 3, 8, 5, 17}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "sa_data", TypeSize: 14, ArgDir: 2}, Kind: 1, RangeBegin: 14, RangeEnd: 14}, }}}, - {Key: StructKey{Name: "sockaddr_hci"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 6}, Fields: []Type{ + {Key: StructKey{Name: "sockaddr_hci"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 12}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "fam", TypeSize: 2}}, Val: 31}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "dev", TypeSize: 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bt_chi_chan", FldName: "chan", TypeSize: 2}}, Vals: []uint64{0, 1, 2, 3}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, - {Key: StructKey{Name: "sockaddr_hci", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 6, ArgDir: 1}, Fields: []Type{ + {Key: StructKey{Name: "sockaddr_hci", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 12, ArgDir: 1}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "fam", TypeSize: 2, ArgDir: 1}}, Val: 31}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2, ArgDir: 1}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "dev", TypeSize: 4, ArgDir: 1}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bt_chi_chan", FldName: "chan", TypeSize: 2, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 3}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, - {Key: StructKey{Name: "sockaddr_hci", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 6, ArgDir: 2}, Fields: []Type{ + {Key: StructKey{Name: "sockaddr_hci", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_hci", TypeSize: 12, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "fam", TypeSize: 2, ArgDir: 2}}, Val: 31}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2, ArgDir: 2}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "dev", TypeSize: 4, ArgDir: 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bt_chi_chan", FldName: "chan", TypeSize: 2, ArgDir: 2}}, Vals: []uint64{0, 1, 2, 3}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "sockaddr_in"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_in", TypeSize: 16}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "family", TypeSize: 2}}, Val: 2}, @@ -24728,4 +24734,4 @@ var consts_ppc64le = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_ppc64le = "a20d2dcf999e2e16e127517be71125e170dabd30" +const revision_ppc64le = "bcb97366634096e72c134f863bf681a433f94b79" diff --git a/sys/linux/socket_bluetooth.txt b/sys/linux/socket_bluetooth.txt index e100f394..1ff37f92 100644 --- a/sys/linux/socket_bluetooth.txt +++ b/sys/linux/socket_bluetooth.txt @@ -101,12 +101,12 @@ getsockopt$bt_BT_RCVMTU(fd sock_bt, level const[SOL_BLUETOOTH], opt const[BT_RCV sockaddr_hci { fam const[AF_BLUETOOTH, int16] - dev int16 + dev ifindex chan flags[bt_chi_chan, int16] } hci_inquiry_req { - dev int16 + dev ifindex flags int16 lap0 int8 lap1 int8 @@ -239,15 +239,15 @@ bnep_connadd_req { bnep_conndel_req { flags int32 - dst array[int8, 6] + dst mac_addr } bnep_conninfo { flags int32 role int16 state int16 - dst array[int8, 6] - device array[int8, 16] + dst mac_addr + device devname } bnep_connlist_req {