X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-rtnl%2Ftest-rtnl.c;h=cd81acae7730f79f7760bf41a5a7c37437351535;hb=ca4e095ab9e970cb8fa472ae69ea1f0648041722;hp=6d9159cd1160478d36ad41c24969083d837d8cc1;hpb=f66eeb6bb636f8061bf45e6e8e24761e87510800;p=elogind.git

diff --git a/src/libsystemd/sd-rtnl/test-rtnl.c b/src/libsystemd/sd-rtnl/test-rtnl.c
index 6d9159cd1..cd81acae7 100644
--- a/src/libsystemd/sd-rtnl/test-rtnl.c
+++ b/src/libsystemd/sd-rtnl/test-rtnl.c
@@ -20,6 +20,7 @@
 ***/
 
 #include <netinet/ether.h>
+#include <net/if.h>
 
 #include "util.h"
 #include "macro.h"
@@ -32,10 +33,10 @@
 
 static void test_link_configure(sd_rtnl *rtnl, int ifindex) {
         _cleanup_rtnl_message_unref_ sd_rtnl_message *message;
-        uint16_t type;
         const char *mac = "98:fe:94:3f:c6:18", *name = "test";
-        unsigned int mtu = 1450;
-        void *data;
+        unsigned int mtu = 1450, mtu_out;
+        const char *name_out;
+        struct ether_addr mac_out;
 
         /* we'd really like to test NEWLINK, but let's not mess with the running kernel */
         assert_se(sd_rtnl_message_new_link(rtnl, &message, RTM_GETLINK, ifindex) >= 0);
@@ -44,28 +45,23 @@ static void test_link_configure(sd_rtnl *rtnl, int ifindex) {
         assert_se(sd_rtnl_message_append_u32(message, IFLA_MTU, mtu) >= 0);
 
         assert_se(sd_rtnl_call(rtnl, message, 0, NULL) == 1);
+        assert_se(sd_rtnl_message_rewind(message) >= 0);
 
-        assert_se(sd_rtnl_message_read(message, &type, &data) > 0);
-        assert_se(type == IFLA_IFNAME);
-        assert_se(streq(name, (char *) data));
+        assert_se(sd_rtnl_message_read_string(message, IFLA_IFNAME, &name_out) >= 0);
+        assert_se(streq(name, name_out));
 
-        assert_se(sd_rtnl_message_read(message, &type, &data) > 0);
-        assert_se(type == IFLA_ADDRESS);
-        assert_se(streq(mac, ether_ntoa(data)));
+        assert_se(sd_rtnl_message_read_ether_addr(message, IFLA_ADDRESS, &mac_out) >= 0);
+        assert_se(streq(mac, ether_ntoa(&mac_out)));
 
-        assert_se(sd_rtnl_message_read(message, &type, &data) > 0);
-        assert_se(type == IFLA_MTU);
-        assert_se(mtu == *(unsigned int *) data);
+        assert_se(sd_rtnl_message_read_u32(message, IFLA_MTU, &mtu_out) >= 0);
+        assert_se(mtu == mtu_out);
 }
 
 static void test_link_get(sd_rtnl *rtnl, int ifindex) {
         sd_rtnl_message *m;
         sd_rtnl_message *r;
         unsigned int mtu = 1500;
-        unsigned int *mtu_reply;
-        void *data;
-        char *str_data;
-        uint16_t type;
+        const char *str_data;
         uint8_t u8_data;
         uint32_t u32_data;
         struct ether_addr eth_data;
@@ -87,47 +83,6 @@ static void test_link_get(sd_rtnl *rtnl, int ifindex) {
 
         assert_se(sd_rtnl_call(rtnl, m, -1, &r) == 1);
 
-        /* u8 read back */
-        assert_se(sd_rtnl_message_read(m, &type, &data) == 1);
-        assert_se(type == IFLA_CARRIER);
-
-        assert_se(sd_rtnl_message_read(m, &type, &data) == 1);
-        assert_se(type == IFLA_OPERSTATE);
-
-        assert_se(sd_rtnl_message_read(m, &type, &data) == 1);
-        assert_se(type == IFLA_LINKMODE);
-
-        /* u32 read back */
-        assert_se(sd_rtnl_message_read(m, &type, (void **) &mtu_reply) == 1);
-        assert_se(type == IFLA_MTU);
-        assert_se(*mtu_reply == mtu);
-
-        assert_se(sd_rtnl_message_read(m, &type, &data) == 1);
-        assert_se(type == IFLA_GROUP);
-
-        assert_se(sd_rtnl_message_read(m, &type, &data) == 1);
-        assert_se(type == IFLA_TXQLEN);
-
-        assert_se(sd_rtnl_message_read(m, &type, &data) == 1);
-        assert_se(type == IFLA_NUM_TX_QUEUES);
-
-        assert_se(sd_rtnl_message_read(m, &type, &data) == 1);
-        assert_se(type == IFLA_NUM_RX_QUEUES);
-
-        while (sd_rtnl_message_read(r, &type, &data) > 0) {
-                switch (type) {
-//                        case IFLA_MTU:
-//                                assert_se(*(unsigned int *) data == 65536);
-//                                break;
-//                        case IFLA_QDISC:
-//                                assert_se(streq((char *) data, "noqueue"));
-//                                break;
-                        case IFLA_IFNAME:
-                                assert_se(streq((char *) data, "lo"));
-                                break;
-                }
-        }
-
         assert_se(sd_rtnl_message_read_string(r, IFLA_IFNAME, &str_data) == 0);
 
         assert_se(sd_rtnl_message_read_u8(r, IFLA_CARRIER, &u8_data) == 0);
@@ -152,7 +107,8 @@ static void test_address_get(sd_rtnl *rtnl, int ifindex) {
         sd_rtnl_message *m;
         sd_rtnl_message *r;
         struct in_addr in_data;
-        char *label;
+        struct ifa_cacheinfo cache;
+        const char *label;
 
         assert_se(sd_rtnl_message_new_addr(rtnl, &m, RTM_GETADDR, ifindex, AF_INET) >= 0);
         assert_se(m);
@@ -162,6 +118,7 @@ static void test_address_get(sd_rtnl *rtnl, int ifindex) {
         assert_se(sd_rtnl_message_read_in_addr(r, IFA_LOCAL, &in_data) == 0);
         assert_se(sd_rtnl_message_read_in_addr(r, IFA_ADDRESS, &in_data) == 0);
         assert_se(sd_rtnl_message_read_string(r, IFA_LABEL, &label) == 0);
+        assert_se(sd_rtnl_message_read_cache_info(r, IFA_CACHEINFO, &cache) == 0);
 
         assert_se(sd_rtnl_flush(rtnl) >= 0);
         assert_se((m = sd_rtnl_message_unref(m)) == NULL);
@@ -171,13 +128,9 @@ static void test_address_get(sd_rtnl *rtnl, int ifindex) {
 
 static void test_route(void) {
         _cleanup_rtnl_message_unref_ sd_rtnl_message *req;
-        struct in_addr addr;
-        uint32_t index = 2;
-        uint16_t type;
-        void *data;
-        uint32_t u32_data;
+        struct in_addr addr, addr_data;
+        uint32_t index = 2, u32_data;
         int r;
-        struct rtmsg *rtm;
 
         r = sd_rtnl_message_new_route(NULL, &req, RTM_NEWROUTE, AF_INET);
         if (r < 0) {
@@ -199,26 +152,13 @@ static void test_route(void) {
                 return;
         }
 
-        assert_se(rtnl_message_seal(NULL, req) >= 0);
-
-        assert_se(sd_rtnl_message_read(req, &type, &data) > 0);
-        assert_se(type == RTA_GATEWAY);
-        assert_se(((struct in_addr *)data)->s_addr == addr.s_addr);
-
-        assert_se(sd_rtnl_message_read(req, &type, &data) > 0);
-        assert_se(type == RTA_OIF);
-        assert_se(*(uint32_t *) data == index);
+        assert_se(sd_rtnl_message_rewind(req) >= 0);
 
-        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_in_addr(req, RTA_GATEWAY, &addr_data) >= 0);
+        assert_se(addr_data.s_addr == addr.s_addr);
 
-        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(sd_rtnl_message_read_u32(req, RTA_OIF, &u32_data) >= 0);
+        assert_se(u32_data == index);
 
         assert_se((req = sd_rtnl_message_unref(req)) == NULL);
 }
@@ -234,9 +174,8 @@ static void test_multiple(void) {
 }
 
 static int link_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
-        void *data;
-        uint16_t type;
         char *ifname = userdata;
+        const char *data;
 
         assert_se(rtnl);
         assert_se(m);
@@ -244,19 +183,8 @@ static int link_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         log_info("got link info about %s", ifname);
         free(ifname);
 
-        while (sd_rtnl_message_read(m, &type, &data) > 0) {
-                switch (type) {
-//                        case IFLA_MTU:
-//                                assert_se(*(unsigned int *) data == 65536);
-//                                break;
-//                        case IFLA_QDISC:
-//                                assert_se(streq((char *) data, "noqueue"));
-//                                break;
-                        case IFLA_IFNAME:
-                                assert_se(streq((char *) data, "lo"));
-                                break;
-                }
-        }
+        assert_se(sd_rtnl_message_read_string(m, IFLA_IFNAME, &data) >= 0);
+        assert_se(streq(data, "lo"));
 
         return 1;
 }
@@ -288,12 +216,17 @@ static void test_event_loop(int ifindex) {
 
 static int pipe_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         int *counter = userdata;
+        int r;
 
         (*counter) --;
 
-        log_info("got reply, %d left in pipe", *counter);
+        r = sd_rtnl_message_get_errno(m);
+
+        log_info("%d left in pipe. got reply: %s", *counter, strerror(-r));
 
-        return sd_rtnl_message_get_errno(m);
+        assert_se(r >= 0);
+
+        return 1;
 }
 
 static void test_async(int ifindex) {
@@ -343,60 +276,35 @@ static void test_pipe(int ifindex) {
 
 static void test_container(void) {
         _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL;
-        uint16_t type;
+        uint16_t u16_data;
         uint32_t u32_data;
-        void *data;
-        int r;
-        struct ifinfomsg *ifi;
+        const char *string_data;
 
         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, "kind") >= 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, "kind") >= 0);
+        assert_se(sd_rtnl_message_append_string(m, IFLA_INFO_KIND, "vlan") >= 0);
         assert_se(sd_rtnl_message_close_container(m) >= 0);
         assert_se(sd_rtnl_message_close_container(m) == -EINVAL);
 
-        assert_se(rtnl_message_seal(NULL, m) >= 0);
-
-        assert_se(sd_rtnl_message_read(m, &type, &data) >= 0);
-        assert_se(type == IFLA_LINKINFO);
-        assert_se(data == NULL);
-/*
-        assert_se(sd_rtnl_message_read(m, &type, &data) >= 0);
-        assert_se(type == IFLA_INFO_KIND);
-        assert_se(streq("kind", (char *)data));
-        assert_se(sd_rtnl_message_read(m, &type, &data) >= 0);
-        assert_se(type == IFLA_INFO_DATA);
-        assert_se(data == NULL);
-        assert_se(sd_rtnl_message_read(m, &type, &data) >= 0);
-        assert_se(type == IFLA_VLAN_ID);
-        assert_se(*(uint16_t *)data == 100);
-        assert_se(sd_rtnl_message_read(m, &type, &data) == 0);
+        assert_se(sd_rtnl_message_rewind(m) >= 0);
+
+        assert_se(sd_rtnl_message_enter_container(m, IFLA_LINKINFO) >= 0);
+        assert_se(sd_rtnl_message_read_string(m, IFLA_INFO_KIND, &string_data) >= 0);
+        assert_se(streq("vlan", string_data));
+
+        assert_se(sd_rtnl_message_enter_container(m, IFLA_INFO_DATA) >= 0);
+        assert_se(sd_rtnl_message_read_u16(m, IFLA_VLAN_ID, &u16_data) >= 0);
         assert_se(sd_rtnl_message_exit_container(m) >= 0);
-        assert_se(sd_rtnl_message_read(m, &type, &data) >= 0);
-        assert_se(type == IFLA_INFO_KIND);
-        assert_se(streq("kind", (char *)data));
-        assert_se(sd_rtnl_message_read(m, &type, &data) == 0);
+
+        assert_se(sd_rtnl_message_read_string(m, IFLA_INFO_KIND, &string_data) >= 0);
+        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);
 }
@@ -416,11 +324,39 @@ static void test_match(void) {
         assert_se((rtnl = sd_rtnl_unref(rtnl)) == NULL);
 }
 
+static void test_get_addresses(sd_rtnl *rtnl) {
+        _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
+        sd_rtnl_message *m;
+
+        assert_se(sd_rtnl_message_new_addr(rtnl, &req, RTM_GETADDR, 0, AF_UNSPEC) >= 0);
+
+        assert_se(sd_rtnl_call(rtnl, req, 0, &reply) >= 0);
+
+        for (m = reply; m; m = sd_rtnl_message_next(m)) {
+                uint16_t type;
+                unsigned char family, scope, flags;
+                int ifindex;
+
+                assert_se(sd_rtnl_message_get_type(m, &type) >= 0);
+                assert_se(type == RTM_NEWADDR);
+
+                assert_se(sd_rtnl_message_addr_get_ifindex(m, &ifindex) >= 0);
+                assert_se(sd_rtnl_message_addr_get_family(m, &family) >= 0);
+                assert_se(sd_rtnl_message_addr_get_scope(m, &scope) >= 0);
+                assert_se(sd_rtnl_message_addr_get_flags(m, &flags) >= 0);
+
+                assert_se(ifindex > 0);
+                assert_se(family == AF_INET || family == AF_INET6);
+
+                log_info("got IPv%u address on ifindex %i", family == AF_INET ? 4: 6, ifindex);
+        }
+}
+
 int main(void) {
         sd_rtnl *rtnl;
         sd_rtnl_message *m;
         sd_rtnl_message *r;
-        void *data;
+        const char *string_data;
         int if_loopback;
         uint16_t type;
 
@@ -446,19 +382,20 @@ int main(void) {
 
         test_link_configure(rtnl, if_loopback);
 
+        test_get_addresses(rtnl);
+
         assert_se(sd_rtnl_message_new_link(rtnl, &m, RTM_GETLINK, if_loopback) >= 0);
         assert_se(m);
 
         assert_se(sd_rtnl_message_get_type(m, &type) >= 0);
         assert_se(type == RTM_GETLINK);
 
-        assert_se(sd_rtnl_message_read(m, &type, &data) == -EPERM);
+        assert_se(sd_rtnl_message_read_string(m, IFLA_IFNAME, &string_data) == -EPERM);
 
         assert_se(sd_rtnl_call(rtnl, m, 0, &r) == 1);
         assert_se(sd_rtnl_message_get_type(r, &type) >= 0);
         assert_se(type == RTM_NEWLINK);
 
-        assert_se(sd_rtnl_message_read(m, &type, &data) == 0);
         assert_se((r = sd_rtnl_message_unref(r)) == NULL);
 
         assert_se(sd_rtnl_call(rtnl, m, -1, &r) == -EPERM);