sd-rtnl-message: store reference to the bus in the message

[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 15e42b68f74b75b786d7a20791d6b794b99add6a..7bbc4486f2440c50f929b1ed89bfab1022dc917a 100644 (file)
--- a/src/libsystemd/sd-rtnl/test-rtnl.c
+++ b/src/libsystemd/sd-rtnl/test-rtnl.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/rtnetlink.h>
 #include <netinet/ether.h>
 
 #include "util.h"
@@ -30,14 +29,14 @@
 #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;
         void *data;
 
         /* we'd really like to test NEWLINK, but let's not mess with the running kernel */
-        assert(sd_rtnl_message_link_new(RTM_GETLINK, ifindex, &message) >= 0);
+        assert(sd_rtnl_message_new_link(rtnl, RTM_GETLINK, ifindex, &message) >= 0);
         assert(sd_rtnl_message_append_string(message, IFLA_IFNAME, name) >= 0);
         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);
@@ -57,15 +56,87 @@ static void test_link_configure(sd_rtnl *rtnl, int ifindex) {
         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_new_link(rtnl, 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);
+
+}
+
 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;
         void *data;
         int r;
 
-        r = sd_rtnl_message_route_new(RTM_NEWROUTE, AF_INET, &req);
+        r = sd_rtnl_message_new_route(NULL, RTM_NEWROUTE, AF_INET, &req);
         if (r < 0) {
                 log_error("Could not create RTM_NEWROUTE message: %s", strerror(-r));
                 return;
@@ -136,15 +207,15 @@ 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");
         assert(ifname);
 
         assert(sd_rtnl_open(0, &rtnl) >= 0);
-        assert(sd_rtnl_message_link_new(RTM_GETLINK, ifindex, &m) >= 0);
+        assert(sd_rtnl_message_new_link(rtnl, RTM_GETLINK, ifindex, &m) >= 0);
 
         assert(sd_rtnl_call_async(rtnl, m, &link_handler, ifname, 0, NULL) >= 0);
 
@@ -168,8 +239,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;
 
@@ -178,7 +249,7 @@ static void test_async(int ifindex) {
 
         assert(sd_rtnl_open(0, &rtnl) >= 0);
 
-        assert(sd_rtnl_message_link_new(RTM_GETLINK, ifindex, &m) >= 0);
+        assert(sd_rtnl_message_new_link(rtnl, RTM_GETLINK, ifindex, &m) >= 0);
 
         assert(sd_rtnl_call_async(rtnl, m, &link_handler, ifname, 0, &serial) >= 0);
 
@@ -187,14 +258,14 @@ 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);
 
-        assert(sd_rtnl_message_link_new(RTM_GETLINK, ifindex, &m1) >= 0);
-        assert(sd_rtnl_message_link_new(RTM_GETLINK, ifindex, &m2) >= 0);
+        assert(sd_rtnl_message_new_link(rtnl, RTM_GETLINK, ifindex, &m1) >= 0);
+        assert(sd_rtnl_message_new_link(rtnl, RTM_GETLINK, ifindex, &m2) >= 0);
 
         counter ++;
         assert(sd_rtnl_call_async(rtnl, m1, &pipe_handler, &counter, 0, NULL) >= 0);
@@ -209,11 +280,11 @@ 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;
 
-        assert(sd_rtnl_message_link_new(RTM_NEWLINK, 0, &m) >= 0);
+        assert(sd_rtnl_message_new_link(NULL, RTM_NEWLINK, 0, &m) >= 0);
 
         assert(sd_rtnl_message_open_container(m, IFLA_LINKINFO) >= 0);
         assert(sd_rtnl_message_open_container(m, IFLA_LINKINFO) == -ENOTSUP);
@@ -251,7 +322,7 @@ static void test_container(void) {
 }
 
 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);
 
@@ -270,8 +341,6 @@ int main(void) {
         void *data;
         int if_loopback;
         uint16_t type;
-        unsigned int mtu = 0;
-        unsigned int *mtu_reply;
 
         test_match();
 
@@ -295,7 +364,7 @@ int main(void) {
 
         test_link_configure(rtnl, if_loopback);
 
-        assert(sd_rtnl_message_link_new(RTM_GETLINK, if_loopback, &m) >= 0);
+        assert(sd_rtnl_message_new_link(rtnl, RTM_GETLINK, if_loopback, &m) >= 0);
         assert(m);
 
         assert(sd_rtnl_message_get_type(m, &type) >= 0);
@@ -314,35 +383,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) == -EPERM);
-        assert(sd_rtnl_call(rtnl, m, -1, &r) == 1);
-        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);
-
-        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);