X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-rtnl%2Ftest-rtnl.c;h=a512a7b2f72c7cd343adf33d27fd746fb2fce7e8;hp=ea48f48455e70c9baefa04d3f755df95d528ca42;hb=4987623d011c534a22a490b17a8e0ec81d1ac30c;hpb=e16bcf986e3e2da2e01afc96f264edfc7bb00d1a

diff --git a/src/libsystemd-rtnl/test-rtnl.c b/src/libsystemd-rtnl/test-rtnl.c
index ea48f4845..a512a7b2f 100644
--- a/src/libsystemd-rtnl/test-rtnl.c
+++ b/src/libsystemd-rtnl/test-rtnl.c
@@ -27,6 +27,7 @@
 #include "sd-rtnl.h"
 #include "socket-util.h"
 #include "rtnl-util.h"
+#include "event-util.h"
 
 static void test_link_configure(sd_rtnl *rtnl, int ifindex) {
         _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *message;
@@ -131,6 +132,29 @@ static int link_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         return 1;
 }
 
+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;
+        char *ifname;
+
+        ifname = strdup("lo2");
+        assert(ifname);
+
+        assert(sd_rtnl_open(0, &rtnl) >= 0);
+        assert(sd_rtnl_message_link_new(RTM_GETLINK, ifindex, 0, 0, &m) >= 0);
+
+        assert(sd_rtnl_call_async(rtnl, m, &link_handler, ifname, 0, NULL) >= 0);
+
+        assert(sd_event_default(&event) >= 0);
+
+        assert(sd_rtnl_attach_event(rtnl, event, 0) >= 0);
+
+        assert(sd_event_run(event, 0) >= 0);
+
+        assert(sd_rtnl_detach_event(rtnl) >= 0);
+}
+
 static int pipe_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         int *counter = userdata;
 
@@ -141,21 +165,18 @@ static int pipe_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         return sd_rtnl_message_get_errno(m);
 }
 
-static void test_async(void) {
+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;
-        int if_loopback;
         uint32_t serial;
         char *ifname;
 
         ifname = strdup("lo");
+        assert(ifname);
 
         assert(sd_rtnl_open(0, &rtnl) >= 0);
 
-        if_loopback = (int) if_nametoindex("lo");
-        assert(if_loopback > 0);
-
-        assert(sd_rtnl_message_link_new(RTM_GETLINK, if_loopback, 0, 0, &m) >= 0);
+        assert(sd_rtnl_message_link_new(RTM_GETLINK, ifindex, 0, 0, &m) >= 0);
 
         assert(sd_rtnl_call_async(rtnl, m, &link_handler, ifname, 0, &serial) >= 0);
 
@@ -163,19 +184,15 @@ static void test_async(void) {
         assert(sd_rtnl_process(rtnl, &r) >= 0);
 }
 
-static void test_pipe(void) {
+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;
         int counter = 0;
-        int if_loopback;
 
         assert(sd_rtnl_open(0, &rtnl) >= 0);
 
-        if_loopback = (int) if_nametoindex("lo");
-        assert(if_loopback > 0);
-
-        assert(sd_rtnl_message_link_new(RTM_GETLINK, if_loopback, 0, 0, &m1) >= 0);
-        assert(sd_rtnl_message_link_new(RTM_GETLINK, if_loopback, 0, 0, &m2) >= 0);
+        assert(sd_rtnl_message_link_new(RTM_GETLINK, ifindex, 0, 0, &m1) >= 0);
+        assert(sd_rtnl_message_link_new(RTM_GETLINK, ifindex, 0, 0, &m2) >= 0);
 
         counter ++;
         assert(sd_rtnl_call_async(rtnl, m1, &pipe_handler, &counter, 0, NULL) >= 0);
@@ -189,6 +206,45 @@ static void test_pipe(void) {
         }
 }
 
+static void test_container(void) {
+        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *m = NULL;
+        uint16_t type;
+        void *data;
+
+        assert(sd_rtnl_message_link_new(RTM_NEWLINK, 0, 0, 0, &m) >= 0);
+
+        assert(sd_rtnl_message_open_container(m, IFLA_LINKINFO) >= 0);
+        assert(sd_rtnl_message_open_container(m, IFLA_LINKINFO) == -EINVAL);
+        assert(sd_rtnl_message_append(m, IFLA_INFO_KIND, "kind") >= 0);
+        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);
+
+/* TODO: add support for entering containers
+        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);
+*/
+}
+
+static void test_match(void) {
+        _cleanup_sd_rtnl_unref_ sd_rtnl *rtnl = NULL;
+
+        assert(sd_rtnl_open(0, &rtnl) >= 0);
+
+        assert(sd_rtnl_add_match(rtnl, 0, &link_handler, NULL) == -EINVAL);
+
+        assert(sd_rtnl_add_match(rtnl, RTMGRP_LINK, &link_handler, NULL) >= 0);
+        assert(sd_rtnl_add_match(rtnl, RTMGRP_LINK, &link_handler, NULL) >= 0);
+
+        assert(sd_rtnl_remove_match(rtnl, RTMGRP_LINK, &link_handler, NULL) == 1);
+        assert(sd_rtnl_remove_match(rtnl, RTMGRP_LINK, &link_handler, NULL) == 1);
+        assert(sd_rtnl_remove_match(rtnl, RTMGRP_LINK, &link_handler, NULL) == 0);
+}
+
 int main(void) {
         sd_rtnl *rtnl;
         sd_rtnl_message *m;
@@ -199,13 +255,13 @@ int main(void) {
         unsigned int mtu = 0;
         unsigned int *mtu_reply;
 
+        test_match();
+
         test_multiple();
 
         test_route();
 
-        test_async();
-
-        test_pipe();
+        test_container();
 
         assert(sd_rtnl_open(0, &rtnl) >= 0);
         assert(rtnl);
@@ -213,6 +269,12 @@ int main(void) {
         if_loopback = (int) if_nametoindex("lo");
         assert(if_loopback > 0);
 
+        test_async(if_loopback);
+
+        test_pipe(if_loopback);
+
+        test_event_loop(if_loopback);
+
         test_link_configure(rtnl, if_loopback);
 
         assert(sd_rtnl_message_link_new(RTM_GETLINK, if_loopback, 0, 0, &m) >= 0);
@@ -260,6 +322,8 @@ int main(void) {
                 }
         }
 
+        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);