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=58654e990a8f2dac38c624d0ef4dcd6d5bc17408;hp=ea48f48455e70c9baefa04d3f755df95d528ca42;hb=eca7a27add5aa3ec85c272fc4cef287fdca034ce;hpb=e16bcf986e3e2da2e01afc96f264edfc7bb00d1a diff --git a/src/libsystemd-rtnl/test-rtnl.c b/src/libsystemd-rtnl/test-rtnl.c index ea48f4845..58654e990 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; @@ -36,20 +37,20 @@ static void test_link_configure(sd_rtnl *rtnl, int ifindex) { 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, 0, 0, &message) >= 0); - assert(sd_rtnl_message_append(message, IFLA_IFNAME, name) >= 0); - assert(sd_rtnl_message_append(message, IFLA_ADDRESS, ether_aton(mac)) >= 0); - assert(sd_rtnl_message_append(message, IFLA_MTU, &mtu) >= 0); + assert(sd_rtnl_message_link_new(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); - assert(sd_rtnl_message_read(message, &type, &data) >= 0); + assert(sd_rtnl_message_read(message, &type, &data) > 0); assert(type == IFLA_IFNAME); assert(streq(name, (char *) data)); - assert(sd_rtnl_message_read(message, &type, &data) >= 0); + assert(sd_rtnl_message_read(message, &type, &data) > 0); assert(type == IFLA_ADDRESS); assert(streq(mac, ether_ntoa(data))); - assert(sd_rtnl_message_read(message, &type, &data) >= 0); + assert(sd_rtnl_message_read(message, &type, &data) > 0); assert(type == IFLA_MTU); assert(mtu == *(unsigned int *) data); @@ -58,27 +59,27 @@ static void test_link_configure(sd_rtnl *rtnl, int ifindex) { static void test_route(void) { _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req; - uint32_t addr = htonl(INADDR_LOOPBACK); + 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, 0, 0, 0, - RT_TABLE_MAIN, RT_SCOPE_UNIVERSE, RTPROT_BOOT, - RTN_UNICAST, 0, &req); + r = sd_rtnl_message_route_new(RTM_NEWROUTE, AF_INET, &req); if (r < 0) { log_error("Could not create RTM_NEWROUTE message: %s", strerror(-r)); return; } - r = sd_rtnl_message_append(req, RTA_GATEWAY, &addr); + addr.s_addr = htonl(INADDR_LOOPBACK); + + r = sd_rtnl_message_append_in_addr(req, RTA_GATEWAY, &addr); if (r < 0) { log_error("Could not append RTA_GATEWAY attribute: %s", strerror(-r)); return; } - r = sd_rtnl_message_append(req, RTA_OIF, &index); + r = sd_rtnl_message_append_u32(req, RTA_OIF, index); if (r < 0) { log_error("Could not append RTA_OIF attribute: %s", strerror(-r)); return; @@ -86,7 +87,7 @@ static void test_route(void) { assert(sd_rtnl_message_read(req, &type, &data) > 0); assert(type == RTA_GATEWAY); - assert(*(uint32_t *) data == addr); + assert(((struct in_addr *)data)->s_addr == addr.s_addr); assert(sd_rtnl_message_read(req, &type, &data) > 0); assert(type == RTA_OIF); @@ -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, &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, &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, &m1) >= 0); + assert(sd_rtnl_message_link_new(RTM_GETLINK, ifindex, &m2) >= 0); counter ++; assert(sd_rtnl_call_async(rtnl, m1, &pipe_handler, &counter, 0, NULL) >= 0); @@ -189,6 +206,43 @@ 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, &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_string(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, RTM_NEWLINK, &link_handler, NULL) >= 0); + assert(sd_rtnl_add_match(rtnl, RTM_NEWLINK, &link_handler, NULL) >= 0); + + assert(sd_rtnl_remove_match(rtnl, RTM_NEWLINK, &link_handler, NULL) == 1); + assert(sd_rtnl_remove_match(rtnl, RTM_NEWLINK, &link_handler, NULL) == 1); + assert(sd_rtnl_remove_match(rtnl, RTM_NEWLINK, &link_handler, NULL) == 0); +} + int main(void) { sd_rtnl *rtnl; sd_rtnl_message *m; @@ -199,13 +253,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,9 +267,15 @@ 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); + assert(sd_rtnl_message_link_new(RTM_GETLINK, if_loopback, &m) >= 0); assert(m); assert(sd_rtnl_message_get_type(m, &type) >= 0); @@ -234,10 +294,10 @@ 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, 0, 0, &m) >= 0); + assert(sd_rtnl_message_link_new(RTM_GETLINK, if_loopback, &m) >= 0); assert(m); - assert(sd_rtnl_message_append(m, IFLA_MTU, &mtu) >= 0); + 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); @@ -260,6 +320,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);