rtnl: drop "sd_" prefix from cleanup macros

[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 98213d67829e73d1b3207d9143d80792e3ad4a3b..bc88300a0422b13739676e9bf63a1eaa26bca79a 100644 (file)
--- a/src/libsystemd/sd-rtnl/test-rtnl.c
+++ b/src/libsystemd/sd-rtnl/test-rtnl.c
@@ -30,7 +30,7 @@
 #include "event-util.h"
 
 static void test_link_configure(sd_rtnl *rtnl, int ifindex) {
-        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *message;
+        _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;
@@ -42,6 +42,8 @@ static void test_link_configure(sd_rtnl *rtnl, int ifindex) {
         assert(sd_rtnl_message_append_ether_addr(message, IFLA_ADDRESS, ether_aton(mac)) >= 0);
         assert(sd_rtnl_message_append_u32(message, IFLA_MTU, mtu) >= 0);
 
+        assert(sd_rtnl_call(rtnl, message, 0, NULL) == 1);
+
         assert(sd_rtnl_message_read(message, &type, &data) > 0);
         assert(type == IFLA_IFNAME);
         assert(streq(name, (char *) data));
@@ -53,12 +55,82 @@ static void test_link_configure(sd_rtnl *rtnl, int ifindex) {
         assert(sd_rtnl_message_read(message, &type, &data) > 0);
         assert(type == IFLA_MTU);
         assert(mtu == *(unsigned int *) data);
+}
+
+
+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;
+        uint16_t type;
+
+        assert(sd_rtnl_message_link_new(RTM_GETLINK, ifindex, &m) >= 0);
+        assert(m);
+
+        /* u8 test cases  */
+        assert(sd_rtnl_message_append_u8(m, IFLA_CARRIER, 0) >= 0);
+        assert(sd_rtnl_message_append_u8(m, IFLA_OPERSTATE, 0) >= 0);
+        assert(sd_rtnl_message_append_u8(m, IFLA_LINKMODE, 0) >= 0);
+
+        /* u32 test cases */
+        assert(sd_rtnl_message_append_u32(m, IFLA_MTU, mtu) >= 0);
+        assert(sd_rtnl_message_append_u32(m, IFLA_GROUP, 0) >= 0);
+        assert(sd_rtnl_message_append_u32(m, IFLA_TXQLEN, 0) >= 0);
+        assert(sd_rtnl_message_append_u32(m, IFLA_NUM_TX_QUEUES, 0) >= 0);
+        assert(sd_rtnl_message_append_u32(m, IFLA_NUM_RX_QUEUES, 0) >= 0);
+
+        assert(sd_rtnl_call(rtnl, m, -1, &r) == 1);
+
+        /* u8 read back */
+        assert(sd_rtnl_message_read(m, &type, &data) == 1);
+        assert(type == IFLA_CARRIER);
+
+        assert(sd_rtnl_message_read(m, &type, &data) == 1);
+        assert(type == IFLA_OPERSTATE);
+
+        assert(sd_rtnl_message_read(m, &type, &data) == 1);
+        assert(type == IFLA_LINKMODE);
+
+        /* u32 read back */
+        assert(sd_rtnl_message_read(m, &type, (void **) &mtu_reply) == 1);
+        assert(type == IFLA_MTU);
+        assert(*mtu_reply == mtu);
+
+        assert(sd_rtnl_message_read(m, &type, &data) == 1);
+        assert(type == IFLA_GROUP);
+
+        assert(sd_rtnl_message_read(m, &type, &data) == 1);
+        assert(type == IFLA_TXQLEN);
+
+        assert(sd_rtnl_message_read(m, &type, &data) == 1);
+        assert(type == IFLA_NUM_TX_QUEUES);
+
+        assert(sd_rtnl_message_read(m, &type, &data) == 1);
+        assert(type == IFLA_NUM_RX_QUEUES);
+
+        while (sd_rtnl_message_read(r, &type, &data) > 0) {
+                switch (type) {
+//                        case IFLA_MTU:
+//                                assert(*(unsigned int *) data == 65536);
+//                                break;
+//                        case IFLA_QDISC:
+//                                assert(streq((char *) data, "noqueue"));
+//                                break;
+                        case IFLA_IFNAME:
+                                assert(streq((char *) data, "lo"));
+                                break;
+                }
+        }
+
+        assert(sd_rtnl_flush(rtnl) >= 0);
+        assert((m = sd_rtnl_message_unref(m)) == NULL);
 
-        assert(sd_rtnl_call(rtnl, message, 0, NULL) == 1);
 }
 
 static void test_route(void) {
-        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req;
+        _cleanup_rtnl_message_unref_ sd_rtnl_message *req;
         struct in_addr addr;
         uint32_t index = 2;
         uint16_t type;
@@ -85,6 +157,8 @@ static void test_route(void) {
                 return;
         }
 
+        assert(rtnl_message_seal(NULL, req) >= 0);
+
         assert(sd_rtnl_message_read(req, &type, &data) > 0);
         assert(type == RTA_GATEWAY);
         assert(((struct in_addr *)data)->s_addr == addr.s_addr);
@@ -134,8 +208,8 @@ static int link_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 
 static void test_event_loop(int ifindex) {
         _cleanup_event_unref_ sd_event *event = NULL;
-        _cleanup_sd_rtnl_unref_ sd_rtnl *rtnl = NULL;
-        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *m = NULL;
+        _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL;
+        _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL;
         char *ifname;
 
         ifname = strdup("lo2");
@@ -166,8 +240,8 @@ static int pipe_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 }
 
 static void test_async(int ifindex) {
-        _cleanup_sd_rtnl_unref_ sd_rtnl *rtnl = NULL;
-        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *m = NULL, *r = NULL;
+        _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL;
+        _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL, *r = NULL;
         uint32_t serial;
         char *ifname;
 
@@ -185,8 +259,8 @@ static void test_async(int ifindex) {
 }
 
 static void test_pipe(int ifindex) {
-        _cleanup_sd_rtnl_unref_ sd_rtnl *rtnl = NULL;
-        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *m1 = NULL, *m2 = NULL;
+        _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL;
+        _cleanup_rtnl_message_unref_ sd_rtnl_message *m1 = NULL, *m2 = NULL;
         int counter = 0;
 
         assert(sd_rtnl_open(0, &rtnl) >= 0);
@@ -207,7 +281,7 @@ static void test_pipe(int ifindex) {
 }
 
 static void test_container(void) {
-        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *m = NULL;
+        _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL;
         uint16_t type;
         void *data;
 
@@ -224,19 +298,32 @@ static void test_container(void) {
         assert(sd_rtnl_message_close_container(m) >= 0);
         assert(sd_rtnl_message_close_container(m) == -EINVAL);
 
-        assert(sd_rtnl_message_read(m, &type, &data) == -EINVAL);
+        assert(rtnl_message_seal(NULL, m) >= 0);
 
-/* TODO: add support for entering containers
-        assert(sd_rtnl_message_read(m, &type, &data) > 0);
+        assert(sd_rtnl_message_read(m, &type, &data) >= 0);
+        assert(type == IFLA_LINKINFO);
+        assert(data == NULL);
+        assert(sd_rtnl_message_read(m, &type, &data) >= 0);
         assert(type == IFLA_INFO_KIND);
-        assert(streq("kind", (char *) data));
-
+        assert(streq("kind", (char *)data));
+        assert(sd_rtnl_message_read(m, &type, &data) >= 0);
+        assert(type == IFLA_INFO_DATA);
+        assert(data == NULL);
+        assert(sd_rtnl_message_read(m, &type, &data) >= 0);
+        assert(type == IFLA_VLAN_ID);
+        assert(*(uint16_t *)data == 100);
         assert(sd_rtnl_message_read(m, &type, &data) == 0);
-*/
+        assert(sd_rtnl_message_exit_container(m) >= 0);
+        assert(sd_rtnl_message_read(m, &type, &data) >= 0);
+        assert(type == IFLA_INFO_KIND);
+        assert(streq("kind", (char *)data));
+        assert(sd_rtnl_message_read(m, &type, &data) == 0);
+        assert(sd_rtnl_message_exit_container(m) >= 0);
+        assert(sd_rtnl_message_exit_container(m) == -EINVAL);
 }
 
 static void test_match(void) {
-        _cleanup_sd_rtnl_unref_ sd_rtnl *rtnl = NULL;
+        _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL;
 
         assert(sd_rtnl_open(0, &rtnl) >= 0);
 
@@ -255,8 +342,6 @@ int main(void) {
         void *data;
         int if_loopback;
         uint16_t type;
-        unsigned int mtu = 0;
-        unsigned int *mtu_reply;
 
         test_match();
 
@@ -286,7 +371,7 @@ int main(void) {
         assert(sd_rtnl_message_get_type(m, &type) >= 0);
         assert(type == RTM_GETLINK);
 
-        assert(sd_rtnl_message_read(m, &type, &data) == 0);
+        assert(sd_rtnl_message_read(m, &type, &data) == -EPERM);
 
         assert(sd_rtnl_call(rtnl, m, 0, &r) == 1);
         assert(sd_rtnl_message_get_type(r, &type) >= 0);
@@ -299,34 +384,9 @@ int main(void) {
         assert((m = sd_rtnl_message_unref(m)) == NULL);
         assert((r = sd_rtnl_message_unref(r)) == NULL);
 
-        assert(sd_rtnl_message_link_new(RTM_GETLINK, if_loopback, &m) >= 0);
-        assert(m);
-
-        assert(sd_rtnl_message_append_u32(m, IFLA_MTU, mtu) >= 0);
-        assert(sd_rtnl_message_read(m, &type, (void **) &mtu_reply) == 1);
-
-        assert(type == IFLA_MTU);
-        assert(*mtu_reply == 0);
-
-        assert(sd_rtnl_message_read(m, &type, &data) == 0);
-
-        assert(sd_rtnl_call(rtnl, m, -1, &r) == 1);
-        while (sd_rtnl_message_read(r, &type, &data) > 0) {
-                switch (type) {
-//                        case IFLA_MTU:
-//                                assert(*(unsigned int *) data == 65536);
-//                                break;
-//                        case IFLA_QDISC:
-//                                assert(streq((char *) data, "noqueue"));
-//                                break;
-                        case IFLA_IFNAME:
-                                assert(streq((char *) data, "lo"));
-                                break;
-                }
-        }
+        test_link_get(rtnl, if_loopback);
 
         assert(sd_rtnl_flush(rtnl) >= 0);
-
         assert((m = sd_rtnl_message_unref(m)) == NULL);
         assert((r = sd_rtnl_message_unref(r)) == NULL);
         assert((rtnl = sd_rtnl_unref(rtnl)) == NULL);