X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-rtnl%2Ftest-rtnl.c;h=ed60b3cb4549ce30ee711200f000e0736417d785;hb=b621bfd2311a13311a45ccd5e31a9ce3214895fe;hp=529231a70a82d371f4378d6ab0332a4c202d23ba;hpb=aba496a58acf9d9c61314de71353550e579f85ee;p=elogind.git diff --git a/src/libsystemd/sd-rtnl/test-rtnl.c b/src/libsystemd/sd-rtnl/test-rtnl.c index 529231a70..ed60b3cb4 100644 --- a/src/libsystemd/sd-rtnl/test-rtnl.c +++ b/src/libsystemd/sd-rtnl/test-rtnl.c @@ -20,6 +20,7 @@ ***/ #include +#include #include "util.h" #include "macro.h" @@ -33,8 +34,9 @@ static void test_link_configure(sd_rtnl *rtnl, int ifindex) { _cleanup_rtnl_message_unref_ sd_rtnl_message *message; const char *mac = "98:fe:94:3f:c6:18", *name = "test"; + char buffer[ETHER_ADDR_TO_STRING_MAX]; unsigned int mtu = 1450, mtu_out; - char *name_out; + const char *name_out; struct ether_addr mac_out; /* we'd really like to test NEWLINK, but let's not mess with the running kernel */ @@ -50,7 +52,7 @@ static void test_link_configure(sd_rtnl *rtnl, int ifindex) { assert_se(streq(name, name_out)); assert_se(sd_rtnl_message_read_ether_addr(message, IFLA_ADDRESS, &mac_out) >= 0); - assert_se(streq(mac, ether_ntoa(&mac_out))); + assert_se(streq(mac, ether_addr_to_string(&mac_out, buffer))); assert_se(sd_rtnl_message_read_u32(message, IFLA_MTU, &mtu_out) >= 0); assert_se(mtu == mtu_out); @@ -60,7 +62,7 @@ static void test_link_get(sd_rtnl *rtnl, int ifindex) { sd_rtnl_message *m; sd_rtnl_message *r; unsigned int mtu = 1500; - char *str_data; + const char *str_data; uint8_t u8_data; uint32_t u32_data; struct ether_addr eth_data; @@ -107,7 +109,7 @@ static void test_address_get(sd_rtnl *rtnl, int ifindex) { sd_rtnl_message *r; struct in_addr in_data; struct ifa_cacheinfo cache; - char *label; + const char *label; assert_se(sd_rtnl_message_new_addr(rtnl, &m, RTM_GETADDR, ifindex, AF_INET) >= 0); assert_se(m); @@ -131,9 +133,9 @@ static void test_route(void) { uint32_t index = 2, u32_data; int r; - r = sd_rtnl_message_new_route(NULL, &req, RTM_NEWROUTE, AF_INET); + r = sd_rtnl_message_new_route(NULL, &req, RTM_NEWROUTE, AF_INET, RTPROT_STATIC); if (r < 0) { - log_error("Could not create RTM_NEWROUTE message: %s", strerror(-r)); + log_error_errno(r, "Could not create RTM_NEWROUTE message: %m"); return; } @@ -141,13 +143,13 @@ static void test_route(void) { 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)); + log_error_errno(r, "Could not append RTA_GATEWAY attribute: %m"); return; } r = sd_rtnl_message_append_u32(req, RTA_OIF, index); if (r < 0) { - log_error("Could not append RTA_OIF attribute: %s", strerror(-r)); + log_error_errno(r, "Could not append RTA_OIF attribute: %m"); return; } @@ -173,7 +175,8 @@ static void test_multiple(void) { } static int link_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - char *ifname = userdata, *data; + char *ifname = userdata; + const char *data; assert_se(rtnl); assert_se(m); @@ -220,7 +223,7 @@ static int pipe_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { r = sd_rtnl_message_get_errno(m); - log_info("%d left in pipe. got reply: %s", *counter, strerror(-r)); + log_info_errno(r, "%d left in pipe. got reply: %m", *counter); assert_se(r >= 0); @@ -276,7 +279,7 @@ static void test_container(void) { _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; uint16_t u16_data; uint32_t u32_data; - char *string_data; + const char *string_data; assert_se(sd_rtnl_message_new_link(NULL, &m, RTM_NEWLINK, 0) >= 0); @@ -322,14 +325,51 @@ static void test_match(void) { assert_se((rtnl = sd_rtnl_unref(rtnl)) == NULL); } +static void test_get_addresses(sd_rtnl *rtnl) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL; + sd_rtnl_message *m; + + assert_se(sd_rtnl_message_new_addr(rtnl, &req, RTM_GETADDR, 0, AF_UNSPEC) >= 0); + + assert_se(sd_rtnl_call(rtnl, req, 0, &reply) >= 0); + + for (m = reply; m; m = sd_rtnl_message_next(m)) { + uint16_t type; + unsigned char scope, flags; + int family, ifindex; + + assert_se(sd_rtnl_message_get_type(m, &type) >= 0); + assert_se(type == RTM_NEWADDR); + + assert_se(sd_rtnl_message_addr_get_ifindex(m, &ifindex) >= 0); + assert_se(sd_rtnl_message_addr_get_family(m, &family) >= 0); + assert_se(sd_rtnl_message_addr_get_scope(m, &scope) >= 0); + assert_se(sd_rtnl_message_addr_get_flags(m, &flags) >= 0); + + assert_se(ifindex > 0); + assert_se(family == AF_INET || family == AF_INET6); + + log_info("got IPv%u address on ifindex %i", family == AF_INET ? 4: 6, ifindex); + } +} + +static void test_message(void) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; + + assert_se(rtnl_message_new_synthetic_error(-ETIMEDOUT, 1, &m) >= 0); + assert_se(sd_rtnl_message_get_errno(m) == -ETIMEDOUT); +} + int main(void) { sd_rtnl *rtnl; sd_rtnl_message *m; sd_rtnl_message *r; - char *string_data; + const char *string_data; int if_loopback; uint16_t type; + test_message(); + test_match(); test_multiple(); @@ -352,6 +392,8 @@ int main(void) { test_link_configure(rtnl, if_loopback); + test_get_addresses(rtnl); + assert_se(sd_rtnl_message_new_link(rtnl, &m, RTM_GETLINK, if_loopback) >= 0); assert_se(m);