netlink: fix printing of field names of struct nlmsghdr

* netlink.c (print_nlmsghdr): Print "nlmsg_len" instead of "len",
"nlmsg_type" instead of "type", "nlmsg_flags" instead of "flags",
"nlmsg_seq" instead of "seq", and "nlmsg_pid" instead of "pid".
* tests/netlink_audit.c: Update expected output.
* tests/netlink_crypto.c: Likewise.
* tests/netlink_generic.c: Likewise.
* tests/netlink_netfilter.c: Likewise.
* tests/netlink_protocol.c: Likewise.
* tests/netlink_route.c: Likewise.
* tests/netlink_selinux.c: Likewise.
* tests/netlink_sock_diag.c: Likewise.
* tests/netlink_xfrm.c: Likewise.
* tests/nfnetlink_acct.c: Likewise.
* tests/nfnetlink_cthelper.c: Likewise.
* tests/nfnetlink_ctnetlink.c: Likewise.
* tests/nfnetlink_ctnetlink_exp.c: Likewise.
* tests/nfnetlink_cttimeout.c: Likewise.
* tests/nfnetlink_ipset.c: Likewise.
* tests/nfnetlink_nft_compat.c: Likewise.
* tests/nfnetlink_nftables.c: Likewise.
* tests/nfnetlink_osf.c: Likewise.
* tests/nfnetlink_queue.c: Likewise.
* tests/nfnetlink_ulog.c: Likewise.
* tests/nlattr.c: Likewise.
* tests/nlattr_br_port_msg.c: Likewise.
* tests/nlattr_crypto_user_alg.c: Likewise.
* tests/nlattr_dcbmsg.c: Likewise.
* tests/nlattr_fib_rule_hdr.c: Likewise.
* tests/nlattr_ifaddrlblmsg.c: Likewise.
* tests/nlattr_ifaddrmsg.c: Likewise.
* tests/nlattr_ifinfomsg.c: Likewise.
* tests/nlattr_ifla.h: Likewise.
* tests/nlattr_inet_diag_msg.c: Likewise.
* tests/nlattr_inet_diag_req_compat.c: Likewise.
* tests/nlattr_inet_diag_req_v2.c: Likewise.
* tests/nlattr_mdba_mdb_entry.c: Likewise.
* tests/nlattr_mdba_router_port.c: Likewise.
* tests/nlattr_ndmsg.c: Likewise.
* tests/nlattr_ndtmsg.c: Likewise.
* tests/nlattr_netconfmsg.c: Likewise.
* tests/nlattr_netlink_diag_msg.c: Likewise.
* tests/nlattr_nlmsgerr.c: Likewise.
* tests/nlattr_packet_diag_msg.c: Likewise.
* tests/nlattr_rtgenmsg.c: Likewise.
* tests/nlattr_rtmsg.c: Likewise.
* tests/nlattr_smc_diag_msg.c: Likewise.
* tests/nlattr_tc_stats.c: Likewise.
* tests/nlattr_tca_stab.c: Likewise.
* tests/nlattr_tcamsg.c: Likewise.
* tests/nlattr_tcmsg.c: Likewise.
* tests/nlattr_unix_diag_msg.c: Likewise.
* tests/test_netlink.h: Likewise.

1 files changed, 23 insertions, 18 deletions

diff --git a/tests/nfnetlink_cttimeout.c b/tests/nfnetlink_cttimeout.c
index 9602df7c7..00589401e 100644
--- a/tests/nfnetlink_cttimeout.c
+++ b/tests/nfnetlink_cttimeout.c
@@ -28,17 +28,19 @@ test_nlmsg_type(const int fd)
 	nlh.nlmsg_type =
 		NFNL_SUBSYS_CTNETLINK_TIMEOUT << 8 | IPCTNL_MSG_TIMEOUT_NEW;
 	rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0);
-	printf("sendto(%d, {len=%u"
-	       ", type=NFNL_SUBSYS_CTNETLINK_TIMEOUT<<8|IPCTNL_MSG_TIMEOUT_NEW"
-	       ", flags=NLM_F_REQUEST, seq=0, pid=0}"
+	printf("sendto(%d, {nlmsg_len=%u"
+	       ", nlmsg_type=NFNL_SUBSYS_CTNETLINK_TIMEOUT<<8"
+	       "|IPCTNL_MSG_TIMEOUT_NEW"
+	       ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}"
 	       ", %u, MSG_DONTWAIT, NULL, 0) = %s\n",
 	       fd, nlh.nlmsg_len, nlh.nlmsg_len, sprintrc(rc));
 
 	nlh.nlmsg_type = NFNL_SUBSYS_CTNETLINK_TIMEOUT << 8 | 0xff;
 	rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0);
