From: JingPiao Chen <chenjingpiao@gmail.com>
Date: Tue, 27 Jun 2017 10:10:06 +0000 (+0800)
Subject: netlink: add a basic netlink attribute parser of AF_SMC diag
X-Git-Tag: v4.18~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a07665e3082c5fabc31a07e612d7c681fea9a2a0;p=strace

netlink: add a basic netlink attribute parser of AF_SMC diag

* netlink_sock_diag.c: Include "xlat/smc_diag_attrs.h".
(decode_smc_diag_msg): Use decode_nlattr.
* xlat/smc_diag_attrs.in: New file.
---

diff --git a/netlink_sock_diag.c b/netlink_sock_diag.c
index 47ee8aba..60c8627b 100644
--- a/netlink_sock_diag.c
+++ b/netlink_sock_diag.c
@@ -55,6 +55,7 @@
 #include "xlat/packet_diag_show.h"
 
 #ifdef AF_SMC
+# include "xlat/smc_diag_attrs.h"
 # include "xlat/smc_diag_extended_flags.h"
 # include "xlat/smc_states.h"
 #endif
@@ -500,7 +501,8 @@ decode_smc_diag_msg(struct tcb *const tcp,
 		    const kernel_ulong_t len)
 {
 	struct smc_diag_msg msg = { .diag_family = family };
-	const size_t offset = sizeof(msg.diag_family);
+	size_t offset = sizeof(msg.diag_family);
+	bool decode_nla = false;
 
 	PRINT_FIELD_XVAL("{", msg, diag_family, addrfams, "AF_???");
 	tprints(", ");
@@ -520,11 +522,18 @@ decode_smc_diag_msg(struct tcb *const tcp,
 			print_inet_diag_sockid(&msg.id, AF_INET);
 			PRINT_FIELD_U(", ", msg, diag_uid);
 			PRINT_FIELD_U(", ", msg, diag_inode);
+			decode_nla = true;
 		}
 	} else
 		tprints("...");
 	tprints("}");
 
+	offset = NLA_ALIGN(sizeof(msg));
+	if (decode_nla && len > offset) {
+		tprints(", ");
+		decode_nlattr(tcp, addr + offset, len - offset,
+			      smc_diag_attrs, "SMC_DIAG_???");
+	}
 }
 #endif
 
diff --git a/xlat/smc_diag_attrs.in b/xlat/smc_diag_attrs.in
new file mode 100644
index 00000000..cd6179be
--- /dev/null
+++ b/xlat/smc_diag_attrs.in
@@ -0,0 +1,5 @@
+#unconditional
+SMC_DIAG_NONE
+SMC_DIAG_CONNINFO
+SMC_DIAG_LGRINFO
+SMC_DIAG_SHUTDOWN