diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2024-12-10 14:14:30 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2024-12-11 15:22:17 +0000 |
| commit | 51cc7d239d57fbdf7b64a618b7c6128bf7588876 (patch) | |
| tree | 4387c03751e58bde7615d7790095ddf496a55d05 | |
| parent | 59267911909f7e749367f87d62448d7daa87b1b5 (diff) | |
pkg/declextract: restore use of ipv6_addr
| -rw-r--r-- | pkg/declextract/declextract.go | 2 | ||||
| -rw-r--r-- | sys/linux/auto.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/declextract/declextract.go b/pkg/declextract/declextract.go index 55194e807..c3c6d705f 100644 --- a/pkg/declextract/declextract.go +++ b/pkg/declextract/declextract.go @@ -336,7 +336,7 @@ func (ctx *context) fieldTypeBuffer(f *Field) string { // ConstantArrayType::getSizeExpr. But for now let's just do the simple thing. return "mac_addr" } - if t.MinSize == 16 && t.MaxSize == 16 && + if (t.MaxSize == 0 || t.MaxSize == 16) && (strings.Contains(f.Name, "ipv6") || strings.Contains(f.Name, "ip6")) { return "ipv6_addr" } diff --git a/sys/linux/auto.txt b/sys/linux/auto.txt index b65d669c6..87c687f54 100644 --- a/sys/linux/auto.txt +++ b/sys/linux/auto.txt @@ -5670,9 +5670,9 @@ sendmsg$auto_TCP_METRICS_CMD_DEL(fd sock_nl_generic, msg ptr[in, msghdr_tcp_metr tcp_metrics_nl_policy_tcp_metrics$auto [ TCP_METRICS_ATTR_ADDR_IPV4 nlattr[TCP_METRICS_ATTR_ADDR_IPV4, ipv4_addr] - TCP_METRICS_ATTR_ADDR_IPV6 nlattr[TCP_METRICS_ATTR_ADDR_IPV6, array[int8]] + TCP_METRICS_ATTR_ADDR_IPV6 nlattr[TCP_METRICS_ATTR_ADDR_IPV6, ipv6_addr] TCP_METRICS_ATTR_SADDR_IPV4 nlattr[TCP_METRICS_ATTR_SADDR_IPV4, ipv4_addr] - TCP_METRICS_ATTR_SADDR_IPV6 nlattr[TCP_METRICS_ATTR_SADDR_IPV6, array[int8]] + TCP_METRICS_ATTR_SADDR_IPV6 nlattr[TCP_METRICS_ATTR_SADDR_IPV6, ipv6_addr] ] [varlen] resource genl_thermal_family_id$auto[int16] |