-	printf("sendto(%d, {len=%u"
-	       ", type=NFNL_SUBSYS_CTNETLINK_TIMEOUT<<8|0xff /* IPCTNL_MSG_TIMEOUT_??? */"
-	       ", flags=NLM_F_REQUEST, seq=0, pid=0}"
+	printf("sendto(%d, {nlmsg_len=%u"
+	       ", nlmsg_type=NFNL_SUBSYS_CTNETLINK_TIMEOUT<<8|0xff"
+	       " /* IPCTNL_MSG_TIMEOUT_??? */"
+	       ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}"
 	       ", %u, MSG_DONTWAIT, NULL, 0) = %s\n",
 	       fd, nlh.nlmsg_len, nlh.nlmsg_len, sprintrc(rc));
 }
@@ -55,30 +57,33 @@ test_nlmsg_flags(const int fd)
 		NFNL_SUBSYS_CTNETLINK_TIMEOUT << 8 | IPCTNL_MSG_TIMEOUT_NEW;
 	nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_APPEND;
 	rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0);
-	printf("sendto(%d, {len=%u"
-	       ", type=NFNL_SUBSYS_CTNETLINK_TIMEOUT<<8|IPCTNL_MSG_TIMEOUT_NEW"
-	       ", flags=NLM_F_REQUEST|NLM_F_APPEND, seq=0, pid=0}"
-	       ", %u, MSG_DONTWAIT, NULL, 0) = %s\n",
+	printf("sendto(%d, {nlmsg_len=%u"
+	       ", nlmsg_type=NFNL_SUBSYS_CTNETLINK_TIMEOUT<<8"
+	       "|IPCTNL_MSG_TIMEOUT_NEW"
+	       ", nlmsg_flags=NLM_F_REQUEST|NLM_F_APPEND, nlmsg_seq=0"
+	       ", nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n",
 	       fd, nlh.nlmsg_len, nlh.nlmsg_len, sprintrc(rc));
 
 	nlh.nlmsg_type =
 		NFNL_SUBSYS_CTNETLINK_TIMEOUT << 8 | IPCTNL_MSG_TIMEOUT_GET;
 	nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ATOMIC;
 	rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0);
-	printf("sendto(%d, {len=%u"
-	       ", type=NFNL_SUBSYS_CTNETLINK_TIMEOUT<<8|IPCTNL_MSG_TIMEOUT_GET"
-	       ", flags=NLM_F_REQUEST|NLM_F_ATOMIC, seq=0, pid=0}"
-	       ", %u, MSG_DONTWAIT, NULL, 0) = %s\n",
+	printf("sendto(%d, {nlmsg_len=%u"
+	       ", nlmsg_type=NFNL_SUBSYS_CTNETLINK_TIMEOUT<<8"
+	       "|IPCTNL_MSG_TIMEOUT_GET"
+	       ", nlmsg_flags=NLM_F_REQUEST|NLM_F_ATOMIC, nlmsg_seq=0"
+	       ", nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n",
 	       fd, nlh.nlmsg_len, nlh.nlmsg_len, sprintrc(rc));
 
 	nlh.nlmsg_type =
 		NFNL_SUBSYS_CTNETLINK_TIMEOUT << 8 | IPCTNL_MSG_TIMEOUT_DELETE;
 	nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_NONREC;
 	rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0);
-	printf("sendto(%d, {len=%u"
-	       ", type=NFNL_SUBSYS_CTNETLINK_TIMEOUT<<8|IPCTNL_MSG_TIMEOUT_DELETE"
-	       ", flags=NLM_F_REQUEST|NLM_F_NONREC, seq=0, pid=0}"
-	       ", %u, MSG_DONTWAIT, NULL, 0) = %s\n",
+	printf("sendto(%d, {nlmsg_len=%u"
+	       ", nlmsg_type=NFNL_SUBSYS_CTNETLINK_TIMEOUT<<8"
+	       "|IPCTNL_MSG_TIMEOUT_DELETE"
+	       ", nlmsg_flags=NLM_F_REQUEST|NLM_F_NONREC, nlmsg_seq=0"
+	       ", nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n",
 	       fd, nlh.nlmsg_len, nlh.nlmsg_len, sprintrc(rc));
 }