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=4b62c02361ee78b601286b4e6657fb17c87f6975;hb=53461b74df0576ec091275d1a5dbee00611df1ee;hpb=33125ac50bafd93dd98934f5f6ff23a59da8d793 diff --git a/src/libsystemd-rtnl/test-rtnl.c b/src/libsystemd-rtnl/test-rtnl.c index 4b62c0236..58654e990 100644 --- a/src/libsystemd-rtnl/test-rtnl.c +++ b/src/libsystemd-rtnl/test-rtnl.c @@ -37,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); @@ -59,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; @@ -87,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); @@ -142,7 +142,7 @@ static void test_event_loop(int ifindex) { 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_message_link_new(RTM_GETLINK, ifindex, &m) >= 0); assert(sd_rtnl_call_async(rtnl, m, &link_handler, ifname, 0, NULL) >= 0); @@ -176,7 +176,7 @@ static void test_async(int ifindex) { assert(sd_rtnl_open(0, &rtnl) >= 0); - assert(sd_rtnl_message_link_new(RTM_GETLINK, ifindex, 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); @@ -191,8 +191,8 @@ static void test_pipe(int ifindex) { assert(sd_rtnl_open(0, &rtnl) >= 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); + 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); @@ -211,11 +211,11 @@ static void test_container(void) { uint16_t type; void *data; - assert(sd_rtnl_message_link_new(RTM_NEWLINK, 0, 0, 0, &m) >= 0); + 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(m, IFLA_INFO_KIND, "kind") >= 0); + 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); @@ -230,6 +230,19 @@ static void test_container(void) { */ } +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; @@ -240,6 +253,8 @@ int main(void) { unsigned int mtu = 0; unsigned int *mtu_reply; + test_match(); + test_multiple(); test_route(); @@ -260,7 +275,7 @@ int main(void) { 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); @@ -279,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);