aboutsummaryrefslogtreecommitdiffstats
path: root/sys/linux
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2020-01-07 12:41:07 +0100
committerDmitry Vyukov <dvyukov@google.com>2020-01-07 12:41:07 +0100
commitd817520681553e36f8ce01f56fc8f8570e5ccc7c (patch)
treefde206a4892e81e49a341833dab949cc4f1d80b3 /sys/linux
parent78241633108d82b98e70bab07611bedd59c9e9b0 (diff)
sys/linux: few minor ipset improvements.
1. Add "bitmap:port" type. 2. ipv4/6 addresses must be in network byte order.
Diffstat (limited to 'sys/linux')
-rw-r--r--sys/linux/gen/386.go36
-rw-r--r--sys/linux/gen/amd64.go36
-rw-r--r--sys/linux/gen/arm.go36
-rw-r--r--sys/linux/gen/arm64.go36
-rw-r--r--sys/linux/gen/mips64le.go36
-rw-r--r--sys/linux/gen/ppc64le.go36
-rw-r--r--sys/linux/socket_netlink_netfilter_ipset.txt6
7 files changed, 123 insertions, 99 deletions
diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go
index 2aa8bd00b..4b496a388 100644
--- a/sys/linux/gen/386.go
+++ b/sys/linux/gen/386.go
@@ -10501,8 +10501,8 @@ var structDescs_386 = []*KeyedStruct{
&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "udp_timeout", TypeSize: 4}}},
}}},
{Key: StructKey{Name: "ipaddr_policy"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipaddr_policy", IsVarlen: true}, Fields: []Type{
- &StructType{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV4"},
- &StructType{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV6"},
+ &StructType{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV4"},
+ &StructType{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV6"},
}}},
{Key: StructKey{Name: "ipc_perm"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipc_perm", TypeSize: 28}, Fields: []Type{
&ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "key", TypeSize: 4}}, ValuesStart: 2039359027, ValuesPerProc: 4},
@@ -21108,18 +21108,6 @@ var structDescs_386 = []*KeyedStruct{
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true},
}, AlignAttr: 4}},
- {Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]", TypeSize: 8}, Fields: []Type{
- &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
- &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 1},
- &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "payload"},
- &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
- }, AlignAttr: 4}},
- {Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]", TypeSize: 20}, Fields: []Type{
- &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
- &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 2},
- &UnionType{Key: StructKey{Name: "ipv6_addr"}, FldName: "payload"},
- &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
- }, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_NAME, int16], string[ipset_name]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_NAME, int16], string[ipset_name]]", TypeSize: 12}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 18},
@@ -21186,7 +21174,7 @@ var structDescs_386 = []*KeyedStruct{
{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_TYPENAME, int16], string[ipset_type]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_TYPENAME, int16], string[ipset_type]]", IsVarlen: true}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3},
- &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "payload", IsVarlen: true}, Kind: 2, SubKind: "ipset_type", Values: []string{"list:set\x00", "bitmap:ip\x00", "hash:net,port,net\x00", "hash:net,port\x00", "hash:net,net\x00", "hash:net,iface\x00", "hash:net\x00", "hash:mac\x00", "hash:ip,port,net\x00", "hash:ip,port,ip\x00", "hash:ip,port\x00", "hash:ip,mark\x00", "hash:ip\x00", "hash:ip,mac\x00", "hash:ip\x00", "bitmap:ip,mac\x00"}},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "payload", IsVarlen: true}, Kind: 2, SubKind: "ipset_type", Values: []string{"list:set\x00", "bitmap:ip\x00", "bitmap:port\x00", "hash:net,port,net\x00", "hash:net,port\x00", "hash:net,net\x00", "hash:net,iface\x00", "hash:net\x00", "hash:mac\x00", "hash:ip,port,net\x00", "hash:ip,port,ip\x00", "hash:ip,port\x00", "hash:ip,mark\x00", "hash:ip\x00", "hash:ip,mac\x00", "hash:ip\x00", "bitmap:ip,mac\x00"}},
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
}, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_t[const[IPVS_CMD_ATTR_DAEMON, int16], array[ip_vs_daemon_policy]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPVS_CMD_ATTR_DAEMON, int16], array[ip_vs_daemon_policy]]", IsVarlen: true}, Fields: []Type{
@@ -27670,6 +27658,22 @@ var structDescs_386 = []*KeyedStruct{
&UnionType{Key: StructKey{Name: "ipaddr_policy"}, FldName: "payload"},
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
}, AlignAttr: 4}},
+ {Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]", TypeSize: 8}, Fields: []Type{
+ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NET_BYTEORDER"}, BitfieldOff: 6, BitfieldLen: 1, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NESTED", TypeSize: 1}, BitfieldOff: 7, BitfieldLen: 1, BitfieldUnit: 2}},
+ &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "payload"},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
+ }, AlignAttr: 4}},
+ {Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]", TypeSize: 20}, Fields: []Type{
+ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 2},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NET_BYTEORDER"}, BitfieldOff: 6, BitfieldLen: 1, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NESTED", TypeSize: 1}, BitfieldOff: 7, BitfieldLen: 1, BitfieldUnit: 2}},
+ &UnionType{Key: StructKey{Name: "ipv6_addr"}, FldName: "payload"},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
+ }, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IP_TO, int16:14], 0, 1, ipaddr_policy]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IP_TO, int16:14], 0, 1, ipaddr_policy]", IsVarlen: true}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 2},
@@ -67229,4 +67233,4 @@ var consts_386 = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}
-const revision_386 = "9164b892213d89364fe98fcd085fee5b8f507699"
+const revision_386 = "8927d63fb44e736aaec360f08f04ae739b7ba73c"
diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go
index cb22fdd62..84cd9ab5d 100644
--- a/sys/linux/gen/amd64.go
+++ b/sys/linux/gen/amd64.go
@@ -10658,8 +10658,8 @@ var structDescs_amd64 = []*KeyedStruct{
&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "udp_timeout", TypeSize: 4}}},
}}},
{Key: StructKey{Name: "ipaddr_policy"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipaddr_policy", IsVarlen: true}, Fields: []Type{
- &StructType{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV4"},
- &StructType{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV6"},
+ &StructType{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV4"},
+ &StructType{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV6"},
}}},
{Key: StructKey{Name: "ipc_perm"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipc_perm", TypeSize: 28}, Fields: []Type{
&ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "key", TypeSize: 4}}, ValuesStart: 2039359027, ValuesPerProc: 4},
@@ -21677,18 +21677,6 @@ var structDescs_amd64 = []*KeyedStruct{
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true},
}, AlignAttr: 4}},
- {Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]", TypeSize: 8}, Fields: []Type{
- &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
- &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 1},
- &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "payload"},
- &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
- }, AlignAttr: 4}},
- {Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]", TypeSize: 20}, Fields: []Type{
- &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
- &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 2},
- &UnionType{Key: StructKey{Name: "ipv6_addr"}, FldName: "payload"},
- &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
- }, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_NAME, int16], string[ipset_name]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_NAME, int16], string[ipset_name]]", TypeSize: 12}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 18},
@@ -21755,7 +21743,7 @@ var structDescs_amd64 = []*KeyedStruct{
{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_TYPENAME, int16], string[ipset_type]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_TYPENAME, int16], string[ipset_type]]", IsVarlen: true}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3},
- &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "payload", IsVarlen: true}, Kind: 2, SubKind: "ipset_type", Values: []string{"list:set\x00", "bitmap:ip\x00", "hash:net,port,net\x00", "hash:net,port\x00", "hash:net,net\x00", "hash:net,iface\x00", "hash:net\x00", "hash:mac\x00", "hash:ip,port,net\x00", "hash:ip,port,ip\x00", "hash:ip,port\x00", "hash:ip,mark\x00", "hash:ip\x00", "hash:ip,mac\x00", "hash:ip\x00", "bitmap:ip,mac\x00"}},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "payload", IsVarlen: true}, Kind: 2, SubKind: "ipset_type", Values: []string{"list:set\x00", "bitmap:ip\x00", "bitmap:port\x00", "hash:net,port,net\x00", "hash:net,port\x00", "hash:net,net\x00", "hash:net,iface\x00", "hash:net\x00", "hash:mac\x00", "hash:ip,port,net\x00", "hash:ip,port,ip\x00", "hash:ip,port\x00", "hash:ip,mark\x00", "hash:ip\x00", "hash:ip,mac\x00", "hash:ip\x00", "bitmap:ip,mac\x00"}},
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
}, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_t[const[IPVS_CMD_ATTR_DAEMON, int16], array[ip_vs_daemon_policy]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPVS_CMD_ATTR_DAEMON, int16], array[ip_vs_daemon_policy]]", IsVarlen: true}, Fields: []Type{
@@ -28239,6 +28227,22 @@ var structDescs_amd64 = []*KeyedStruct{
&UnionType{Key: StructKey{Name: "ipaddr_policy"}, FldName: "payload"},
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
}, AlignAttr: 4}},
+ {Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]", TypeSize: 8}, Fields: []Type{
+ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NET_BYTEORDER"}, BitfieldOff: 6, BitfieldLen: 1, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NESTED", TypeSize: 1}, BitfieldOff: 7, BitfieldLen: 1, BitfieldUnit: 2}},
+ &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "payload"},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
+ }, AlignAttr: 4}},
+ {Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]", TypeSize: 20}, Fields: []Type{
+ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 2},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NET_BYTEORDER"}, BitfieldOff: 6, BitfieldLen: 1, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NESTED", TypeSize: 1}, BitfieldOff: 7, BitfieldLen: 1, BitfieldUnit: 2}},
+ &UnionType{Key: StructKey{Name: "ipv6_addr"}, FldName: "payload"},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
+ }, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IP_TO, int16:14], 0, 1, ipaddr_policy]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IP_TO, int16:14], 0, 1, ipaddr_policy]", IsVarlen: true}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 2},
@@ -68064,4 +68068,4 @@ var consts_amd64 = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}
-const revision_amd64 = "9956c029d517754b34a1629e850cddebee5753c0"
+const revision_amd64 = "0d1d44273b0425a3e02abd97738136d73e708380"
diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go
index 55ffab51f..c2111268f 100644
--- a/sys/linux/gen/arm.go
+++ b/sys/linux/gen/arm.go
@@ -10542,8 +10542,8 @@ var structDescs_arm = []*KeyedStruct{
&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "udp_timeout", TypeSize: 4}}},
}}},
{Key: StructKey{Name: "ipaddr_policy"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipaddr_policy", IsVarlen: true}, Fields: []Type{
- &StructType{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV4"},
- &StructType{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV6"},
+ &StructType{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV4"},
+ &StructType{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV6"},
}}},
{Key: StructKey{Name: "ipc_perm"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipc_perm", TypeSize: 28}, Fields: []Type{
&ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "key", TypeSize: 4}}, ValuesStart: 2039359027, ValuesPerProc: 4},
@@ -20966,18 +20966,6 @@ var structDescs_arm = []*KeyedStruct{
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true},
}, AlignAttr: 4}},
- {Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]", TypeSize: 8}, Fields: []Type{
- &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
- &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 1},
- &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "payload"},
- &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
- }, AlignAttr: 4}},
- {Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]", TypeSize: 20}, Fields: []Type{
- &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
- &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 2},
- &UnionType{Key: StructKey{Name: "ipv6_addr"}, FldName: "payload"},
- &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
- }, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_NAME, int16], string[ipset_name]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_NAME, int16], string[ipset_name]]", TypeSize: 12}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 18},
@@ -21044,7 +21032,7 @@ var structDescs_arm = []*KeyedStruct{
{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_TYPENAME, int16], string[ipset_type]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_TYPENAME, int16], string[ipset_type]]", IsVarlen: true}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3},
- &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "payload", IsVarlen: true}, Kind: 2, SubKind: "ipset_type", Values: []string{"list:set\x00", "bitmap:ip\x00", "hash:net,port,net\x00", "hash:net,port\x00", "hash:net,net\x00", "hash:net,iface\x00", "hash:net\x00", "hash:mac\x00", "hash:ip,port,net\x00", "hash:ip,port,ip\x00", "hash:ip,port\x00", "hash:ip,mark\x00", "hash:ip\x00", "hash:ip,mac\x00", "hash:ip\x00", "bitmap:ip,mac\x00"}},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "payload", IsVarlen: true}, Kind: 2, SubKind: "ipset_type", Values: []string{"list:set\x00", "bitmap:ip\x00", "bitmap:port\x00", "hash:net,port,net\x00", "hash:net,port\x00", "hash:net,net\x00", "hash:net,iface\x00", "hash:net\x00", "hash:mac\x00", "hash:ip,port,net\x00", "hash:ip,port,ip\x00", "hash:ip,port\x00", "hash:ip,mark\x00", "hash:ip\x00", "hash:ip,mac\x00", "hash:ip\x00", "bitmap:ip,mac\x00"}},
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
}, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_t[const[IPVS_CMD_ATTR_DAEMON, int16], array[ip_vs_daemon_policy]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPVS_CMD_ATTR_DAEMON, int16], array[ip_vs_daemon_policy]]", IsVarlen: true}, Fields: []Type{
@@ -27528,6 +27516,22 @@ var structDescs_arm = []*KeyedStruct{
&UnionType{Key: StructKey{Name: "ipaddr_policy"}, FldName: "payload"},
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
}, AlignAttr: 4}},
+ {Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]", TypeSize: 8}, Fields: []Type{
+ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NET_BYTEORDER"}, BitfieldOff: 6, BitfieldLen: 1, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NESTED", TypeSize: 1}, BitfieldOff: 7, BitfieldLen: 1, BitfieldUnit: 2}},
+ &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "payload"},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
+ }, AlignAttr: 4}},
+ {Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]", TypeSize: 20}, Fields: []Type{
+ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 2},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NET_BYTEORDER"}, BitfieldOff: 6, BitfieldLen: 1, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NESTED", TypeSize: 1}, BitfieldOff: 7, BitfieldLen: 1, BitfieldUnit: 2}},
+ &UnionType{Key: StructKey{Name: "ipv6_addr"}, FldName: "payload"},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
+ }, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IP_TO, int16:14], 0, 1, ipaddr_policy]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IP_TO, int16:14], 0, 1, ipaddr_policy]", IsVarlen: true}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 2},
@@ -66880,4 +66884,4 @@ var consts_arm = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}
-const revision_arm = "38399efa6fd773cb6095fe9af77784df7911294d"
+const revision_arm = "32744f930a88994892fb2d10d3e81bea166d27f2"
diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go
index 9906c3af9..1d5ec7204 100644
--- a/sys/linux/gen/arm64.go
+++ b/sys/linux/gen/arm64.go
@@ -10658,8 +10658,8 @@ var structDescs_arm64 = []*KeyedStruct{
&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "udp_timeout", TypeSize: 4}}},
}}},
{Key: StructKey{Name: "ipaddr_policy"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipaddr_policy", IsVarlen: true}, Fields: []Type{
- &StructType{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV4"},
- &StructType{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV6"},
+ &StructType{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV4"},
+ &StructType{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV6"},
}}},
{Key: StructKey{Name: "ipc_perm"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipc_perm", TypeSize: 28}, Fields: []Type{
&ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "key", TypeSize: 4}}, ValuesStart: 2039359027, ValuesPerProc: 4},
@@ -21486,18 +21486,6 @@ var structDescs_arm64 = []*KeyedStruct{
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true},
}, AlignAttr: 4}},
- {Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]", TypeSize: 8}, Fields: []Type{
- &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
- &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 1},
- &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "payload"},
- &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
- }, AlignAttr: 4}},
- {Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]", TypeSize: 20}, Fields: []Type{
- &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
- &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 2},
- &UnionType{Key: StructKey{Name: "ipv6_addr"}, FldName: "payload"},
- &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
- }, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_NAME, int16], string[ipset_name]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_NAME, int16], string[ipset_name]]", TypeSize: 12}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 18},
@@ -21564,7 +21552,7 @@ var structDescs_arm64 = []*KeyedStruct{
{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_TYPENAME, int16], string[ipset_type]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_TYPENAME, int16], string[ipset_type]]", IsVarlen: true}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3},
- &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "payload", IsVarlen: true}, Kind: 2, SubKind: "ipset_type", Values: []string{"list:set\x00", "bitmap:ip\x00", "hash:net,port,net\x00", "hash:net,port\x00", "hash:net,net\x00", "hash:net,iface\x00", "hash:net\x00", "hash:mac\x00", "hash:ip,port,net\x00", "hash:ip,port,ip\x00", "hash:ip,port\x00", "hash:ip,mark\x00", "hash:ip\x00", "hash:ip,mac\x00", "hash:ip\x00", "bitmap:ip,mac\x00"}},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "payload", IsVarlen: true}, Kind: 2, SubKind: "ipset_type", Values: []string{"list:set\x00", "bitmap:ip\x00", "bitmap:port\x00", "hash:net,port,net\x00", "hash:net,port\x00", "hash:net,net\x00", "hash:net,iface\x00", "hash:net\x00", "hash:mac\x00", "hash:ip,port,net\x00", "hash:ip,port,ip\x00", "hash:ip,port\x00", "hash:ip,mark\x00", "hash:ip\x00", "hash:ip,mac\x00", "hash:ip\x00", "bitmap:ip,mac\x00"}},
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
}, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_t[const[IPVS_CMD_ATTR_DAEMON, int16], array[ip_vs_daemon_policy]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPVS_CMD_ATTR_DAEMON, int16], array[ip_vs_daemon_policy]]", IsVarlen: true}, Fields: []Type{
@@ -28048,6 +28036,22 @@ var structDescs_arm64 = []*KeyedStruct{
&UnionType{Key: StructKey{Name: "ipaddr_policy"}, FldName: "payload"},
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
}, AlignAttr: 4}},
+ {Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]", TypeSize: 8}, Fields: []Type{
+ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NET_BYTEORDER"}, BitfieldOff: 6, BitfieldLen: 1, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NESTED", TypeSize: 1}, BitfieldOff: 7, BitfieldLen: 1, BitfieldUnit: 2}},
+ &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "payload"},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
+ }, AlignAttr: 4}},
+ {Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]", TypeSize: 20}, Fields: []Type{
+ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 2},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NET_BYTEORDER"}, BitfieldOff: 6, BitfieldLen: 1, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NESTED", TypeSize: 1}, BitfieldOff: 7, BitfieldLen: 1, BitfieldUnit: 2}},
+ &UnionType{Key: StructKey{Name: "ipv6_addr"}, FldName: "payload"},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
+ }, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IP_TO, int16:14], 0, 1, ipaddr_policy]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IP_TO, int16:14], 0, 1, ipaddr_policy]", IsVarlen: true}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 2},
@@ -67409,4 +67413,4 @@ var consts_arm64 = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}
-const revision_arm64 = "4a5b0bbf915dc6e5fae2282a37be1b5e7bdb2ebd"
+const revision_arm64 = "c064e8c787f442c13d1fb97ba0c5fadfaa75a438"
diff --git a/sys/linux/gen/mips64le.go b/sys/linux/gen/mips64le.go
index 5de265578..343ea4105 100644
--- a/sys/linux/gen/mips64le.go
+++ b/sys/linux/gen/mips64le.go
@@ -10655,8 +10655,8 @@ var structDescs_mips64le = []*KeyedStruct{
&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "udp_timeout", TypeSize: 4}}},
}}},
{Key: StructKey{Name: "ipaddr_policy"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipaddr_policy", IsVarlen: true}, Fields: []Type{
- &StructType{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV4"},
- &StructType{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV6"},
+ &StructType{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV4"},
+ &StructType{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV6"},
}}},
{Key: StructKey{Name: "ipc_perm"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipc_perm", TypeSize: 28}, Fields: []Type{
&ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "key", TypeSize: 4}}, ValuesStart: 2039359027, ValuesPerProc: 4},
@@ -21430,18 +21430,6 @@ var structDescs_mips64le = []*KeyedStruct{
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true},
}, AlignAttr: 4}},
- {Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]", TypeSize: 8}, Fields: []Type{
- &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
- &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 1},
- &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "payload"},
- &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
- }, AlignAttr: 4}},
- {Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]", TypeSize: 20}, Fields: []Type{
- &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
- &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 2},
- &UnionType{Key: StructKey{Name: "ipv6_addr"}, FldName: "payload"},
- &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
- }, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_NAME, int16], string[ipset_name]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_NAME, int16], string[ipset_name]]", TypeSize: 12}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 18},
@@ -21508,7 +21496,7 @@ var structDescs_mips64le = []*KeyedStruct{
{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_TYPENAME, int16], string[ipset_type]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_TYPENAME, int16], string[ipset_type]]", IsVarlen: true}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3},
- &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "payload", IsVarlen: true}, Kind: 2, SubKind: "ipset_type", Values: []string{"list:set\x00", "bitmap:ip\x00", "hash:net,port,net\x00", "hash:net,port\x00", "hash:net,net\x00", "hash:net,iface\x00", "hash:net\x00", "hash:mac\x00", "hash:ip,port,net\x00", "hash:ip,port,ip\x00", "hash:ip,port\x00", "hash:ip,mark\x00", "hash:ip\x00", "hash:ip,mac\x00", "hash:ip\x00", "bitmap:ip,mac\x00"}},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "payload", IsVarlen: true}, Kind: 2, SubKind: "ipset_type", Values: []string{"list:set\x00", "bitmap:ip\x00", "bitmap:port\x00", "hash:net,port,net\x00", "hash:net,port\x00", "hash:net,net\x00", "hash:net,iface\x00", "hash:net\x00", "hash:mac\x00", "hash:ip,port,net\x00", "hash:ip,port,ip\x00", "hash:ip,port\x00", "hash:ip,mark\x00", "hash:ip\x00", "hash:ip,mac\x00", "hash:ip\x00", "bitmap:ip,mac\x00"}},
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
}, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_t[const[IPVS_CMD_ATTR_DAEMON, int16], array[ip_vs_daemon_policy]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPVS_CMD_ATTR_DAEMON, int16], array[ip_vs_daemon_policy]]", IsVarlen: true}, Fields: []Type{
@@ -27992,6 +27980,22 @@ var structDescs_mips64le = []*KeyedStruct{
&UnionType{Key: StructKey{Name: "ipaddr_policy"}, FldName: "payload"},
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
}, AlignAttr: 4}},
+ {Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]", TypeSize: 8}, Fields: []Type{
+ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NET_BYTEORDER"}, BitfieldOff: 6, BitfieldLen: 1, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NESTED", TypeSize: 1}, BitfieldOff: 7, BitfieldLen: 1, BitfieldUnit: 2}},
+ &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "payload"},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
+ }, AlignAttr: 4}},
+ {Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]", TypeSize: 20}, Fields: []Type{
+ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 2},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NET_BYTEORDER"}, BitfieldOff: 6, BitfieldLen: 1, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NESTED", TypeSize: 1}, BitfieldOff: 7, BitfieldLen: 1, BitfieldUnit: 2}},
+ &UnionType{Key: StructKey{Name: "ipv6_addr"}, FldName: "payload"},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
+ }, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IP_TO, int16:14], 0, 1, ipaddr_policy]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IP_TO, int16:14], 0, 1, ipaddr_policy]", IsVarlen: true}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 2},
@@ -65032,4 +65036,4 @@ var consts_mips64le = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}
-const revision_mips64le = "40914b1708fd9e1873fd1e548d1876674daeb08c"
+const revision_mips64le = "8d96fc0e36e9a748e7d76776b30e8491198e5a00"
diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go
index 6bb5cdb48..fd1cc65a2 100644
--- a/sys/linux/gen/ppc64le.go
+++ b/sys/linux/gen/ppc64le.go
@@ -10657,8 +10657,8 @@ var structDescs_ppc64le = []*KeyedStruct{
&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "udp_timeout", TypeSize: 4}}},
}}},
{Key: StructKey{Name: "ipaddr_policy"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipaddr_policy", IsVarlen: true}, Fields: []Type{
- &StructType{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV4"},
- &StructType{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV6"},
+ &StructType{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV4"},
+ &StructType{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]"}, FldName: "IPSET_ATTR_IPADDR_IPV6"},
}}},
{Key: StructKey{Name: "ipc_perm"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "ipc_perm", TypeSize: 28}, Fields: []Type{
&ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "key", TypeSize: 4}}, ValuesStart: 2039359027, ValuesPerProc: 4},
@@ -21432,18 +21432,6 @@ var structDescs_ppc64le = []*KeyedStruct{
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true},
}, AlignAttr: 4}},
- {Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV4, int16], ipv4_addr]", TypeSize: 8}, Fields: []Type{
- &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
- &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 1},
- &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "payload"},
- &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
- }, AlignAttr: 4}},
- {Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_IPADDR_IPV6, int16], ipv6_addr]", TypeSize: 20}, Fields: []Type{
- &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
- &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 2},
- &UnionType{Key: StructKey{Name: "ipv6_addr"}, FldName: "payload"},
- &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
- }, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_NAME, int16], string[ipset_name]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_NAME, int16], string[ipset_name]]", TypeSize: 12}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 18},
@@ -21510,7 +21498,7 @@ var structDescs_ppc64le = []*KeyedStruct{
{Key: StructKey{Name: "nlattr_t[const[IPSET_ATTR_TYPENAME, int16], string[ipset_type]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPSET_ATTR_TYPENAME, int16], string[ipset_type]]", IsVarlen: true}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3},
- &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "payload", IsVarlen: true}, Kind: 2, SubKind: "ipset_type", Values: []string{"list:set\x00", "bitmap:ip\x00", "hash:net,port,net\x00", "hash:net,port\x00", "hash:net,net\x00", "hash:net,iface\x00", "hash:net\x00", "hash:mac\x00", "hash:ip,port,net\x00", "hash:ip,port,ip\x00", "hash:ip,port\x00", "hash:ip,mark\x00", "hash:ip\x00", "hash:ip,mac\x00", "hash:ip\x00", "bitmap:ip,mac\x00"}},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "payload", IsVarlen: true}, Kind: 2, SubKind: "ipset_type", Values: []string{"list:set\x00", "bitmap:ip\x00", "bitmap:port\x00", "hash:net,port,net\x00", "hash:net,port\x00", "hash:net,net\x00", "hash:net,iface\x00", "hash:net\x00", "hash:mac\x00", "hash:ip,port,net\x00", "hash:ip,port,ip\x00", "hash:ip,port\x00", "hash:ip,mark\x00", "hash:ip\x00", "hash:ip,mac\x00", "hash:ip\x00", "bitmap:ip,mac\x00"}},
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
}, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_t[const[IPVS_CMD_ATTR_DAEMON, int16], array[ip_vs_daemon_policy]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[IPVS_CMD_ATTR_DAEMON, int16], array[ip_vs_daemon_policy]]", IsVarlen: true}, Fields: []Type{
@@ -27994,6 +27982,22 @@ var structDescs_ppc64le = []*KeyedStruct{
&UnionType{Key: StructKey{Name: "ipaddr_policy"}, FldName: "payload"},
&BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
}, AlignAttr: 4}},
+ {Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV4, int16:14], 1, 0, ipv4_addr]", TypeSize: 8}, Fields: []Type{
+ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NET_BYTEORDER"}, BitfieldOff: 6, BitfieldLen: 1, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NESTED", TypeSize: 1}, BitfieldOff: 7, BitfieldLen: 1, BitfieldUnit: 2}},
+ &UnionType{Key: StructKey{Name: "ipv4_addr"}, FldName: "payload"},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
+ }, AlignAttr: 4}},
+ {Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IPADDR_IPV6, int16:14], 1, 0, ipv6_addr]", TypeSize: 20}, Fields: []Type{
+ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 2},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NET_BYTEORDER"}, BitfieldOff: 6, BitfieldLen: 1, BitfieldUnit: 2}, Val: 1},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "NLA_F_NESTED", TypeSize: 1}, BitfieldOff: 7, BitfieldLen: 1, BitfieldUnit: 2}},
+ &UnionType{Key: StructKey{Name: "ipv6_addr"}, FldName: "payload"},
+ &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1},
+ }, AlignAttr: 4}},
{Key: StructKey{Name: "nlattr_tt[const[IPSET_ATTR_IP_TO, int16:14], 0, 1, ipaddr_policy]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_tt[const[IPSET_ATTR_IP_TO, int16:14], 0, 1, ipaddr_policy]", IsVarlen: true}, Fields: []Type{
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, BitSize: 8, Offset: true, Path: []string{"size"}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 1}, BitfieldLen: 14, BitfieldUnit: 2}, Val: 2},
@@ -67368,4 +67372,4 @@ var consts_ppc64le = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}
-const revision_ppc64le = "69c650466498752bad3603142d8e5a3e1b35b59f"
+const revision_ppc64le = "d14603f7bf9208fdd2c3592318d7e090e420c134"
diff --git a/sys/linux/socket_netlink_netfilter_ipset.txt b/sys/linux/socket_netlink_netfilter_ipset.txt
index e748128bc..d1ddc33a1 100644
--- a/sys/linux/socket_netlink_netfilter_ipset.txt
+++ b/sys/linux/socket_netlink_netfilter_ipset.txt
@@ -157,10 +157,10 @@ ip_set_type_adt_policy [
ipaddr_policy [
# TODO: should ipv4_addr be in reverse byte order here?
- IPSET_ATTR_IPADDR_IPV4 nlattr[IPSET_ATTR_IPADDR_IPV4, ipv4_addr]
- IPSET_ATTR_IPADDR_IPV6 nlattr[IPSET_ATTR_IPADDR_IPV6, ipv6_addr]
+ IPSET_ATTR_IPADDR_IPV4 nlnetw[IPSET_ATTR_IPADDR_IPV4, ipv4_addr]
+ IPSET_ATTR_IPADDR_IPV6 nlnetw[IPSET_ATTR_IPADDR_IPV6, ipv6_addr]
] [varlen]
ipset_name = "syz0", "syz1", "syz2"
-ipset_type = "list:set", "bitmap:ip", "hash:net,port,net", "hash:net,port", "hash:net,net", "hash:net,iface", "hash:net", "hash:mac", "hash:ip,port,net", "hash:ip,port,ip", "hash:ip,port", "hash:ip,mark", "hash:ip", "hash:ip,mac", "hash:ip", "bitmap:ip,mac"
+ipset_type = "list:set", "bitmap:ip", "bitmap:port", "hash:net,port,net", "hash:net,port", "hash:net,net", "hash:net,iface", "hash:net", "hash:mac", "hash:ip,port,net", "hash:ip,port,ip", "hash:ip,port", "hash:ip,mark", "hash:ip", "hash:ip,mac", "hash:ip", "bitmap:ip,mac"
ipset_cadt_flags = IPSET_FLAG_BEFORE, IPSET_FLAG_PHYSDEV, IPSET_FLAG_NOMATCH, IPSET_FLAG_WITH_COUNTERS, IPSET_FLAG_WITH_COMMENT, IPSET_FLAG_WITH_FORCEADD, IPSET_FLAG_WITH_SKBINFO, IPSET_FLAG_IFACE_WILDCARD