X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-rtnl%2Ftest-rtnl.c;h=9de380625175c9970a05aecfb14382cb87eb0c53;hb=31a4e15384b3819621dd5648e18148c2edea72d3;hp=24015147cda99b21f47ba87bba05bd5b4bd65dc2;hpb=11fc2e833e454e65ff1123a091ab1a877a063e15;p=elogind.git diff --git a/src/libsystemd/sd-rtnl/test-rtnl.c b/src/libsystemd/sd-rtnl/test-rtnl.c index 24015147c..9de380625 100644 --- a/src/libsystemd/sd-rtnl/test-rtnl.c +++ b/src/libsystemd/sd-rtnl/test-rtnl.c @@ -30,14 +30,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(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); @@ -66,7 +66,7 @@ static void test_link_get(sd_rtnl *rtnl, int ifindex) { void *data; uint16_t type; - assert(sd_rtnl_message_link_new(RTM_GETLINK, ifindex, &m) >= 0); + assert(sd_rtnl_message_new_link(RTM_GETLINK, ifindex, &m) >= 0); assert(m); /* u8 test cases */ @@ -130,14 +130,14 @@ static void test_link_get(sd_rtnl *rtnl, int ifindex) { } 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(RTM_NEWROUTE, AF_INET, &req); if (r < 0) { log_error("Could not create RTM_NEWROUTE message: %s", strerror(-r)); return; @@ -208,15 +208,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(RTM_GETLINK, ifindex, &m) >= 0); assert(sd_rtnl_call_async(rtnl, m, &link_handler, ifname, 0, NULL) >= 0); @@ -240,8 +240,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; @@ -250,7 +250,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(RTM_GETLINK, ifindex, &m) >= 0); assert(sd_rtnl_call_async(rtnl, m, &link_handler, ifname, 0, &serial) >= 0); @@ -259,14 +259,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(RTM_GETLINK, ifindex, &m1) >= 0); + assert(sd_rtnl_message_new_link(RTM_GETLINK, ifindex, &m2) >= 0); counter ++; assert(sd_rtnl_call_async(rtnl, m1, &pipe_handler, &counter, 0, NULL) >= 0); @@ -281,17 +281,17 @@ 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(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); + assert(sd_rtnl_message_open_container(m, IFLA_LINKINFO, 0) >= 0); + assert(sd_rtnl_message_open_container(m, IFLA_LINKINFO, 0) == -ENOTSUP); assert(sd_rtnl_message_append_string(m, IFLA_INFO_KIND, "kind") >= 0); - assert(sd_rtnl_message_open_container(m, IFLA_INFO_DATA) >= 0); - assert(sd_rtnl_message_open_container(m, IFLA_INFO_DATA) == -ENOTSUP); + assert(sd_rtnl_message_open_container(m, IFLA_INFO_DATA, 0) >= 0); + assert(sd_rtnl_message_open_container(m, IFLA_INFO_DATA, 0) == -ENOTSUP); assert(sd_rtnl_message_append_u16(m, IFLA_VLAN_ID, 100) >= 0); assert(sd_rtnl_message_close_container(m) >= 0); assert(sd_rtnl_message_append_string(m, IFLA_INFO_KIND, "kind") >= 0); @@ -323,7 +323,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); @@ -365,7 +365,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(RTM_GETLINK, if_loopback, &m) >= 0); assert(m); assert(sd_rtnl_message_get_type(m, &type) >= 0);