sd-rtnl: rework rtnl type system

[elogind.git] / src / libsystemd / sd-rtnl / test-rtnl.c

diff --git a/src/libsystemd/sd-rtnl/test-rtnl.c b/src/libsystemd/sd-rtnl/test-rtnl.c
index 7e9f6070801c24b37275b36856e7cd0d41c7d29c..44369628f4d904b991325af6ccf0de0a92ede872 100644 (file)
--- a/src/libsystemd/sd-rtnl/test-rtnl.c
+++ b/src/libsystemd/sd-rtnl/test-rtnl.c
@@ -125,7 +125,6 @@ static void test_address_get(sd_rtnl *rtnl, int ifindex) {
 
 static void test_route(void) {
         _cleanup_rtnl_message_unref_ sd_rtnl_message *req;
-        struct rtmsg *rtm;
         struct in_addr addr, addr_data;
         uint32_t index = 2, u32_data;
         int r;
@@ -158,17 +157,6 @@ static void test_route(void) {
         assert_se(sd_rtnl_message_read_u32(req, RTA_OIF, &u32_data) >= 0);
         assert_se(u32_data == index);
 
-        rtm = NLMSG_DATA(req->hdr);
-        r = rtnl_message_parse(req,
-                               &req->rta_offset_tb,
-                               &req->rta_tb_size,
-                               RTA_MAX,
-                               RTM_RTA(rtm),
-                               RTM_PAYLOAD(req->hdr));
-
-        assert_se(sd_rtnl_message_read_u32(req, RTA_GATEWAY, &u32_data) == 0);
-        assert_se(sd_rtnl_message_read_u32(req, RTA_OIF, &u32_data) == 0);
-
         assert_se((req = sd_rtnl_message_unref(req)) == NULL);
 }
 
@@ -284,19 +272,14 @@ static void test_pipe(int ifindex) {
 
 static void test_container(void) {
         _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL;
-        struct ifinfomsg *ifi;
         uint16_t u16_data;
         uint32_t u32_data;
         char *string_data;
-        int r;
 
         assert_se(sd_rtnl_message_new_link(NULL, &m, RTM_NEWLINK, 0) >= 0);
 
         assert_se(sd_rtnl_message_open_container(m, IFLA_LINKINFO) >= 0);
-        assert_se(sd_rtnl_message_open_container(m, IFLA_LINKINFO) == -ENOTSUP);
-        assert_se(sd_rtnl_message_append_string(m, IFLA_INFO_KIND, "vlan") >= 0);
-        assert_se(sd_rtnl_message_open_container(m, IFLA_INFO_DATA) >= 0);
-        assert_se(sd_rtnl_message_open_container(m, IFLA_INFO_DATA) == -ENOTSUP);
+        assert_se(sd_rtnl_message_open_container_union(m, IFLA_INFO_DATA, "vlan") >= 0);
         assert_se(sd_rtnl_message_append_u16(m, IFLA_VLAN_ID, 100) >= 0);
         assert_se(sd_rtnl_message_close_container(m) >= 0);
         assert_se(sd_rtnl_message_append_string(m, IFLA_INFO_KIND, "vlan") >= 0);
@@ -317,17 +300,7 @@ static void test_container(void) {
         assert_se(streq("vlan", string_data));
         assert_se(sd_rtnl_message_exit_container(m) >= 0);
 
-        ifi = NLMSG_DATA(m->hdr);
-        r = rtnl_message_parse(m,
-                               &m->rta_offset_tb,
-                               &m->rta_tb_size,
-                               IFLA_MAX,
-                               IFLA_RTA(ifi),
-                               IFLA_PAYLOAD(m->hdr));
-        if(r < 0)
-                return;
-
-        assert_se(sd_rtnl_message_read_u32(m, IFLA_LINKINFO, &u32_data) == 0);
+        assert_se(sd_rtnl_message_read_u32(m, IFLA_LINKINFO, &u32_data) < 0);
 
         assert_se(sd_rtnl_message_exit_container(m) == -EINVAL);
 }