3 files changed, 109 insertions, 26 deletions

diff --git a/tests/sys/netlink/Makefile b/tests/sys/netlink/Makefile
index 175be36ea083..16559f0e9d3d 100644
--- a/tests/sys/netlink/Makefile
+++ b/tests/sys/netlink/Makefile
@@ -5,7 +5,7 @@ WARNS?=		1
 
 TESTSDIR=       ${TESTSBASE}/sys/netlink
 
-ATF_TESTS_C +=	test_snl
+ATF_TESTS_C +=	test_snl test_snl_generic
 ATF_TESTS_PYTEST +=	test_nl_core.py
 ATF_TESTS_PYTEST +=	test_rtnl_iface.py
 ATF_TESTS_PYTEST +=	test_rtnl_ifaddr.py
diff --git a/tests/sys/netlink/test_snl.c b/tests/sys/netlink/test_snl.c
index daacc1aaacec..85bdff7fb163 100644
--- a/tests/sys/netlink/test_snl.c
+++ b/tests/sys/netlink/test_snl.c
@@ -20,13 +20,25 @@ require_netlink(void)
 		atf_tc_skip("netlink module not loaded");
 }
 
-ATF_TC(snl_verify_parsers);
-ATF_TC_HEAD(snl_verify_parsers, tc)
+ATF_TC(snl_verify_core_parsers);
+ATF_TC_HEAD(snl_verify_core_parsers, tc)
 {
-	atf_tc_set_md_var(tc, "descr", "Tests snl(3) parsers are correct");
+	atf_tc_set_md_var(tc, "descr", "Tests snl(3) core nlmsg parsers are correct");
 }
 
-ATF_TC_BODY(snl_verify_parsers, tc)
+ATF_TC_BODY(snl_verify_core_parsers, tc)
+{
+	SNL_VERIFY_PARSERS(snl_all_core_parsers);
+
+}
+
+ATF_TC(snl_verify_route_parsers);
+ATF_TC_HEAD(snl_verify_route_parsers, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests snl(3) route parsers are correct");
+}
+
+ATF_TC_BODY(snl_verify_route_parsers, tc)
 {
 	SNL_VERIFY_PARSERS(snl_all_route_parsers);
 
@@ -61,45 +73,39 @@ SNL_DECLARE_PARSER(link_parser, struct ifinfomsg, fp_link, ap_link);
 ATF_TC_BODY(snl_list_ifaces, tc)
 {
 	struct snl_state ss;
+	struct snl_writer nw;
 
 	require_netlink();
 
 	if (!snl_init(&ss, NETLINK_ROUTE))
 		atf_tc_fail("snl_init() failed");
 
-	struct {
-		struct nlmsghdr hdr;
-		struct ifinfomsg ifmsg;
-	} msg = {
-		.hdr.nlmsg_type = RTM_GETLINK,
-		.hdr.nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST,
-		.hdr.nlmsg_seq = snl_get_seq(&ss),
-	};
-	msg.hdr.nlmsg_len = sizeof(msg);
+	snl_init_writer(&ss, &nw);
 
-	if (!snl_send(&ss, &msg, sizeof(msg))) {
-		snl_free(&ss);
-		atf_tc_fail("snl_send() failed");
-	}
+	struct nlmsghdr *hdr = snl_create_msg_request(&nw, RTM_GETLINK);
+	ATF_CHECK(hdr != NULL);
+	ATF_CHECK(snl_reserve_msg_object(&nw, struct ifinfomsg) != NULL);
+	ATF_CHECK(snl_finalize_msg(&nw) != NULL);
+	uint32_t seq_id = hdr->nlmsg_seq;
 
-	struct nlmsghdr *hdr;
+	ATF_CHECK(snl_send_message(&ss, hdr));
+
+	struct snl_errmsg_data e = {};
 	int count = 0;
-	while ((hdr = snl_read_message(&ss)) != NULL && hdr->nlmsg_type != NLMSG_DONE) {
-		if (hdr->nlmsg_seq != msg.hdr.nlmsg_seq)
-			continue;
 
-		struct nl_parsed_link link = {};
-		if (!snl_parse_nlmsg(&ss, hdr, &link_parser, &link))
-			continue;
+	while ((hdr = snl_read_reply_multi(&ss, seq_id, &e)) != NULL) {
 		count++;
 	}
+	ATF_REQUIRE(e.error == 0);
+
 	ATF_REQUIRE_MSG(count > 0, "Empty interface list");
 }
 
 ATF_TP_ADD_TCS(tp)
 {
+	ATF_TP_ADD_TC(tp, snl_verify_core_parsers);
+	ATF_TP_ADD_TC(tp, snl_verify_route_parsers);
 	ATF_TP_ADD_TC(tp, snl_list_ifaces);
-	ATF_TP_ADD_TC(tp, snl_verify_parsers);
 
 	return (atf_no_error());
 }
diff --git a/tests/sys/netlink/test_snl_generic.c b/tests/sys/netlink/test_snl_generic.c
new file mode 100644
index 000000000000..c65d134f080d
--- /dev/null
+++ b/tests/sys/netlink/test_snl_generic.c
@@ -0,0 +1,77 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <sys/param.h>
+#include <sys/module.h>
+
+#include <netlink/netlink.h>
+#include "netlink/netlink_snl.h"
+#include "netlink/netlink_snl_generic.h"
+
+#include <atf-c.h>
+
+static void
+require_netlink(void)
+{
+	if (modfind("netlink") == -1)
+		atf_tc_skip("netlink module not loaded");
+}
+
+ATF_TC(snl_verify_genl_parsers);
+ATF_TC_HEAD(snl_verify_genl_parsers, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests snl(3) generic parsers are correct");
+}
+
+ATF_TC_BODY(snl_verify_genl_parsers, tc)
+{
+	SNL_VERIFY_PARSERS(snl_all_genl_parsers);
+
+}
+
+ATF_TC(test_snl_get_genl_family_success);
+ATF_TC_HEAD(test_snl_get_genl_family_success, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests successfull resolution of the 'nlctrl' family");
+}
+
+ATF_TC_BODY(test_snl_get_genl_family_success, tc)
+{
+	struct snl_state ss;
+
+	require_netlink();
+
+	if (!snl_init(&ss, NETLINK_GENERIC))
+		atf_tc_fail("snl_init() failed");
+
+	ATF_CHECK_EQ(snl_get_genl_family(&ss, "nlctrl"), GENL_ID_CTRL);
+}
+
+ATF_TC(test_snl_get_genl_family_failure);
+ATF_TC_HEAD(test_snl_get_genl_family_failure, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests unsuccessfull resolution of 'no-such-family' family");
+}
+
+ATF_TC_BODY(test_snl_get_genl_family_failure, tc)
+{
+	struct snl_state ss;
+
+	require_netlink();
+
+	if (!snl_init(&ss, NETLINK_GENERIC))
+		atf_tc_fail("snl_init() failed");
+
+	ATF_CHECK_EQ(snl_get_genl_family(&ss, "no-such-family"), 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, snl_verify_genl_parsers);
+	ATF_TP_ADD_TC(tp, test_snl_get_genl_family_success);
+	ATF_TP_ADD_TC(tp, test_snl_get_genl_family_failure);
+
+	return (atf_no_error());
+}
+