netlink_sock_diag: print unrecognized data in hex

* netlink_sock_diag.c (decode_family): Replace printstrn with
printstr_ex and set QUOTE_FORCE_HEX flag.
* tests/netlink_sock_diag.c (test_odd_family_req,
test_odd_family_msg): Update expected output.

diff --git a/netlink_sock_diag.c b/netlink_sock_diag.c
index 3888934974051c50bb601fd57798bafceb66ac81..0d27f78d40cab9f45970043c322a05a7b79e7859 100644 (file)
--- a/netlink_sock_diag.c
+++ b/netlink_sock_diag.c
@@ -74,8 +74,8 @@ decode_family(struct tcb *const tcp, const uint8_t family,
        printxval(addrfams, family, "AF_???");
        if (len > sizeof(family)) {
                tprints(", ");
-               printstrn(tcp, addr + sizeof(family),
-                         len - sizeof(family));
+               printstr_ex(tcp, addr + sizeof(family),
+                           len - sizeof(family), QUOTE_FORCE_HEX);
        }
        tprints("}");
 }

diff --git a/tests/netlink_sock_diag.c b/tests/netlink_sock_diag.c
index b8d019040472dbc3dcfb34fea3572e4889220b45..c5ed95e848cf48b2c2ecf85a549cc5f9f64809fc 100644 (file)
--- a/tests/netlink_sock_diag.c
+++ b/tests/netlink_sock_diag.c
@@ -158,7 +158,7 @@ test_odd_family_req(const int fd)
 
        printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY"
               ", flags=NLM_F_REQUEST, seq=0, pid=0}"
-              ", {family=AF_UNSPEC, \"1234\"}}"
+              ", {family=AF_UNSPEC, \"\\x31\\x32\\x33\\x34\"}}"
               ", %u, MSG_DONTWAIT, NULL, 0) = %s\n",
               fd, NLMSG_HDRLEN + (unsigned int) sizeof(*family) + 4,
               NLMSG_HDRLEN + (unsigned int) sizeof(*family) + 4,
@@ -172,7 +172,7 @@ test_odd_family_req(const int fd)
 
        printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY"
               ", flags=NLM_F_REQUEST, seq=0, pid=0}"
-              ", {family=0xfd /* AF_??? */, \"1234\"}}"
+              ", {family=0xfd /* AF_??? */, \"\\x31\\x32\\x33\\x34\"}}"
               ", %u, MSG_DONTWAIT, NULL, 0) = %s\n",
               fd, NLMSG_HDRLEN + (unsigned int) sizeof(*family) + 4,
               NLMSG_HDRLEN + (unsigned int) sizeof(*family) + 4,
@@ -255,7 +255,7 @@ test_odd_family_msg(const int fd)
 
        printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY"
               ", flags=NLM_F_DUMP, seq=0, pid=0}"
-              ", {family=AF_UNSPEC, \"1234\"}}"
+              ", {family=AF_UNSPEC, \"\\x31\\x32\\x33\\x34\"}}"
               ", %u, MSG_DONTWAIT, NULL, 0) = %s\n",
               fd, NLMSG_HDRLEN + (unsigned int) sizeof(*family) + 4,
               NLMSG_HDRLEN + (unsigned int) sizeof(*family) + 4,
@@ -269,7 +269,7 @@ test_odd_family_msg(const int fd)
 
        printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY"
               ", flags=NLM_F_DUMP, seq=0, pid=0}"
-              ", {family=0xfb /* AF_??? */, \"1234\"}}"
+              ", {family=0xfb /* AF_??? */, \"\\x31\\x32\\x33\\x34\"}}"
               ", %u, MSG_DONTWAIT, NULL, 0) = %s\n",
               fd, NLMSG_HDRLEN + (unsigned int) sizeof(*family) + 4,
               NLMSG_HDRLEN + (unsigned int) sizeof(*family) + 4,