From e4cfb43cd3d2d1f7d468fc7b7b3a84a0b9abf513 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Fri, 30 Jun 2017 21:38:49 +0000 Subject: [PATCH] tests: enhance nlattr_netlink_diag_msg test * tests/nlattr_netlink_diag_msg.c: Include "test_nlattr.h". (test_netlink_diag_groups, test_netlink_diag_rx_ring, test_netlink_diag_flags): Remove. (init_netlink_diag_msg): Add const qualifier to arguments and variables. (print_netlink_diag_msg, print_xlong): New functions. (main): Use them and macros from test_nlattr.h file. --- tests/nlattr_netlink_diag_msg.c | 310 +++++--------------------------- 1 file changed, 40 insertions(+), 270 deletions(-) diff --git a/tests/nlattr_netlink_diag_msg.c b/tests/nlattr_netlink_diag_msg.c index 901422ec..a7f7e58e 100644 --- a/tests/nlattr_netlink_diag_msg.c +++ b/tests/nlattr_netlink_diag_msg.c @@ -27,28 +27,24 @@ */ #include "tests.h" -#include "netlink.h" #include #include #include -#include +#include "test_nlattr.h" #include -#include #include static void -init_netlink_diag_msg(struct nlmsghdr *nlh, unsigned int msg_len) +init_netlink_diag_msg(struct nlmsghdr *const nlh, const unsigned int msg_len) { - struct netlink_diag_msg *msg; - SET_STRUCT(struct nlmsghdr, nlh, .nlmsg_len = msg_len, .nlmsg_type = SOCK_DIAG_BY_FAMILY, .nlmsg_flags = NLM_F_DUMP ); - msg = NLMSG_DATA(nlh); + struct netlink_diag_msg *const msg = NLMSG_DATA(nlh); SET_STRUCT(struct netlink_diag_msg, msg, .ndiag_family = AF_NETLINK, .ndiag_type = SOCK_RAW, @@ -58,292 +54,66 @@ init_netlink_diag_msg(struct nlmsghdr *nlh, unsigned int msg_len) } static void -test_netlink_diag_groups(const int fd) +print_netlink_diag_msg(const unsigned int msg_len) { - const int hdrlen = sizeof(struct netlink_diag_msg); - struct nlmsghdr *nlh; - struct nlattr *nla; - unsigned int nla_len; - unsigned int msg_len; - void *const nlh0 = tail_alloc(NLMSG_SPACE(hdrlen)); - long rc; - - /* len < sizeof(unsigned long) */ - nla_len = NLA_HDRLEN + 2; - msg_len = NLMSG_SPACE(hdrlen) + nla_len; - nlh = nlh0 - nla_len; - init_netlink_diag_msg(nlh, msg_len); - - nla = NLMSG_ATTR(nlh, hdrlen); - SET_STRUCT(struct nlattr, nla, - .nla_len = nla_len, - .nla_type = NETLINK_DIAG_GROUPS - ); - memcpy(RTA_DATA(nla), "12", 2); - - rc = sendto(fd, nlh, msg_len, MSG_DONTWAIT, NULL, 0); - - printf("sendto(%d, {{len=%u, type=SOCK_DIAG_BY_FAMILY" + 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]}, {{nla_len=%u" - ", nla_type=NETLINK_DIAG_GROUPS}, \"12\"}}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", - fd, msg_len, nla_len, msg_len, sprintrc(rc)); - - /* len == sizeof(unsigned long) * 2 - 1 */ - nla_len = NLA_HDRLEN + sizeof(unsigned long) * 2 - 1; - msg_len = NLMSG_SPACE(hdrlen) + nla_len; - nlh = nlh0 - nla_len; - init_netlink_diag_msg(nlh, msg_len); - - nla = NLMSG_ATTR(nlh, hdrlen); - SET_STRUCT(struct nlattr, nla, - .nla_len = nla_len, - .nla_type = NETLINK_DIAG_GROUPS - ); - static const unsigned long groups[] = { - (unsigned long) 0xdeadbeefbadc0dedULL, - (unsigned long) 0xdeadbeefbadc0dedULL - }; - memcpy(RTA_DATA(nla), groups, sizeof(groups[0])); - - rc = sendto(fd, nlh, msg_len, MSG_DONTWAIT, NULL, 0); - - printf("sendto(%d, {{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]}, {{nla_len=%u" - ", nla_type=NETLINK_DIAG_GROUPS}, [%#lx]}}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", - fd, msg_len, nla_len, groups[0], msg_len, sprintrc(rc)); - - /* len < sizeof(unsigned long) * 2 */ - nla_len = NLA_HDRLEN + sizeof(unsigned long) * 2; - msg_len = NLMSG_SPACE(hdrlen) + nla_len; - nlh = nlh0 - nla_len; - init_netlink_diag_msg(nlh, msg_len); - - nla = NLMSG_ATTR(nlh, hdrlen); - SET_STRUCT(struct nlattr, nla, - .nla_len = nla_len, - .nla_type = NETLINK_DIAG_GROUPS - ); - memcpy(RTA_DATA(nla), groups, sizeof(groups)); - - rc = sendto(fd, nlh, msg_len, MSG_DONTWAIT, NULL, 0); - - printf("sendto(%d, {{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]}, {{nla_len=%u" - ", nla_type=NETLINK_DIAG_GROUPS}, [%#lx, %#lx]}}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", - fd, msg_len, nla_len, groups[0], - groups[1], msg_len, sprintrc(rc)); + ", ndiag_cookie=[0, 0]}", + msg_len); } static void -test_netlink_diag_rx_ring(const int fd) +print_xlong(const unsigned long *p) { - const int hdrlen = sizeof(struct netlink_diag_msg); - struct nlmsghdr *nlh; - struct nlattr *nla; - unsigned int nla_len; - unsigned int msg_len; - void *const nlh0 = tail_alloc(NLMSG_SPACE(hdrlen)); - long rc; - - /* len < sizeof(struct netlink_diag_ring) */ - nla_len = NLA_HDRLEN + 2; - msg_len = NLMSG_SPACE(hdrlen) + nla_len; - nlh = nlh0 - nla_len; - init_netlink_diag_msg(nlh, msg_len); - - nla = NLMSG_ATTR(nlh, hdrlen); - SET_STRUCT(struct nlattr, nla, - .nla_len = nla_len, - .nla_type = NETLINK_DIAG_RX_RING - ); - memcpy(RTA_DATA(nla), "12", 2); - - rc = sendto(fd, nlh, msg_len, MSG_DONTWAIT, NULL, 0); - - printf("sendto(%d, {{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]}, {{nla_len=%u" - ", nla_type=NETLINK_DIAG_RX_RING}, \"12\"}}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", - fd, msg_len, nla_len, msg_len, sprintrc(rc)); - - /* short read of netlink_diag_ring */ - nla_len = NLA_HDRLEN + sizeof(struct netlink_diag_ring); - msg_len = NLMSG_SPACE(hdrlen) + nla_len; - nlh = nlh0 - (nla_len - 1); - init_netlink_diag_msg(nlh, msg_len); + printf("%#lx", *p); +} - nla = NLMSG_ATTR(nlh, hdrlen); - SET_STRUCT(struct nlattr, nla, - .nla_len = nla_len, - .nla_type = NETLINK_DIAG_RX_RING - ); +int +main(void) +{ + skip_if_unavailable("/proc/self/fd/"); - rc = sendto(fd, nlh, msg_len, MSG_DONTWAIT, NULL, 0); + const int fd = create_nl_socket(NETLINK_SOCK_DIAG); + const unsigned int hdrlen = sizeof(struct netlink_diag_msg); + void *const nlh0 = tail_alloc(NLMSG_SPACE(hdrlen)); - printf("sendto(%d, {{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]}, {{nla_len=%u" - ", nla_type=NETLINK_DIAG_RX_RING}, %p}}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", - fd, msg_len, nla_len, RTA_DATA(nla), msg_len, sprintrc(rc)); +#define DEFAULT_STRLEN 32 + static char pattern[DEFAULT_STRLEN]; + fill_memory_ex(pattern, sizeof(pattern), 'a', 'z' - 'a' + 1); - /* netlink_diag_ring */ - nla_len = NLA_HDRLEN + sizeof(struct netlink_diag_ring); - msg_len = NLMSG_SPACE(hdrlen) + nla_len; - nlh = nlh0 - nla_len; - init_netlink_diag_msg(nlh, msg_len); + static const unsigned long groups[] = { + (unsigned long) 0xdeadbeefbadc0dedULL, + (unsigned long) 0xdeadbeefbadc0dedULL + }; + TEST_NLATTR_ARRAY(fd, nlh0, hdrlen, + init_netlink_diag_msg, print_netlink_diag_msg, + NETLINK_DIAG_GROUPS, pattern, groups, print_xlong); - nla = NLMSG_ATTR(nlh, hdrlen); - SET_STRUCT(struct nlattr, nla, - .nla_len = nla_len, - .nla_type = NETLINK_DIAG_RX_RING - ); static const struct netlink_diag_ring ndr = { .ndr_block_size = 0xfabfabdc, .ndr_block_nr = 0xabcdabda, .ndr_frame_size = 0xcbadbafa, .ndr_frame_nr = 0xdbcafadb }; - memcpy(RTA_DATA(nla), &ndr, sizeof(ndr)); - - rc = sendto(fd, nlh, msg_len, MSG_DONTWAIT, NULL, 0); - - printf("sendto(%d, {{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]}, {{nla_len=%u" - ", nla_type=NETLINK_DIAG_RX_RING}, {ndr_block_size=%u" - ", ndr_block_nr=%u, ndr_frame_size=%u, ndr_frame_nr=%u}}}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", - fd, msg_len, nla_len, ndr.ndr_block_size, - ndr.ndr_block_nr, ndr.ndr_frame_size, - ndr.ndr_frame_nr, msg_len, sprintrc(rc)); -} - -static void -test_netlink_diag_flags(const int fd) -{ - const int hdrlen = sizeof(struct netlink_diag_msg); - struct nlmsghdr *nlh; - struct nlattr *nla; - unsigned int nla_len; - unsigned int msg_len; - void *const nlh0 = tail_alloc(NLMSG_SPACE(hdrlen)); - long rc; - - /* len < sizeof(uint32_t) */ - nla_len = NLA_HDRLEN + 2; - msg_len = NLMSG_SPACE(hdrlen) + nla_len; - nlh = nlh0 - nla_len; - init_netlink_diag_msg(nlh, msg_len); - - nla = NLMSG_ATTR(nlh, hdrlen); - SET_STRUCT(struct nlattr, nla, - .nla_len = nla_len, - .nla_type = NETLINK_DIAG_FLAGS - ); - memcpy(RTA_DATA(nla), "12", 2); - - rc = sendto(fd, nlh, msg_len, MSG_DONTWAIT, NULL, 0); - - printf("sendto(%d, {{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]}, {{nla_len=%u" - ", nla_type=NETLINK_DIAG_FLAGS}, \"12\"}}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", - fd, msg_len, nla_len, msg_len, sprintrc(rc)); + TEST_NLATTR_OBJECT(fd, nlh0, hdrlen, + init_netlink_diag_msg, print_netlink_diag_msg, + NETLINK_DIAG_RX_RING, pattern, ndr, + PRINT_FIELD_U("{", ndr, ndr_block_size); + PRINT_FIELD_U(", ", ndr, ndr_block_nr); + PRINT_FIELD_U(", ", ndr, ndr_frame_size); + PRINT_FIELD_U(", ", ndr, ndr_frame_nr); + printf("}")); - /* short read of flags */ - nla_len = NLA_HDRLEN + sizeof(uint32_t); - msg_len = NLMSG_SPACE(hdrlen) + nla_len; - nlh = nlh0 - (nla_len - 1); - init_netlink_diag_msg(nlh, msg_len); - - nla = NLMSG_ATTR(nlh, hdrlen); - SET_STRUCT(struct nlattr, nla, - .nla_len = nla_len, - .nla_type = NETLINK_DIAG_FLAGS - ); - - rc = sendto(fd, nlh, msg_len, MSG_DONTWAIT, NULL, 0); - - printf("sendto(%d, {{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]}, {{nla_len=%u" - ", nla_type=NETLINK_DIAG_FLAGS}, %p}}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", - fd, msg_len, nla_len, RTA_DATA(nla), msg_len, sprintrc(rc)); - - /* flags */ - nla_len = NLA_HDRLEN + sizeof(uint32_t); - msg_len = NLMSG_SPACE(hdrlen) + nla_len; - nlh = nlh0 - nla_len; - init_netlink_diag_msg(nlh, msg_len); - - nla = NLMSG_ATTR(nlh, hdrlen); - SET_STRUCT(struct nlattr, nla, - .nla_len = nla_len, - .nla_type = NETLINK_DIAG_FLAGS - ); static const uint32_t flags = NDIAG_FLAG_CB_RUNNING | NDIAG_FLAG_PKTINFO; - memcpy(RTA_DATA(nla), &flags, sizeof(flags)); - - rc = sendto(fd, nlh, msg_len, MSG_DONTWAIT, NULL, 0); - - printf("sendto(%d, {{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]}, {{nla_len=%u" - ", nla_type=NETLINK_DIAG_FLAGS}" - ", NDIAG_FLAG_CB_RUNNING|NDIAG_FLAG_PKTINFO}}" - ", %u, MSG_DONTWAIT, NULL, 0) = %s\n", - fd, msg_len, nla_len, msg_len, sprintrc(rc)); -} - -int main(void) -{ - skip_if_unavailable("/proc/self/fd/"); - - int fd = create_nl_socket(NETLINK_SOCK_DIAG); - - test_netlink_diag_groups(fd); - test_netlink_diag_rx_ring(fd); - test_netlink_diag_flags(fd); - - printf("+++ exited with 0 +++\n"); + TEST_NLATTR_OBJECT(fd, nlh0, hdrlen, + init_netlink_diag_msg, print_netlink_diag_msg, + NETLINK_DIAG_FLAGS, pattern, flags, + printf("NDIAG_FLAG_CB_RUNNING|NDIAG_FLAG_PKTINFO")); + puts("+++ exited with 0 +++"); return 0; } -- 2.40.0