summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2020-09-06 08:00:00 +0000
committerDmitry V. Levin <ldv@altlinux.org>2020-09-06 08:00:00 +0000
commitd27f7838a0c6a6c18347062d88d6dc49de7b9bd2 (patch)
tree870804fb0dbfb7333694446db8d24186665d81a2
parent54c3fa0522bc2feca83ca15e2bd0eaee3152947a (diff)
downloadstrace-d27f7838a0c6a6c18347062d88d6dc49de7b9bd2.tar.gz
xlat: update INET_DIAG_REQ_* constants
* linux/inet_diag.h (INET_DIAG_REQ_SK_BPF_STORAGES): New constant introduced by Linux kernel commit v5.7-rc1~146^2~287^2^2. (INET_DIAG_REQ_PROTOCOL): New constant introduced by Linux kernel commit v5.9-rc1~133^2~292^2~3. * xlat/inet_diag_req_attrs.in: Likewise. * NEWS: Mention this change.
-rw-r--r--NEWS3
-rw-r--r--linux/inet_diag.h2
-rw-r--r--tests/nlattr_inet_diag_req_compat.c4
-rw-r--r--xlat/inet_diag_req_attrs.in2
4 files changed, 8 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 987cfec27..16b8d74d2 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,8 @@ Noteworthy changes in release ?.? (????-??-??)
* Added -n/--syscall-number option for printing syscall numbers.
* Added --pidns-translation option for PID namespace translation.
* Implemented decoding of close_range syscall.
- * Updated lists of BPF_*, CAP_*, FAN_*, IFLA_*, IP_*, and IPV6_* constants.
+ * Updated lists of BPF_*, CAP_*, FAN_*, IFLA_*, INET_DIAG_REQ_*, IP_*,
+ and IPV6_* constants.
* Bug fixes
diff --git a/linux/inet_diag.h b/linux/inet_diag.h
index fab9f513c..c132bce6f 100644
--- a/linux/inet_diag.h
+++ b/linux/inet_diag.h
@@ -44,6 +44,8 @@ struct inet_diag_req_v2 {
enum {
INET_DIAG_REQ_NONE,
INET_DIAG_REQ_BYTECODE,
+ INET_DIAG_REQ_SK_BPF_STORAGES,
+ INET_DIAG_REQ_PROTOCOL,
};
struct inet_diag_bc_op {
diff --git a/tests/nlattr_inet_diag_req_compat.c b/tests/nlattr_inet_diag_req_compat.c
index 8cce46cd7..7eeca89c0 100644
--- a/tests/nlattr_inet_diag_req_compat.c
+++ b/tests/nlattr_inet_diag_req_compat.c
@@ -73,10 +73,10 @@ main(void)
char nla_type_str[256];
sprintf(nla_type_str, "%#x /* INET_DIAG_REQ_??? */",
- INET_DIAG_REQ_BYTECODE + 1);
+ INET_DIAG_REQ_PROTOCOL + 1);
TEST_NLATTR_(fd, nlh0, hdrlen,
init_inet_diag_req, print_inet_diag_req,
- INET_DIAG_REQ_BYTECODE + 1, nla_type_str,
+ INET_DIAG_REQ_PROTOCOL + 1, nla_type_str,
4, pattern, 4,
print_quoted_hex(pattern, 4));
diff --git a/xlat/inet_diag_req_attrs.in b/xlat/inet_diag_req_attrs.in
index c36369ee8..3fdf9262f 100644
--- a/xlat/inet_diag_req_attrs.in
+++ b/xlat/inet_diag_req_attrs.in
@@ -1,3 +1,5 @@
#unconditional
INET_DIAG_REQ_NONE
INET_DIAG_REQ_BYTECODE
+INET_DIAG_REQ_SK_BPF_STORAGES
+INET_DIAG_REQ_PROTOCOL