summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@strace.io>2022-10-09 08:00:00 +0000
committerDmitry V. Levin <ldv@strace.io>2022-10-09 08:00:00 +0000
commit419110adffefb15c890265aba280d00c0001476c (patch)
tree30d61ae604f3f475a90087f921cc0bccd864ff7f
parent8de29abb7727674f1520833e02c5cbe3b3297bbd (diff)
downloadstrace-419110adffefb15c890265aba280d00c0001476c.tar.gz
xlat: update TLS_INFO_* constants
* src/xlat/inet_diag_ulp_info_tls_attrs.in (TLS_INFO_RX_NO_PAD): New constant introduced by Linux kernel commit v6.0-rc1~141^2~193^2~2. * src/netlink_inet_diag.c (diag_ulp_info_tls_nla_decoders): Add TLS_INFO_RX_NO_PAD. * tests/nlattr_inet_diag_msg.c (tls_unk_attrs): Update expected output. * NEWS: Mention this change.
-rw-r--r--NEWS2
-rw-r--r--src/netlink_inet_diag.c1
-rw-r--r--src/xlat/inet_diag_ulp_info_tls_attrs.in1
-rw-r--r--tests/nlattr_inet_diag_msg.c4
4 files changed, 5 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index fd2cb6c1e..b9a844694 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ Noteworthy changes in release ?.?? (????-??-??)
* Enhanced decoding of PTP_* ioctl commands.
* Updated decoding of setns syscall.
* Updated lists of BPF_*, BTRFS_*, FAN_*, ETH_P_*, KVM_*, NDTPA_*,
- NT_*, and PERF_* constants.
+ NT_*, PERF_*, and TLS_INFO_* constants.
* Bug fixes
diff --git a/src/netlink_inet_diag.c b/src/netlink_inet_diag.c
index 29d060a30..93c806f91 100644
--- a/src/netlink_inet_diag.c
+++ b/src/netlink_inet_diag.c
@@ -572,6 +572,7 @@ static const nla_decoder_t diag_ulp_info_tls_nla_decoders[] = {
[TLS_INFO_TXCONF] = decode_tls_config,
[TLS_INFO_RXCONF] = decode_tls_config,
[TLS_INFO_ZC_RO_TX] = NULL, /* flag nlattr, no payload */
+ [TLS_INFO_RX_NO_PAD] = NULL, /* flag nlattr, no payload */
};
static bool
diff --git a/src/xlat/inet_diag_ulp_info_tls_attrs.in b/src/xlat/inet_diag_ulp_info_tls_attrs.in
index 49f8489df..2eb09cd5d 100644
--- a/src/xlat/inet_diag_ulp_info_tls_attrs.in
+++ b/src/xlat/inet_diag_ulp_info_tls_attrs.in
@@ -6,3 +6,4 @@ TLS_INFO_CIPHER 2
TLS_INFO_TXCONF 3
TLS_INFO_RXCONF 4
TLS_INFO_ZC_RO_TX 5
+TLS_INFO_RX_NO_PAD 6
diff --git a/tests/nlattr_inet_diag_msg.c b/tests/nlattr_inet_diag_msg.c
index 64776fda5..290c8508f 100644
--- a/tests/nlattr_inet_diag_msg.c
+++ b/tests/nlattr_inet_diag_msg.c
@@ -488,8 +488,8 @@ main(void)
/* INET_DIAG_ULP_INFO: INET_ULP_INFO_TLS: unknown, undecoded */
static const struct strval16 tls_unk_attrs[] = {
{ ENUM_KNOWN(0, TLS_INFO_UNSPEC) },
- { ENUM_KNOWN(0x5, TLS_INFO_ZC_RO_TX) },
- { ARG_XLAT_UNKNOWN(0x6, "TLS_INFO_???") },
+ { ENUM_KNOWN(0x6, TLS_INFO_RX_NO_PAD) },
+ { ARG_XLAT_UNKNOWN(0x7, "TLS_INFO_???") },
{ ARG_XLAT_UNKNOWN(0x1ace, "TLS_INFO_???") },
};