diff options
Diffstat (limited to 'tests')
49 files changed, 430 insertions, 394 deletions
diff --git a/tests/netlink_audit.c b/tests/netlink_audit.c index 559c2f711..11b2b07b7 100644 --- a/tests/netlink_audit.c +++ b/tests/netlink_audit.c @@ -30,8 +30,8 @@ test_nlmsg_type(const int fd) rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); pidns_print_leader(); - printf("sendto(%d, {len=%u, type=AUDIT_GET" - ", flags=NLM_F_REQUEST, seq=0, pid=%d%s}" + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=AUDIT_GET" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=%d%s}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, nlh.nlmsg_pid, pidns_pid2str(PT_TGID), (unsigned) sizeof(nlh), sprintrc(rc)); diff --git a/tests/netlink_crypto.c b/tests/netlink_crypto.c index e2a5be0c7..8d3140f24 100644 --- a/tests/netlink_crypto.c +++ b/tests/netlink_crypto.c @@ -27,8 +27,8 @@ test_nlmsg_type(const int fd) }; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=CRYPTO_MSG_NEWALG" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=CRYPTO_MSG_NEWALG" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); } @@ -44,32 +44,32 @@ test_nlmsg_flags(const int fd) nlh.nlmsg_type = CRYPTO_MSG_GETALG; nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=CRYPTO_MSG_GETALG" - ", flags=NLM_F_REQUEST|NLM_F_DUMP, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=CRYPTO_MSG_GETALG" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_DUMP, nlmsg_seq=0" + ", nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); nlh.nlmsg_type = CRYPTO_MSG_NEWALG; nlh.nlmsg_flags = NLM_F_ECHO | NLM_F_REPLACE; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=CRYPTO_MSG_NEWALG" - ", flags=NLM_F_ECHO|NLM_F_REPLACE, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=CRYPTO_MSG_NEWALG" + ", nlmsg_flags=NLM_F_ECHO|NLM_F_REPLACE, nlmsg_seq=0" + ", nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); nlh.nlmsg_type = CRYPTO_MSG_DELALG; nlh.nlmsg_flags = NLM_F_ECHO | NLM_F_NONREC; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=CRYPTO_MSG_DELALG" - ", flags=NLM_F_ECHO|NLM_F_NONREC, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=CRYPTO_MSG_DELALG" + ", nlmsg_flags=NLM_F_ECHO|NLM_F_NONREC, nlmsg_seq=0" + ", nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); nlh.nlmsg_type = CRYPTO_MSG_UPDATEALG; nlh.nlmsg_flags = NLM_F_REPLACE; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=CRYPTO_MSG_UPDATEALG" - ", flags=%#x /* NLM_F_??? */, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=CRYPTO_MSG_UPDATEALG" + ", nlmsg_flags=%#x /* NLM_F_??? */, nlmsg_seq=0, nlmsg_pid=0}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, NLM_F_REPLACE, (unsigned) sizeof(nlh), sprintrc(rc)); diff --git a/tests/netlink_generic.c b/tests/netlink_generic.c index 485ece11b..a539ce4c4 100644 --- a/tests/netlink_generic.c +++ b/tests/netlink_generic.c @@ -39,8 +39,8 @@ test_nlmsg_type(const int fd) }; rc = sendto(fd, &req, sizeof(req), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=nlctrl" - ", flags=NLM_F_REQUEST|0x300, seq=0, pid=0}" + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=nlctrl" + ", nlmsg_flags=NLM_F_REQUEST|0x300, nlmsg_seq=0, nlmsg_pid=0}" ", \"\\x03\\x00\\x00\\x00\"}, %u" ", MSG_DONTWAIT, NULL, 0) = %s\n", fd, req.nlh.nlmsg_len, diff --git a/tests/netlink_netfilter.c b/tests/netlink_netfilter.c index 6f535d4b1..fd5f020ac 100644 --- a/tests/netlink_netfilter.c +++ b/tests/netlink_netfilter.c @@ -43,25 +43,25 @@ test_nlmsg_type(const int fd) # ifdef NFNL_MSG_BATCH_BEGIN nlh.nlmsg_type = NFNL_MSG_BATCH_BEGIN; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=NFNL_MSG_BATCH_BEGIN" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=NFNL_MSG_BATCH_BEGIN" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); # endif nlh.nlmsg_type = NFNL_SUBSYS_CTNETLINK << 8 | 0xff; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_CTNETLINK<<8|0xff /* IPCTNL_MSG_CT_??? */" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_CTNETLINK<<8|0xff" + " /* IPCTNL_MSG_CT_??? */, nlmsg_flags=NLM_F_REQUEST" + ", nlmsg_seq=0, nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); nlh.nlmsg_type = 0xffff; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=0xff /* NFNL_SUBSYS_??? */<<8|0xff" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=0xff" + " /* NFNL_SUBSYS_??? */<<8|0xff, nlmsg_flags=NLM_F_REQUEST" + ", nlmsg_seq=0, nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); } diff --git a/tests/netlink_protocol.c b/tests/netlink_protocol.c index a01c7e1a0..be24b0609 100644 --- a/tests/netlink_protocol.c +++ b/tests/netlink_protocol.c @@ -70,8 +70,9 @@ send_query(const int fd) /* a single message with some data */ rc = sendto(fd, req, sizeof(*req), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=NLMSG_NOOP, flags=NLM_F_REQUEST|0x%x" - ", seq=0, pid=0}, \"\\x61\\x62\\x63\\x64\"}" + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=NLMSG_NOOP" + ", nlmsg_flags=NLM_F_REQUEST|0x%x" + ", nlmsg_seq=0, nlmsg_pid=0}, \"\\x61\\x62\\x63\\x64\"}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, req->nlh.nlmsg_len, NLM_F_DUMP, (unsigned) sizeof(*req), sprintrc(rc)); @@ -79,16 +80,18 @@ send_query(const int fd) /* a single message without data */ req->nlh.nlmsg_len = sizeof(req->nlh); rc = sendto(fd, &req->nlh, sizeof(req->nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=NLMSG_NOOP, flags=NLM_F_REQUEST|0x%x" - ", seq=0, pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=NLMSG_NOOP" + ", nlmsg_flags=NLM_F_REQUEST|0x%x" + ", nlmsg_seq=0, nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, req->nlh.nlmsg_len, NLM_F_DUMP, (unsigned) sizeof(req->nlh), sprintrc(rc)); /* nlmsg_len > whole message length */ req->nlh.nlmsg_len = sizeof(*req) + 8; rc = sendto(fd, req, sizeof(*req), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=NLMSG_NOOP, flags=NLM_F_REQUEST|0x%x" - ", seq=0, pid=0}, \"\\x61\\x62\\x63\\x64\"}" + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=NLMSG_NOOP" + ", nlmsg_flags=NLM_F_REQUEST|0x%x" + ", nlmsg_seq=0, nlmsg_pid=0}, \"\\x61\\x62\\x63\\x64\"}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, req->nlh.nlmsg_len, NLM_F_DUMP, (unsigned) sizeof(*req), sprintrc(rc)); @@ -96,8 +99,9 @@ send_query(const int fd) /* nlmsg_len < sizeof(struct nlmsghdr) */ req->nlh.nlmsg_len = 8; rc = sendto(fd, req, sizeof(*req), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=NLMSG_NOOP, flags=NLM_F_REQUEST|0x%x" - ", seq=0, pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=NLMSG_NOOP" + ", nlmsg_flags=NLM_F_REQUEST|0x%x" + ", nlmsg_seq=0, nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, req->nlh.nlmsg_len, NLM_F_DUMP, (unsigned) sizeof(*req), sprintrc(rc)); @@ -112,10 +116,12 @@ send_query(const int fd) memcpy(&reqs->req2, &c_req, sizeof(c_req)); rc = sendto(fd, reqs, sizeof(*reqs), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, [{{len=%u, type=NLMSG_NOOP, flags=NLM_F_REQUEST|0x%x" - ", seq=0, pid=0}, \"\\x61\\x62\\x63\\x64\"}" - ", {{len=%u, type=NLMSG_NOOP, flags=NLM_F_REQUEST|0x%x" - ", seq=0, pid=0}, \"\\x61\\x62\\x63\\x64\"}]" + printf("sendto(%d, [{{nlmsg_len=%u, nlmsg_type=NLMSG_NOOP" + ", nlmsg_flags=NLM_F_REQUEST|0x%x" + ", nlmsg_seq=0, nlmsg_pid=0}, \"\\x61\\x62\\x63\\x64\"}" + ", {{nlmsg_len=%u, nlmsg_type=NLMSG_NOOP" + ", nlmsg_flags=NLM_F_REQUEST|0x%x" + ", nlmsg_seq=0, nlmsg_pid=0}, \"\\x61\\x62\\x63\\x64\"}]" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, reqs->req1.nlh.nlmsg_len, NLM_F_DUMP, reqs->req2.nlh.nlmsg_len, NLM_F_DUMP, @@ -124,8 +130,9 @@ send_query(const int fd) /* unfetchable second struct nlmsghdr */ void *const efault2 = tail_memdup(&reqs->req1, sizeof(reqs->req1)); rc = sendto(fd, efault2, sizeof(*reqs), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, [{{len=%u, type=NLMSG_NOOP, flags=NLM_F_REQUEST|0x%x" - ", seq=0, pid=0}, \"\\x61\\x62\\x63\\x64\"}" + printf("sendto(%d, [{{nlmsg_len=%u, nlmsg_type=NLMSG_NOOP" + ", nlmsg_flags=NLM_F_REQUEST|0x%x" + ", nlmsg_seq=0, nlmsg_pid=0}, \"\\x61\\x62\\x63\\x64\"}" ", ... /* %p */], %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, reqs->req1.nlh.nlmsg_len, NLM_F_DUMP, &((struct reqs *) efault2)->req2, (unsigned) sizeof(*reqs), @@ -135,8 +142,9 @@ send_query(const int fd) rc = sendto(fd, reqs, sizeof(*reqs) - sizeof(req->nlh), MSG_DONTWAIT, NULL, 0); errstr = sprintrc(rc); - printf("sendto(%d, [{{len=%u, type=NLMSG_NOOP, flags=NLM_F_REQUEST|0x%x" - ", seq=0, pid=0}, \"\\x61\\x62\\x63\\x64\"}, ", + printf("sendto(%d, [{{nlmsg_len=%u, nlmsg_type=NLMSG_NOOP" + ", nlmsg_flags=NLM_F_REQUEST|0x%x" + ", nlmsg_seq=0, nlmsg_pid=0}, \"\\x61\\x62\\x63\\x64\"}, ", fd, reqs->req1.nlh.nlmsg_len, NLM_F_DUMP); print_quoted_hex(&reqs->req2.nlh, sizeof(reqs->req2) - sizeof(req->nlh)); @@ -146,10 +154,12 @@ send_query(const int fd) /* second nlmsg_len < sizeof(struct nlmsghdr) */ reqs->req2.nlh.nlmsg_len = 4; rc = sendto(fd, reqs, sizeof(*reqs), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, [{{len=%u, type=NLMSG_NOOP, flags=NLM_F_REQUEST|0x%x" - ", seq=0, pid=0}, \"\\x61\\x62\\x63\\x64\"}" - ", {len=%u, type=NLMSG_NOOP, flags=NLM_F_REQUEST|0x%x" - ", seq=0, pid=0}], %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, [{{nlmsg_len=%u, nlmsg_type=NLMSG_NOOP" + ", nlmsg_flags=NLM_F_REQUEST|0x%x" + ", nlmsg_seq=0, nlmsg_pid=0}, \"\\x61\\x62\\x63\\x64\"}" + ", {nlmsg_len=%u, nlmsg_type=NLMSG_NOOP" + ", nlmsg_flags=NLM_F_REQUEST|0x%x" + ", nlmsg_seq=0, nlmsg_pid=0}], %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, reqs->req1.nlh.nlmsg_len, NLM_F_DUMP, reqs->req2.nlh.nlmsg_len, NLM_F_DUMP, (unsigned) sizeof(*reqs), sprintrc(rc)); @@ -173,8 +183,9 @@ send_query(const int fd) for (i = 0; i < DEFAULT_STRLEN; ++i) { if (i) printf(", "); - printf("{len=%u, type=NLMSG_NOOP, flags=NLM_F_REQUEST|0x%x" - ", seq=%u, pid=0}", + printf("{nlmsg_len=%u, nlmsg_type=NLMSG_NOOP" + ", nlmsg_flags=NLM_F_REQUEST|0x%x" + ", nlmsg_seq=%u, nlmsg_pid=0}", msgs[i].nlmsg_len, NLM_F_DUMP, msgs[i].nlmsg_seq); } printf(", ...], %u, MSG_DONTWAIT, NULL, 0) = %s\n", msg_len, errstr); @@ -197,8 +208,9 @@ test_nlmsgerr(const int fd) nlh->nlmsg_pid = 0; rc = sendto(fd, nlh, nlh->nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=NLMSG_ERROR, flags=NLM_F_REQUEST" - ", seq=0, pid=0}, %p}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=NLMSG_ERROR" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}" + ", %p}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh->nlmsg_len, nlh0 + NLMSG_HDRLEN, nlh->nlmsg_len, sprintrc(rc)); @@ -208,9 +220,9 @@ test_nlmsgerr(const int fd) memcpy(NLMSG_DATA(nlh), "42", 2); rc = sendto(fd, nlh, NLMSG_HDRLEN + 2, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=NLMSG_ERROR, flags=NLM_F_REQUEST" - ", seq=0, pid=0}, \"\\x34\\x32\"}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=NLMSG_ERROR" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}" + ", \"\\x34\\x32\"}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, NLMSG_HDRLEN + 2, NLMSG_HDRLEN + 2, sprintrc(rc)); /* error message with room for the error code only */ @@ -224,24 +236,26 @@ test_nlmsgerr(const int fd) err->error = 42; rc = sendto(fd, nlh, nlh->nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=NLMSG_ERROR, flags=NLM_F_REQUEST" - ", seq=0, pid=0}, {error=42}}, %u, MSG_DONTWAIT, NULL, 0)" + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=NLMSG_ERROR" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}" + ", {error=42}}, %u, MSG_DONTWAIT, NULL, 0)" " = %s\n", fd, nlh->nlmsg_len, nlh->nlmsg_len, sprintrc(rc)); err->error = -1; rc = sendto(fd, nlh, nlh->nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=NLMSG_ERROR, flags=NLM_F_REQUEST" - ", seq=0, pid=0}, {error=-EPERM}}, %u, MSG_DONTWAIT, NULL, 0)" + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=NLMSG_ERROR" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}" + ", {error=-EPERM}}, %u, MSG_DONTWAIT, NULL, 0)" " = %s\n", fd, nlh->nlmsg_len, nlh->nlmsg_len, sprintrc(rc)); err->error = -32767; nlh->nlmsg_len += sizeof(err->msg.nlmsg_len); rc = sendto(fd, nlh, nlh->nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=NLMSG_ERROR, flags=NLM_F_REQUEST" - ", seq=0, pid=0}, {error=-32767, msg=%p}}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=NLMSG_ERROR" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}" + ", {error=-32767, msg=%p}}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh->nlmsg_len, nlh0 + NLMSG_HDRLEN, nlh->nlmsg_len, sprintrc(rc)); @@ -261,10 +275,11 @@ test_nlmsgerr(const int fd) err->msg.nlmsg_pid = 1234; rc = sendto(fd, nlh, nlh->nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=NLMSG_ERROR, flags=NLM_F_REQUEST" - ", seq=0, pid=0}, {error=-EACCES" - ", msg={len=%u, type=NLMSG_NOOP, flags=NLM_F_REQUEST|0x%x" - ", seq=%u, pid=%d}}}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=NLMSG_ERROR" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}" + ", {error=-EACCES, msg={nlmsg_len=%u, nlmsg_type=NLMSG_NOOP" + ", nlmsg_flags=NLM_F_REQUEST|0x%x, nlmsg_seq=%u, nlmsg_pid=%d}}}" + ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh->nlmsg_len, err->msg.nlmsg_len, NLM_F_DUMP, err->msg.nlmsg_seq, err->msg.nlmsg_pid, nlh->nlmsg_len, sprintrc(rc)); @@ -286,11 +301,12 @@ test_nlmsgerr(const int fd) memcpy(NLMSG_DATA(&err->msg), "abcd", 4); rc = sendto(fd, nlh, nlh->nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=NLMSG_ERROR, flags=NLM_F_REQUEST" - ", seq=0, pid=0}, {error=-EACCES" - ", msg={{len=%u, type=NLMSG_NOOP, flags=NLM_F_REQUEST|0x%x" - ", seq=%u, pid=%d}, \"\\x61\\x62\\x63\\x64\"}}}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=NLMSG_ERROR" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}" + ", {error=-EACCES, msg={{nlmsg_len=%u, nlmsg_type=NLMSG_NOOP" + ", nlmsg_flags=NLM_F_REQUEST|0x%x, nlmsg_seq=%u, nlmsg_pid=%d}" + ", \"\\x61\\x62\\x63\\x64\"}}}, %u, MSG_DONTWAIT, NULL, 0)" + " = %s\n", fd, nlh->nlmsg_len, err->msg.nlmsg_len, NLM_F_DUMP, err->msg.nlmsg_seq, err->msg.nlmsg_pid, nlh->nlmsg_len, sprintrc(rc)); @@ -313,8 +329,9 @@ test_nlmsg_done(const int fd) }; rc = sendto(fd, nlh, nlh->nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=NLMSG_DONE, flags=NLM_F_MULTI" - ", seq=0, pid=0}, %p}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=NLMSG_DONE" + ", nlmsg_flags=NLM_F_MULTI, nlmsg_seq=0, nlmsg_pid=0}, %p}" + ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh->nlmsg_len, nlh0 + NLMSG_HDRLEN, nlh->nlmsg_len, sprintrc(rc)); @@ -326,8 +343,9 @@ test_nlmsg_done(const int fd) memcpy(NLMSG_DATA(nlh), "42", 2); rc = sendto(fd, nlh, NLMSG_HDRLEN + 2, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=NLMSG_DONE, flags=NLM_F_MULTI, seq=0" - ", pid=0}, \"\\x34\\x32\"}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=NLMSG_DONE" + ", nlmsg_flags=NLM_F_MULTI, nlmsg_seq=0, nlmsg_pid=0}" + ", \"\\x34\\x32\"}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, NLMSG_HDRLEN + 2, NLMSG_HDRLEN + 2, sprintrc(rc)); /* NLMSG_DONE message with enough room for an integer payload */ @@ -340,8 +358,9 @@ test_nlmsg_done(const int fd) memcpy(NLMSG_DATA(nlh), &num, sizeof(num)); rc = sendto(fd, nlh, nlh->nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=NLMSG_DONE, flags=NLM_F_MULTI" - ", seq=0, pid=0}, %d}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=NLMSG_DONE" + ", nlmsg_flags=NLM_F_MULTI, nlmsg_seq=0, nlmsg_pid=0}, %d}" + ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh->nlmsg_len, num, nlh->nlmsg_len, sprintrc(rc)); } @@ -358,27 +377,27 @@ test_ack_flags(const int fd) # ifdef NLM_F_CAPPED nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CAPPED, rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=NLMSG_ERROR" - ", flags=NLM_F_REQUEST|NLM_F_CAPPED, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=NLMSG_ERROR" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_CAPPED, nlmsg_seq=0" + ", nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); # endif # ifdef NLM_F_ACK_TLVS nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK_TLVS; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=NLMSG_ERROR" - ", flags=NLM_F_REQUEST|NLM_F_ACK_TLVS, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=NLMSG_ERROR" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_ACK_TLVS, nlmsg_seq=0" + ", nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); # endif # if defined NLM_F_CAPPED && defined NLM_F_ACK_TLVS nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CAPPED | NLM_F_ACK_TLVS; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=NLMSG_ERROR" - ", flags=NLM_F_REQUEST|NLM_F_CAPPED|NLM_F_ACK_TLVS, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=NLMSG_ERROR" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_CAPPED|NLM_F_ACK_TLVS" + ", nlmsg_seq=0, nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); # endif } diff --git a/tests/netlink_route.c b/tests/netlink_route.c index 9281e9a4b..e32967866 100644 --- a/tests/netlink_route.c +++ b/tests/netlink_route.c @@ -74,8 +74,8 @@ test_nlmsg_type(const int fd) }; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=RTM_GETLINK" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=RTM_GETLINK" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); } @@ -91,32 +91,32 @@ test_nlmsg_flags(const int fd) nlh.nlmsg_type = RTM_GETLINK; nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=RTM_GETLINK" - ", flags=NLM_F_REQUEST|NLM_F_DUMP, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=RTM_GETLINK" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_DUMP, nlmsg_seq=0" + ", nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); nlh.nlmsg_type = RTM_DELACTION; nlh.nlmsg_flags = NLM_F_ROOT; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=RTM_DELACTION" - ", flags=NLM_F_ROOT, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=RTM_DELACTION" + ", nlmsg_flags=NLM_F_ROOT, nlmsg_seq=0, nlmsg_pid=0}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); nlh.nlmsg_type = RTM_NEWLINK; nlh.nlmsg_flags = NLM_F_ECHO | NLM_F_REPLACE; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=RTM_NEWLINK" - ", flags=NLM_F_ECHO|NLM_F_REPLACE, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=RTM_NEWLINK" + ", nlmsg_flags=NLM_F_ECHO|NLM_F_REPLACE, nlmsg_seq=0" + ", nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); nlh.nlmsg_type = RTM_DELLINK; nlh.nlmsg_flags = NLM_F_NONREC; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=RTM_DELLINK" - ", flags=NLM_F_NONREC, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=RTM_DELLINK" + ", nlmsg_flags=NLM_F_NONREC, nlmsg_seq=0, nlmsg_pid=0}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); } diff --git a/tests/netlink_selinux.c b/tests/netlink_selinux.c index 85b504782..dd5407e43 100644 --- a/tests/netlink_selinux.c +++ b/tests/netlink_selinux.c @@ -25,8 +25,8 @@ test_nlmsg_type(const int fd) }; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=SELNL_MSG_SETENFORCE" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=SELNL_MSG_SETENFORCE" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); } diff --git a/tests/netlink_sock_diag.c b/tests/netlink_sock_diag.c index 591c3944b..99e38da89 100644 --- a/tests/netlink_sock_diag.c +++ b/tests/netlink_sock_diag.c @@ -81,8 +81,8 @@ test_nlmsg_type(const int fd) }; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); } @@ -98,9 +98,9 @@ test_nlmsg_flags(const int fd) }; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_REQUEST|NLM_F_DUMP, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_DUMP, nlmsg_seq=0" + ", nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); } diff --git a/tests/netlink_xfrm.c b/tests/netlink_xfrm.c index 26095fba6..d477124cf 100644 --- a/tests/netlink_xfrm.c +++ b/tests/netlink_xfrm.c @@ -26,8 +26,8 @@ test_nlmsg_type(const int fd) }; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=XFRM_MSG_NEWSA" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=XFRM_MSG_NEWSA" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); } @@ -43,32 +43,32 @@ test_nlmsg_flags(const int fd) nlh.nlmsg_type = XFRM_MSG_GETSA; nlh.nlmsg_flags = NLM_F_DUMP; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=XFRM_MSG_GETSA" - ", flags=NLM_F_DUMP, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=XFRM_MSG_GETSA" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); nlh.nlmsg_type = XFRM_MSG_NEWSA; nlh.nlmsg_flags = NLM_F_REPLACE; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=XFRM_MSG_NEWSA" - ", flags=NLM_F_REPLACE, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=XFRM_MSG_NEWSA" + ", nlmsg_flags=NLM_F_REPLACE, nlmsg_seq=0, nlmsg_pid=0}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); nlh.nlmsg_type = XFRM_MSG_DELSA; nlh.nlmsg_flags = NLM_F_ECHO | NLM_F_NONREC; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=XFRM_MSG_DELSA" - ", flags=NLM_F_ECHO|NLM_F_NONREC, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=XFRM_MSG_DELSA" + ", nlmsg_flags=NLM_F_ECHO|NLM_F_NONREC, nlmsg_seq=0" + ", nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, (unsigned) sizeof(nlh), sprintrc(rc)); nlh.nlmsg_type = XFRM_MSG_ALLOCSPI; nlh.nlmsg_flags = NLM_F_ECHO | NLM_F_REPLACE; rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u, type=XFRM_MSG_ALLOCSPI" - ", flags=NLM_F_ECHO|%#x, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u, nlmsg_type=XFRM_MSG_ALLOCSPI" + ", nlmsg_flags=NLM_F_ECHO|%#x, nlmsg_seq=0, nlmsg_pid=0}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, NLM_F_REPLACE, (unsigned) sizeof(nlh), sprintrc(rc)); diff --git a/tests/nfnetlink_acct.c b/tests/nfnetlink_acct.c index 7e4f6d5dd..9097daae8 100644 --- a/tests/nfnetlink_acct.c +++ b/tests/nfnetlink_acct.c @@ -27,17 +27,17 @@ test_nlmsg_type(const int fd) nlh.nlmsg_type = NFNL_SUBSYS_ACCT << 8 | NFNL_MSG_ACCT_NEW; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_ACCT<<8|NFNL_MSG_ACCT_NEW" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_ACCT<<8|NFNL_MSG_ACCT_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_ACCT << 8 | 0xff; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_ACCT<<8|0xff /* NFNL_MSG_ACCT_??? */" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_ACCT<<8|0xff /* NFNL_MSG_ACCT_??? */" + ", 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)); } @@ -53,28 +53,28 @@ test_nlmsg_flags(const int fd) nlh.nlmsg_type = NFNL_SUBSYS_ACCT << 8 | NFNL_MSG_ACCT_NEW; nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_ACCT<<8|NFNL_MSG_ACCT_NEW" - ", flags=NLM_F_REQUEST|NLM_F_CREATE, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_ACCT<<8|NFNL_MSG_ACCT_NEW" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_CREATE, 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_ACCT << 8 | NFNL_MSG_ACCT_GET; nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_MATCH; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_ACCT<<8|NFNL_MSG_ACCT_GET" - ", flags=NLM_F_REQUEST|NLM_F_MATCH, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_ACCT<<8|NFNL_MSG_ACCT_GET" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_MATCH, 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_ACCT << 8 | NFNL_MSG_ACCT_DEL; 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_ACCT<<8|NFNL_MSG_ACCT_DEL" - ", 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_ACCT<<8|NFNL_MSG_ACCT_DEL" + ", 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)); } diff --git a/tests/nfnetlink_cthelper.c b/tests/nfnetlink_cthelper.c index 860ad2933..90400c089 100644 --- a/tests/nfnetlink_cthelper.c +++ b/tests/nfnetlink_cthelper.c @@ -27,17 +27,18 @@ test_nlmsg_type(const int fd) nlh.nlmsg_type = NFNL_SUBSYS_CTHELPER << 8 | NFNL_MSG_CTHELPER_NEW; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_CTHELPER<<8|NFNL_MSG_CTHELPER_NEW" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_CTHELPER<<8|NFNL_MSG_CTHELPER_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_CTHELPER << 8 | 0xff; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_CTHELPER<<8|0xff /* NFNL_MSG_CTHELPER_??? */" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_CTHELPER<<8|0xff" + " /* NFNL_MSG_CTHELPER_??? */" + ", 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)); } @@ -53,28 +54,28 @@ test_nlmsg_flags(const int fd) nlh.nlmsg_type = NFNL_SUBSYS_CTHELPER << 8 | NFNL_MSG_CTHELPER_NEW; nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_REPLACE; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_CTHELPER<<8|NFNL_MSG_CTHELPER_NEW" - ", flags=NLM_F_REQUEST|NLM_F_REPLACE, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_CTHELPER<<8|NFNL_MSG_CTHELPER_NEW" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_REPLACE, 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_CTHELPER << 8 | NFNL_MSG_CTHELPER_GET; nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_CTHELPER<<8|NFNL_MSG_CTHELPER_GET" - ", flags=NLM_F_REQUEST|NLM_F_DUMP, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_CTHELPER<<8|NFNL_MSG_CTHELPER_GET" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_DUMP, 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_CTHELPER << 8 | NFNL_MSG_CTHELPER_DEL; 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_CTHELPER<<8|NFNL_MSG_CTHELPER_DEL" - ", 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_CTHELPER<<8|NFNL_MSG_CTHELPER_DEL" + ", 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)); } diff --git a/tests/nfnetlink_ctnetlink.c b/tests/nfnetlink_ctnetlink.c index ee53ef88b..bfd427b1e 100644 --- a/tests/nfnetlink_ctnetlink.c +++ b/tests/nfnetlink_ctnetlink.c @@ -27,17 +27,18 @@ test_nlmsg_type(const int fd) nlh.nlmsg_type = NFNL_SUBSYS_CTNETLINK << 8 | IPCTNL_MSG_CT_NEW; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_CTNETLINK<<8|IPCTNL_MSG_CT_NEW" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_CTNETLINK<<8|IPCTNL_MSG_CT_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 << 8 | 0xff; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_CTNETLINK<<8|0xff /* IPCTNL_MSG_CT_??? */" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_CTNETLINK<<8|0xff" + " /* IPCTNL_MSG_CT_??? */" + ", 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)); } @@ -53,28 +54,28 @@ test_nlmsg_flags(const int fd) nlh.nlmsg_type = NFNL_SUBSYS_CTNETLINK << 8 | IPCTNL_MSG_CT_NEW; nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_REPLACE; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_CTNETLINK<<8|IPCTNL_MSG_CT_NEW" - ", flags=NLM_F_REQUEST|NLM_F_REPLACE, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_CTNETLINK<<8|IPCTNL_MSG_CT_NEW" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_REPLACE, 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 << 8 | IPCTNL_MSG_CT_GET; nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_CTNETLINK<<8|IPCTNL_MSG_CT_GET" - ", flags=NLM_F_REQUEST|NLM_F_DUMP, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_CTNETLINK<<8|IPCTNL_MSG_CT_GET" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_DUMP, 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 << 8 | IPCTNL_MSG_CT_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<<8|IPCTNL_MSG_CT_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<<8|IPCTNL_MSG_CT_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)); } diff --git a/tests/nfnetlink_ctnetlink_exp.c b/tests/nfnetlink_ctnetlink_exp.c index 13c8a3bc9..4041b9470 100644 --- a/tests/nfnetlink_ctnetlink_exp.c +++ b/tests/nfnetlink_ctnetlink_exp.c @@ -27,17 +27,18 @@ test_nlmsg_type(const int fd) nlh.nlmsg_type = NFNL_SUBSYS_CTNETLINK_EXP << 8 | IPCTNL_MSG_EXP_NEW; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_CTNETLINK_EXP<<8|IPCTNL_MSG_EXP_NEW" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_CTNETLINK_EXP<<8|IPCTNL_MSG_EXP_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_EXP << 8 | 0xff; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_CTNETLINK_EXP<<8|0xff /* IPCTNL_MSG_EXP_??? */" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_CTNETLINK_EXP<<8|0xff" + " /* IPCTNL_MSG_EXP_??? */" + ", 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)); } @@ -53,28 +54,28 @@ test_nlmsg_flags(const int fd) nlh.nlmsg_type = NFNL_SUBSYS_CTNETLINK_EXP << 8 | IPCTNL_MSG_EXP_NEW; nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_EXCL; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_CTNETLINK_EXP<<8|IPCTNL_MSG_EXP_NEW" - ", flags=NLM_F_REQUEST|NLM_F_EXCL, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_CTNETLINK_EXP<<8|IPCTNL_MSG_EXP_NEW" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_EXCL, 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_EXP << 8 | IPCTNL_MSG_EXP_GET; nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ROOT; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_CTNETLINK_EXP<<8|IPCTNL_MSG_EXP_GET" - ", flags=NLM_F_REQUEST|NLM_F_ROOT, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_CTNETLINK_EXP<<8|IPCTNL_MSG_EXP_GET" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_ROOT, 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_EXP << 8 | IPCTNL_MSG_EXP_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_EXP<<8|IPCTNL_MSG_EXP_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_EXP<<8|IPCTNL_MSG_EXP_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)); } 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)); } diff --git a/tests/nfnetlink_ipset.c b/tests/nfnetlink_ipset.c index 853ac307f..114244462 100644 --- a/tests/nfnetlink_ipset.c +++ b/tests/nfnetlink_ipset.c @@ -27,17 +27,17 @@ test_nlmsg_type(const int fd) nlh.nlmsg_type = NFNL_SUBSYS_IPSET << 8 | IPSET_CMD_NONE; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_IPSET<<8|IPSET_CMD_NONE" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_IPSET<<8|IPSET_CMD_NONE" + ", 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_IPSET << 8 | 0xff; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_IPSET<<8|0xff /* IPSET_CMD_??? */" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_IPSET<<8|0xff /* IPSET_CMD_??? */" + ", 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)); } diff --git a/tests/nfnetlink_nft_compat.c b/tests/nfnetlink_nft_compat.c index e5514f66b..6e92feb72 100644 --- a/tests/nfnetlink_nft_compat.c +++ b/tests/nfnetlink_nft_compat.c @@ -27,17 +27,18 @@ test_nlmsg_type(const int fd) nlh.nlmsg_type = NFNL_SUBSYS_NFT_COMPAT << 8 | NFNL_MSG_COMPAT_GET; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_NFT_COMPAT<<8|NFNL_MSG_COMPAT_GET" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_NFT_COMPAT<<8|NFNL_MSG_COMPAT_GET" + ", 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_NFT_COMPAT << 8 | 0xff; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_NFT_COMPAT<<8|0xff /* NFNL_MSG_COMPAT_??? */" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_NFT_COMPAT<<8|0xff" + " /* NFNL_MSG_COMPAT_??? */" + ", 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)); } @@ -53,10 +54,10 @@ test_nlmsg_flags(const int fd) nlh.nlmsg_type = NFNL_SUBSYS_NFT_COMPAT << 8 | NFNL_MSG_COMPAT_GET; nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_NFT_COMPAT<<8|NFNL_MSG_COMPAT_GET" - ", flags=NLM_F_REQUEST|NLM_F_DUMP, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_NFT_COMPAT<<8|NFNL_MSG_COMPAT_GET" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_DUMP, nlmsg_seq=0" + ", nlmsg_pid=0}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, nlh.nlmsg_len, nlh.nlmsg_len, sprintrc(rc)); } diff --git a/tests/nfnetlink_nftables.c b/tests/nfnetlink_nftables.c index e959f7033..c8c096641 100644 --- a/tests/nfnetlink_nftables.c +++ b/tests/nfnetlink_nftables.c @@ -27,17 +27,17 @@ test_nlmsg_type(const int fd) nlh.nlmsg_type = NFNL_SUBSYS_NFTABLES << 8 | NFT_MSG_NEWTABLE; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_NFTABLES<<8|NFT_MSG_NEWTABLE" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_NFTABLES<<8|NFT_MSG_NEWTABLE" + ", 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_NFTABLES << 8 | 0xff; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_NFTABLES<<8|0xff /* NFT_MSG_??? */" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_NFTABLES<<8|0xff /* NFT_MSG_??? */" + ", 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)); } @@ -53,28 +53,28 @@ test_nlmsg_flags(const int fd) nlh.nlmsg_type = NFNL_SUBSYS_NFTABLES << 8 | NFT_MSG_NEWTABLE; nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_REPLACE; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_NFTABLES<<8|NFT_MSG_NEWTABLE" - ", flags=NLM_F_REQUEST|NLM_F_REPLACE, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_NFTABLES<<8|NFT_MSG_NEWTABLE" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_REPLACE, 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_NFTABLES << 8 | NFT_MSG_GETTABLE; nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_NFTABLES<<8|NFT_MSG_GETTABLE" - ", flags=NLM_F_REQUEST|NLM_F_DUMP, seq=0, pid=0}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_NFTABLES<<8|NFT_MSG_GETTABLE" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_DUMP, 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_NFTABLES << 8 | NFT_MSG_DELTABLE; 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_NFTABLES<<8|NFT_MSG_DELTABLE" - ", 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_NFTABLES<<8|NFT_MSG_DELTABLE" + ", 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)); } diff --git a/tests/nfnetlink_osf.c b/tests/nfnetlink_osf.c index 755615fc5..c69580c32 100644 --- a/tests/nfnetlink_osf.c +++ b/tests/nfnetlink_osf.c @@ -29,17 +29,17 @@ test_nlmsg_type(const int fd) nlh.nlmsg_type = NFNL_SUBSYS_OSF << 8 | OSF_MSG_ADD; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_OSF<<8|OSF_MSG_ADD" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_OSF<<8|OSF_MSG_ADD" + ", 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_OSF << 8 | 0xff; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_OSF<<8|0xff /* OSF_MSG_??? */" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_OSF<<8|0xff /* OSF_MSG_??? */" + ", 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)); } diff --git a/tests/nfnetlink_queue.c b/tests/nfnetlink_queue.c index 960c497ef..342ff67b0 100644 --- a/tests/nfnetlink_queue.c +++ b/tests/nfnetlink_queue.c @@ -27,17 +27,17 @@ test_nlmsg_type(const int fd) nlh.nlmsg_type = NFNL_SUBSYS_QUEUE << 8 | NFQNL_MSG_PACKET; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_QUEUE<<8|NFQNL_MSG_PACKET" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_QUEUE<<8|NFQNL_MSG_PACKET" + ", 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_QUEUE << 8 | 0xff; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_QUEUE<<8|0xff /* NFQNL_MSG_??? */" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_QUEUE<<8|0xff /* NFQNL_MSG_??? */" + ", 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)); } diff --git a/tests/nfnetlink_ulog.c b/tests/nfnetlink_ulog.c index 294e9a7e9..1863fe3a0 100644 --- a/tests/nfnetlink_ulog.c +++ b/tests/nfnetlink_ulog.c @@ -27,17 +27,17 @@ test_nlmsg_type(const int fd) nlh.nlmsg_type = NFNL_SUBSYS_ULOG << 8 | NFULNL_MSG_PACKET; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_ULOG<<8|NFULNL_MSG_PACKET" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_ULOG<<8|NFULNL_MSG_PACKET" + ", 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_ULOG << 8 | 0xff; rc = sendto(fd, &nlh, nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {len=%u" - ", type=NFNL_SUBSYS_ULOG<<8|0xff /* NFULNL_MSG_??? */" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("sendto(%d, {nlmsg_len=%u" + ", nlmsg_type=NFNL_SUBSYS_ULOG<<8|0xff /* NFULNL_MSG_??? */" + ", 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)); } diff --git a/tests/nlattr.c b/tests/nlattr.c index 1331386f8..ad9733b0a 100644 --- a/tests/nlattr.c +++ b/tests/nlattr.c @@ -51,11 +51,11 @@ test_nlattr(const int fd) nla = NLMSG_ATTR(msg, sizeof(msg->udm)); memcpy(nla, "12", 2); rc = sendto(fd, msg, msg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}, {udiag_family=AF_UNIX" - ", udiag_type=SOCK_STREAM, udiag_state=TCP_FIN_WAIT1" - ", udiag_ino=0, udiag_cookie=[0, 0]}, \"\\x31\\x32\"}, %u" - ", MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {udiag_family=AF_UNIX, udiag_type=SOCK_STREAM" + ", udiag_state=TCP_FIN_WAIT1, udiag_ino=0, udiag_cookie=[0, 0]}" + ", \"\\x31\\x32\"}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, msg_len, msg_len, sprintrc(rc)); /* fetch fail: short read */ @@ -63,11 +63,11 @@ test_nlattr(const int fd) msg = tail_memdup(&c_msg, msg_len - 1); memcpy(&msg->nlh.nlmsg_len, &msg_len, sizeof(msg_len)); rc = sendto(fd, msg, msg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}, {udiag_family=AF_UNIX" - ", udiag_type=SOCK_STREAM, udiag_state=TCP_FIN_WAIT1" - ", udiag_ino=0, udiag_cookie=[0, 0]}, %p}, %u" - ", MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {udiag_family=AF_UNIX, udiag_type=SOCK_STREAM" + ", udiag_state=TCP_FIN_WAIT1, udiag_ino=0" + ", udiag_cookie=[0, 0]}, %p}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, msg_len, (void *) msg + NLMSG_SPACE(sizeof(msg->udm)), msg_len, sprintrc(rc)); @@ -81,21 +81,23 @@ test_nlattr(const int fd) .nla_type = UNIX_DIAG_NAME }; rc = sendto(fd, msg, msg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}, {udiag_family=AF_UNIX" - ", udiag_type=SOCK_STREAM, udiag_state=TCP_FIN_WAIT1" - ", udiag_ino=0, udiag_cookie=[0, 0]}, {nla_len=%u" - ", nla_type=UNIX_DIAG_NAME}}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {udiag_family=AF_UNIX, udiag_type=SOCK_STREAM" + ", udiag_state=TCP_FIN_WAIT1, udiag_ino=0, udiag_cookie=[0, 0]}" + ", {nla_len=%u, nla_type=UNIX_DIAG_NAME}}" + ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, msg_len, nla->nla_len, msg_len, sprintrc(rc)); /* print one struct nlattr with nla_len out of msg_len bounds */ nla->nla_len += 8; rc = sendto(fd, msg, msg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}, {udiag_family=AF_UNIX" - ", udiag_type=SOCK_STREAM, udiag_state=TCP_FIN_WAIT1" - ", udiag_ino=0, udiag_cookie=[0, 0]}, {nla_len=%u" - ", nla_type=UNIX_DIAG_NAME}}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {udiag_family=AF_UNIX, udiag_type=SOCK_STREAM" + ", udiag_state=TCP_FIN_WAIT1, udiag_ino=0, udiag_cookie=[0, 0]}" + ", {nla_len=%u, nla_type=UNIX_DIAG_NAME}}" + ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, msg_len, nla->nla_len, msg_len, sprintrc(rc)); /* print one struct nlattr and some data */ @@ -109,11 +111,11 @@ test_nlattr(const int fd) }; memcpy(RTA_DATA(nla), "1234", 4); rc = sendto(fd, msg, msg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}, {udiag_family=AF_UNIX" - ", udiag_type=SOCK_STREAM, udiag_state=TCP_FIN_WAIT1" - ", udiag_ino=0, udiag_cookie=[0, 0]}, {{nla_len=%u" - ", nla_type=%#x /* UNIX_DIAG_??? */}" + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {udiag_family=AF_UNIX, udiag_type=SOCK_STREAM" + ", udiag_state=TCP_FIN_WAIT1, udiag_ino=0, udiag_cookie=[0, 0]}" + ", {{nla_len=%u, nla_type=%#x /* UNIX_DIAG_??? */}" ", \"\\x31\\x32\\x33\\x34\"}}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, msg_len, nla->nla_len, UNIX_DIAG_FIRST_UNUSED, @@ -130,12 +132,12 @@ test_nlattr(const int fd) ); memcpy(nla + 1, "12", 2); rc = sendto(fd, msg, msg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}, {udiag_family=AF_UNIX" - ", udiag_type=SOCK_STREAM, udiag_state=TCP_FIN_WAIT1" - ", udiag_ino=0, udiag_cookie=[0, 0]}, [{nla_len=%u" - ", nla_type=UNIX_DIAG_NAME}, \"\\x31\\x32\"]}, %u" - ", MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {udiag_family=AF_UNIX, udiag_type=SOCK_STREAM" + ", udiag_state=TCP_FIN_WAIT1, udiag_ino=0, udiag_cookie=[0, 0]}" + ", [{nla_len=%u, nla_type=UNIX_DIAG_NAME}, \"\\x31\\x32\"]}" + ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, msg_len, NLA_HDRLEN, msg_len, sprintrc(rc)); /* print one struct nlattr and short read of second struct nlattr */ @@ -148,12 +150,12 @@ test_nlattr(const int fd) .nla_type = UNIX_DIAG_NAME ); rc = sendto(fd, msg, msg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}, {udiag_family=AF_UNIX" - ", udiag_type=SOCK_STREAM, udiag_state=TCP_FIN_WAIT1" - ", udiag_ino=0, udiag_cookie=[0, 0]}, [{nla_len=%u" - ", nla_type=UNIX_DIAG_NAME}, ... /* %p */]}, %u" - ", MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {udiag_family=AF_UNIX, udiag_type=SOCK_STREAM" + ", udiag_state=TCP_FIN_WAIT1, udiag_ino=0, udiag_cookie=[0, 0]}" + ", [{nla_len=%u, nla_type=UNIX_DIAG_NAME}, ... /* %p */]}" + ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, msg_len, NLA_HDRLEN, nla + 1, msg_len, sprintrc(rc)); /* print two struct nlattr */ @@ -170,24 +172,25 @@ test_nlattr(const int fd) .nla_type = UNIX_DIAG_PEER }; rc = sendto(fd, msg, msg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}, {udiag_family=AF_UNIX" - ", udiag_type=SOCK_STREAM, udiag_state=TCP_FIN_WAIT1" - ", udiag_ino=0, udiag_cookie=[0, 0]}, [{nla_len=%u" - ", nla_type=UNIX_DIAG_NAME}, {nla_len=%u" - ", nla_type=UNIX_DIAG_PEER}]}, %u" - ", MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {udiag_family=AF_UNIX, udiag_type=SOCK_STREAM" + ", udiag_state=TCP_FIN_WAIT1, udiag_ino=0, udiag_cookie=[0, 0]}" + ", [{nla_len=%u, nla_type=UNIX_DIAG_NAME}" + ", {nla_len=%u, nla_type=UNIX_DIAG_PEER}]}" + ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, msg_len, nla->nla_len, nla->nla_len, msg_len, sprintrc(rc)); /* print first nlattr only when its nla_len is less than NLA_HDRLEN */ nla->nla_len = NLA_HDRLEN - 1; rc = sendto(fd, msg, msg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}, {udiag_family=AF_UNIX" - ", udiag_type=SOCK_STREAM, udiag_state=TCP_FIN_WAIT1" - ", udiag_ino=0, udiag_cookie=[0, 0]}, {nla_len=%u" - ", nla_type=UNIX_DIAG_NAME}}, %u, MSG_DONTWAIT, NULL, 0) = %s\n", + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {udiag_family=AF_UNIX, udiag_type=SOCK_STREAM" + ", udiag_state=TCP_FIN_WAIT1, udiag_ino=0, udiag_cookie=[0, 0]}" + ", {nla_len=%u, nla_type=UNIX_DIAG_NAME}}" + ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, msg_len, nla->nla_len, msg_len, sprintrc(rc)); /* unrecognized attribute data, abbreviated output */ @@ -208,8 +211,8 @@ test_nlattr(const int fd) } rc = sendto(fd, msg, msg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}" + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" ", {udiag_family=AF_UNIX, udiag_type=SOCK_STREAM" ", udiag_state=TCP_FIN_WAIT1, udiag_ino=0" ", udiag_cookie=[0, 0]}, [", @@ -258,41 +261,42 @@ test_nla_type(const int fd) .nla_type = NLA_F_NESTED | UNIX_DIAG_NAME }; rc = sendto(fd, msg, msg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}, {udiag_family=AF_UNIX" - ", udiag_type=SOCK_STREAM, udiag_state=TCP_FIN_WAIT1" - ", udiag_ino=0, udiag_cookie=[0, 0]}, {nla_len=%u" - ", nla_type=NLA_F_NESTED|UNIX_DIAG_NAME}}" + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {udiag_family=AF_UNIX, udiag_type=SOCK_STREAM" + ", udiag_state=TCP_FIN_WAIT1, udiag_ino=0, udiag_cookie=[0, 0]}" + ", {nla_len=%u, nla_type=NLA_F_NESTED|UNIX_DIAG_NAME}}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, msg_len, nla->nla_len, msg_len, sprintrc(rc)); nla->nla_type = NLA_F_NET_BYTEORDER | UNIX_DIAG_NAME; rc = sendto(fd, msg, msg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}, {udiag_family=AF_UNIX" - ", udiag_type=SOCK_STREAM, udiag_state=TCP_FIN_WAIT1" - ", udiag_ino=0, udiag_cookie=[0, 0]}, {nla_len=%u" - ", nla_type=NLA_F_NET_BYTEORDER|UNIX_DIAG_NAME}}" + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {udiag_family=AF_UNIX, udiag_type=SOCK_STREAM" + ", udiag_state=TCP_FIN_WAIT1, udiag_ino=0, udiag_cookie=[0, 0]}" + ", {nla_len=%u, nla_type=NLA_F_NET_BYTEORDER|UNIX_DIAG_NAME}}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, msg_len, nla->nla_len, msg_len, sprintrc(rc)); nla->nla_type = NLA_F_NESTED | NLA_F_NET_BYTEORDER | UNIX_DIAG_NAME; rc = sendto(fd, msg, msg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}, {udiag_family=AF_UNIX" - ", udiag_type=SOCK_STREAM, udiag_state=TCP_FIN_WAIT1" - ", udiag_ino=0, udiag_cookie=[0, 0]}, {nla_len=%u" - ", nla_type=NLA_F_NESTED|NLA_F_NET_BYTEORDER|UNIX_DIAG_NAME}}" + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {udiag_family=AF_UNIX, udiag_type=SOCK_STREAM" + ", udiag_state=TCP_FIN_WAIT1, udiag_ino=0, udiag_cookie=[0, 0]}" + ", {nla_len=%u, nla_type=NLA_F_NESTED|NLA_F_NET_BYTEORDER" + "|UNIX_DIAG_NAME}}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, msg_len, nla->nla_len, msg_len, sprintrc(rc)); nla->nla_type = NLA_F_NESTED | (UNIX_DIAG_FIRST_UNUSED); rc = sendto(fd, msg, msg->nlh.nlmsg_len, MSG_DONTWAIT, NULL, 0); - printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}, {udiag_family=AF_UNIX" - ", udiag_type=SOCK_STREAM, udiag_state=TCP_FIN_WAIT1" - ", udiag_ino=0, udiag_cookie=[0, 0]}, {nla_len=%u" - ", nla_type=NLA_F_NESTED|%#x /* UNIX_DIAG_??? */}}" + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {udiag_family=AF_UNIX, udiag_type=SOCK_STREAM" + ", udiag_state=TCP_FIN_WAIT1, udiag_ino=0, udiag_cookie=[0, 0]}" + ", {nla_len=%u, nla_type=NLA_F_NESTED|%#x /* UNIX_DIAG_??? */}}" ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", fd, msg->nlh.nlmsg_len, nla->nla_len, UNIX_DIAG_FIRST_UNUSED, msg->nlh.nlmsg_len, sprintrc(rc)); diff --git a/tests/nlattr_br_port_msg.c b/tests/nlattr_br_port_msg.c index 9a7c3f253..1d651690e 100644 --- a/tests/nlattr_br_port_msg.c +++ b/tests/nlattr_br_port_msg.c @@ -35,8 +35,8 @@ init_br_port_msg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_br_port_msg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETMDB, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {family=AF_UNIX" + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETMDB, nlmsg_flags=NLM_F_DUMP" + ", nlmsg_seq=0, nlmsg_pid=0}, {family=AF_UNIX" ", ifindex=" IFINDEX_LO_STR "}", msg_len); } diff --git a/tests/nlattr_crypto_user_alg.c b/tests/nlattr_crypto_user_alg.c index 2cb2b5493..71e7c1421 100644 --- a/tests/nlattr_crypto_user_alg.c +++ b/tests/nlattr_crypto_user_alg.c @@ -37,8 +37,8 @@ init_crypto_user_alg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_crypto_user_alg(const unsigned int msg_len) { - printf("{len=%u, type=CRYPTO_MSG_GETALG" - ", flags=NLM_F_DUMP, seq=0, pid=0}" + printf("{nlmsg_len=%u, nlmsg_type=CRYPTO_MSG_GETALG" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" ", {cru_name=\"abcd\", cru_driver_name=\"efgh\"" ", cru_module_name=\"ijkl\", cru_type=0" ", cru_mask=0, cru_refcnt=0, cru_flags=0}", diff --git a/tests/nlattr_dcbmsg.c b/tests/nlattr_dcbmsg.c index 06efb2838..e064c661c 100644 --- a/tests/nlattr_dcbmsg.c +++ b/tests/nlattr_dcbmsg.c @@ -34,8 +34,8 @@ init_dcbmsg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_dcbmsg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETDCB, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {dcb_family=AF_UNIX" + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETDCB, nlmsg_flags=NLM_F_DUMP" + ", nlmsg_seq=0, nlmsg_pid=0}, {dcb_family=AF_UNIX" ", cmd=DCB_CMD_UNDEFINED}", msg_len); } diff --git a/tests/nlattr_fib_rule_hdr.c b/tests/nlattr_fib_rule_hdr.c index d5ba13e2b..cb51ee7ad 100644 --- a/tests/nlattr_fib_rule_hdr.c +++ b/tests/nlattr_fib_rule_hdr.c @@ -55,8 +55,8 @@ init_rtmsg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_rtmsg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETRULE, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {family=AF_UNIX" + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETRULE, nlmsg_flags=NLM_F_DUMP" + ", nlmsg_seq=0, nlmsg_pid=0}, {family=AF_UNIX" ", dst_len=0, src_len=0" ", tos=IPTOS_LOWDELAY" ", table=RT_TABLE_UNSPEC" diff --git a/tests/nlattr_ifaddrlblmsg.c b/tests/nlattr_ifaddrlblmsg.c index ce9d7a80c..13ba9b493 100644 --- a/tests/nlattr_ifaddrlblmsg.c +++ b/tests/nlattr_ifaddrlblmsg.c @@ -34,9 +34,9 @@ init_ifaddrlblmsg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_ifaddrlblmsg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETADDRLABEL, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {ifal_family=AF_UNIX" - ", ifal_prefixlen=0, ifal_flags=0" + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETADDRLABEL" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {ifal_family=AF_UNIX, ifal_prefixlen=0, ifal_flags=0" ", ifal_index=" IFINDEX_LO_STR ", ifal_seq=0}", msg_len); diff --git a/tests/nlattr_ifaddrmsg.c b/tests/nlattr_ifaddrmsg.c index 4e952555c..23e301e66 100644 --- a/tests/nlattr_ifaddrmsg.c +++ b/tests/nlattr_ifaddrmsg.c @@ -49,8 +49,8 @@ init_ifaddrmsg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_ifaddrmsg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETADDR, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {ifa_family=%s" + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETADDR, nlmsg_flags=NLM_F_DUMP" + ", nlmsg_seq=0, nlmsg_pid=0}, {ifa_family=%s" ", ifa_prefixlen=0" ", ifa_flags=IFA_F_SECONDARY" ", ifa_scope=RT_SCOPE_UNIVERSE" diff --git a/tests/nlattr_ifinfomsg.c b/tests/nlattr_ifinfomsg.c index 4e6df29dd..54294b8c5 100644 --- a/tests/nlattr_ifinfomsg.c +++ b/tests/nlattr_ifinfomsg.c @@ -61,8 +61,8 @@ init_ifinfomsg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_ifinfomsg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETLINK, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {ifi_family=AF_UNIX" + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETLINK, nlmsg_flags=NLM_F_DUMP" + ", nlmsg_seq=0, nlmsg_pid=0}, {ifi_family=AF_UNIX" ", ifi_type=ARPHRD_LOOPBACK" ", ifi_index=" IFINDEX_LO_STR ", ifi_flags=IFF_UP, ifi_change=0}", diff --git a/tests/nlattr_ifla.h b/tests/nlattr_ifla.h index 6772ae29e..a43d4c0af 100644 --- a/tests/nlattr_ifla.h +++ b/tests/nlattr_ifla.h @@ -46,8 +46,8 @@ init_ifinfomsg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_ifinfomsg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETLINK, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {ifi_family=AF_UNIX" + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETLINK, nlmsg_flags=NLM_F_DUMP" + ", nlmsg_seq=0, nlmsg_pid=0}, {ifi_family=AF_UNIX" ", ifi_type=ARPHRD_LOOPBACK" ", ifi_index=" IFINDEX_LO_STR ", ifi_flags=IFF_UP, ifi_change=0}" diff --git a/tests/nlattr_inet_diag_msg.c b/tests/nlattr_inet_diag_msg.c index 97f5a95ea..63e3ab39a 100644 --- a/tests/nlattr_inet_diag_msg.c +++ b/tests/nlattr_inet_diag_msg.c @@ -55,9 +55,10 @@ init_inet_diag_msg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_inet_diag_msg(const unsigned int msg_len) { - printf("{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}, {idiag_family=AF_INET" - ", idiag_state=TCP_LISTEN, idiag_timer=0, idiag_retrans=0" + printf("{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {idiag_family=AF_INET, idiag_state=TCP_LISTEN" + ", idiag_timer=0, idiag_retrans=0" ", id={idiag_sport=htons(0), idiag_dport=htons(0)" ", idiag_src=inet_addr(\"%s\")" ", idiag_dst=inet_addr(\"%s\")" diff --git a/tests/nlattr_inet_diag_req_compat.c b/tests/nlattr_inet_diag_req_compat.c index 9956b9610..4b30a6054 100644 --- a/tests/nlattr_inet_diag_req_compat.c +++ b/tests/nlattr_inet_diag_req_compat.c @@ -46,9 +46,9 @@ init_inet_diag_req(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_inet_diag_req(const unsigned int msg_len) { - printf("{len=%u, type=TCPDIAG_GETSOCK, flags=NLM_F_REQUEST" - ", seq=0, pid=0}, {idiag_family=AF_INET" - ", idiag_src_len=0, idiag_dst_len=0" + printf("{nlmsg_len=%u, nlmsg_type=TCPDIAG_GETSOCK" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}" + ", {idiag_family=AF_INET, idiag_src_len=0, idiag_dst_len=0" ", idiag_ext=1<<(INET_DIAG_TOS-1)" ", id={idiag_sport=htons(0), idiag_dport=htons(0)" ", idiag_src=inet_addr(\"%s\")" diff --git a/tests/nlattr_inet_diag_req_v2.c b/tests/nlattr_inet_diag_req_v2.c index d4b9fbae2..64fb81253 100644 --- a/tests/nlattr_inet_diag_req_v2.c +++ b/tests/nlattr_inet_diag_req_v2.c @@ -50,8 +50,8 @@ init_inet_diag_req_v2(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_inet_diag_req_v2(const unsigned int msg_len) { - printf("{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_REQUEST, seq=0, pid=0}" + printf("{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}" ", {sdiag_family=AF_INET, sdiag_protocol=IPPROTO_TCP" ", idiag_ext=1<<(INET_DIAG_CONG-1)" ", idiag_states=1<<TCP_CLOSE" diff --git a/tests/nlattr_mdba_mdb_entry.c b/tests/nlattr_mdba_mdb_entry.c index e7b0c498c..43c40a48c 100644 --- a/tests/nlattr_mdba_mdb_entry.c +++ b/tests/nlattr_mdba_mdb_entry.c @@ -63,8 +63,8 @@ init_br_port_msg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_br_port_msg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETMDB, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {family=AF_UNIX" + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETMDB, nlmsg_flags=NLM_F_DUMP" + ", nlmsg_seq=0, nlmsg_pid=0}, {family=AF_UNIX" ", ifindex=" IFINDEX_LO_STR "}" ", {{nla_len=%u, nla_type=MDBA_MDB}" ", {{nla_len=%u, nla_type=MDBA_MDB_ENTRY}", diff --git a/tests/nlattr_mdba_router_port.c b/tests/nlattr_mdba_router_port.c index f954ce41a..4cbb967e9 100644 --- a/tests/nlattr_mdba_router_port.c +++ b/tests/nlattr_mdba_router_port.c @@ -57,8 +57,8 @@ init_br_port_msg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_br_port_msg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETMDB, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {family=AF_UNIX" + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETMDB, nlmsg_flags=NLM_F_DUMP" + ", nlmsg_seq=0, nlmsg_pid=0}, {family=AF_UNIX" ", ifindex=" IFINDEX_LO_STR "}" ", {{nla_len=%u, nla_type=MDBA_ROUTER}", msg_len, msg_len - NLMSG_SPACE(hdrlen)); diff --git a/tests/nlattr_ndmsg.c b/tests/nlattr_ndmsg.c index 8404c7a0d..60310c658 100644 --- a/tests/nlattr_ndmsg.c +++ b/tests/nlattr_ndmsg.c @@ -41,8 +41,8 @@ init_ndmsg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_ndmsg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETNEIGH, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {ndm_family=AF_UNIX" + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETNEIGH, nlmsg_flags=NLM_F_DUMP" + ", nlmsg_seq=0, nlmsg_pid=0}, {ndm_family=AF_UNIX" ", ndm_ifindex=" IFINDEX_LO_STR ", ndm_state=NUD_PERMANENT" ", ndm_flags=NTF_PROXY" diff --git a/tests/nlattr_ndtmsg.c b/tests/nlattr_ndtmsg.c index c41ff40c9..b9c9f9c1a 100644 --- a/tests/nlattr_ndtmsg.c +++ b/tests/nlattr_ndtmsg.c @@ -36,8 +36,9 @@ init_ndtmsg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_ndtmsg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETNEIGHTBL, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {ndtm_family=AF_NETLINK}", + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETNEIGHTBL" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {ndtm_family=AF_NETLINK}", msg_len); } diff --git a/tests/nlattr_netconfmsg.c b/tests/nlattr_netconfmsg.c index 52ded742b..f82d726fd 100644 --- a/tests/nlattr_netconfmsg.c +++ b/tests/nlattr_netconfmsg.c @@ -33,8 +33,9 @@ init_netconfmsg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_netconfmsg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETNETCONF, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {ncm_family=AF_INET}", + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETNETCONF" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {ncm_family=AF_INET}", msg_len); } diff --git a/tests/nlattr_netlink_diag_msg.c b/tests/nlattr_netlink_diag_msg.c index b5d71a68a..9b7360e22 100644 --- a/tests/nlattr_netlink_diag_msg.c +++ b/tests/nlattr_netlink_diag_msg.c @@ -36,12 +36,12 @@ init_netlink_diag_msg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_netlink_diag_msg(const unsigned int msg_len) { - printf("{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}, {ndiag_family=AF_NETLINK" - ", ndiag_type=SOCK_RAW, ndiag_protocol=NETLINK_ROUTE" - ", ndiag_state=NETLINK_CONNECTED, ndiag_portid=0" - ", ndiag_dst_portid=0, ndiag_dst_group=0, ndiag_ino=0" - ", ndiag_cookie=[0, 0]}", + printf("{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {ndiag_family=AF_NETLINK, ndiag_type=SOCK_RAW" + ", ndiag_protocol=NETLINK_ROUTE, ndiag_state=NETLINK_CONNECTED" + ", ndiag_portid=0, ndiag_dst_portid=0, ndiag_dst_group=0" + ", ndiag_ino=0, ndiag_cookie=[0, 0]}", msg_len); } diff --git a/tests/nlattr_nlmsgerr.c b/tests/nlattr_nlmsgerr.c index 75be9e75b..a66e56fc3 100644 --- a/tests/nlattr_nlmsgerr.c +++ b/tests/nlattr_nlmsgerr.c @@ -36,11 +36,11 @@ init_nlmsgerr(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_nlmsgerr(const unsigned int msg_len) { - printf("{len=%u, type=NLMSG_ERROR" - ", flags=NLM_F_REQUEST|NLM_F_CAPPED" - ", seq=0, pid=0}, {error=-EACCES" - ", msg={len=%u, type=NLMSG_NOOP" - ", flags=NLM_F_REQUEST, seq=0, pid=0}", + printf("{nlmsg_len=%u, nlmsg_type=NLMSG_ERROR" + ", nlmsg_flags=NLM_F_REQUEST|NLM_F_CAPPED" + ", nlmsg_seq=0, nlmsg_pid=0}, {error=-EACCES" + ", msg={nlmsg_len=%u, nlmsg_type=NLMSG_NOOP" + ", nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=0, nlmsg_pid=0}", msg_len, NLMSG_HDRLEN + 4); } diff --git a/tests/nlattr_packet_diag_msg.c b/tests/nlattr_packet_diag_msg.c index 0d74a2f36..5716a08dd 100644 --- a/tests/nlattr_packet_diag_msg.c +++ b/tests/nlattr_packet_diag_msg.c @@ -39,8 +39,8 @@ init_packet_diag_msg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_packet_diag_msg(const unsigned int msg_len) { - printf("{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}" + printf("{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" ", {pdiag_family=AF_PACKET" ", pdiag_type=SOCK_STREAM, pdiag_num=ETH_P_ALL" ", pdiag_ino=0, pdiag_cookie=[0, 0]}", diff --git a/tests/nlattr_rtgenmsg.c b/tests/nlattr_rtgenmsg.c index c17ab0486..c05be8840 100644 --- a/tests/nlattr_rtgenmsg.c +++ b/tests/nlattr_rtgenmsg.c @@ -34,8 +34,8 @@ init_rtgenmsg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_rtgenmsg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETNSID, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {rtgen_family=AF_UNIX}", + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETNSID, nlmsg_flags=NLM_F_DUMP" + ", nlmsg_seq=0, nlmsg_pid=0}, {rtgen_family=AF_UNIX}", msg_len); } diff --git a/tests/nlattr_rtmsg.c b/tests/nlattr_rtmsg.c index f4efa4c0d..54c1fea73 100644 --- a/tests/nlattr_rtmsg.c +++ b/tests/nlattr_rtmsg.c @@ -42,8 +42,8 @@ init_rtmsg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_rtmsg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETROUTE, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {rtm_family=AF_UNIX" + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETROUTE, nlmsg_flags=NLM_F_DUMP" + ", nlmsg_seq=0, nlmsg_pid=0}, {rtm_family=AF_UNIX" ", rtm_dst_len=0, rtm_src_len=0" ", rtm_tos=IPTOS_LOWDELAY" ", rtm_table=RT_TABLE_DEFAULT" diff --git a/tests/nlattr_smc_diag_msg.c b/tests/nlattr_smc_diag_msg.c index 3f47a5152..a0a6508e3 100644 --- a/tests/nlattr_smc_diag_msg.c +++ b/tests/nlattr_smc_diag_msg.c @@ -54,8 +54,8 @@ init_smc_diag_msg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_smc_diag_msg(const unsigned int msg_len) { - printf("{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}" + printf("{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" ", {diag_family=AF_SMC, diag_state=SMC_ACTIVE" ", diag_fallback=SMC_DIAG_MODE_SMCR, diag_shutdown=0" ", id={idiag_sport=htons(0), idiag_dport=htons(0)" diff --git a/tests/nlattr_tc_stats.c b/tests/nlattr_tc_stats.c index 3fb4b743a..0c3b51508 100644 --- a/tests/nlattr_tc_stats.c +++ b/tests/nlattr_tc_stats.c @@ -47,8 +47,8 @@ init_tcmsg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_tcmsg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETQDISC, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {tcm_family=AF_UNIX" + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETQDISC, nlmsg_flags=NLM_F_DUMP" + ", nlmsg_seq=0, nlmsg_pid=0}, {tcm_family=AF_UNIX" ", tcm_ifindex=" IFINDEX_LO_STR ", tcm_handle=0, tcm_parent=0, tcm_info=0}" ", {{nla_len=%u, nla_type=TCA_STATS2}", diff --git a/tests/nlattr_tca_stab.c b/tests/nlattr_tca_stab.c index d339dbc8c..0ccb13453 100644 --- a/tests/nlattr_tca_stab.c +++ b/tests/nlattr_tca_stab.c @@ -47,8 +47,8 @@ init_tcmsg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_tcmsg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETQDISC, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {tcm_family=AF_UNIX" + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETQDISC, nlmsg_flags=NLM_F_DUMP" + ", nlmsg_seq=0, nlmsg_pid=0}, {tcm_family=AF_UNIX" ", tcm_ifindex=" IFINDEX_LO_STR ", tcm_handle=0, tcm_parent=0, tcm_info=0}" ", {{nla_len=%u, nla_type=TCA_STAB}", diff --git a/tests/nlattr_tcamsg.c b/tests/nlattr_tcamsg.c index e25e32a60..edec29ebc 100644 --- a/tests/nlattr_tcamsg.c +++ b/tests/nlattr_tcamsg.c @@ -48,8 +48,8 @@ init_tcamsg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_tcamsg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETACTION, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {tca_family=AF_INET}", + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETACTION, nlmsg_flags=NLM_F_DUMP" + ", nlmsg_seq=0, nlmsg_pid=0}, {tca_family=AF_INET}", msg_len); } diff --git a/tests/nlattr_tcmsg.c b/tests/nlattr_tcmsg.c index f76b2f874..b11741128 100644 --- a/tests/nlattr_tcmsg.c +++ b/tests/nlattr_tcmsg.c @@ -34,8 +34,8 @@ init_tcmsg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_tcmsg(const unsigned int msg_len) { - printf("{len=%u, type=RTM_GETQDISC, flags=NLM_F_DUMP" - ", seq=0, pid=0}, {tcm_family=AF_UNIX" + printf("{nlmsg_len=%u, nlmsg_type=RTM_GETQDISC, nlmsg_flags=NLM_F_DUMP" + ", nlmsg_seq=0, nlmsg_pid=0}, {tcm_family=AF_UNIX" ", tcm_ifindex=" IFINDEX_LO_STR ", tcm_handle=0, tcm_parent=0, tcm_info=0}", msg_len); diff --git a/tests/nlattr_unix_diag_msg.c b/tests/nlattr_unix_diag_msg.c index 4d964eaba..165aa0427 100644 --- a/tests/nlattr_unix_diag_msg.c +++ b/tests/nlattr_unix_diag_msg.c @@ -37,9 +37,10 @@ init_unix_diag_msg(struct nlmsghdr *const nlh, const unsigned int msg_len) static void print_unix_diag_msg(const unsigned int msg_len) { - printf("{len=%u, type=SOCK_DIAG_BY_FAMILY" - ", flags=NLM_F_DUMP, seq=0, pid=0}, {udiag_family=AF_UNIX" - ", udiag_type=SOCK_STREAM, udiag_state=TCP_ESTABLISHED" + printf("{nlmsg_len=%u, nlmsg_type=SOCK_DIAG_BY_FAMILY" + ", nlmsg_flags=NLM_F_DUMP, nlmsg_seq=0, nlmsg_pid=0}" + ", {udiag_family=AF_UNIX, udiag_type=SOCK_STREAM" + ", udiag_state=TCP_ESTABLISHED" ", udiag_ino=0, udiag_cookie=[0, 0]}", msg_len); } diff --git a/tests/test_netlink.h b/tests/test_netlink.h index 2ce476d54..cf3e9e242 100644 --- a/tests/test_netlink.h +++ b/tests/test_netlink.h @@ -36,8 +36,8 @@ msg_len, MSG_DONTWAIT, \ NULL, 0)); \ \ - printf("sendto(%d, {{len=%u, type=%s" \ - ", flags=%s, seq=0, pid=0}, ", \ + printf("sendto(%d, {{nlmsg_len=%u, nlmsg_type=%s" \ + ", nlmsg_flags=%s, nlmsg_seq=0, nlmsg_pid=0}, ", \ (fd_), msg_len, (type_str_), (flags_str_)); \ \ { __VA_ARGS__; } \ |