dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-08 09:01:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

rtnl: rename rtnl_bus_send_with_reply_and_block() to rtnl_bus_call()

Browse Source 
Follow the equivalent rename in sd-bus to stay as similar as possible.
This commit is contained in:
Tom Gundersen
2013-11-11 18:55:34 +01:00
parent 38fdcbedd1
commit fe4824e065
7 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsystemd-rtnl/rtnl-util.c
View File

@@ -42,7 +42,7 @@ int rtnl_set_link_name(sd_rtnl *rtnl, int ifindex, const char *name) {
if (r < 0)
return r;
r = sd_rtnl_send_with_reply_and_block(rtnl, message, 0, NULL);
r = sd_rtnl_call(rtnl, message, 0, NULL);
if (r < 0)
return r;
@@ -81,7 +81,7 @@ int rtnl_set_link_properties(sd_rtnl *rtnl, int ifindex, const struct ether_addr
}
if (need_update) {
r = sd_rtnl_send_with_reply_and_block(rtnl, message, 0, NULL);
r = sd_rtnl_call(rtnl, message, 0, NULL);
if (r < 0)
return r;
}

2
src/libsystemd-rtnl/sd-rtnl.c
View File

@@ -107,7 +107,7 @@ sd_rtnl *sd_rtnl_unref(sd_rtnl *rtnl) {
return NULL;
}
int sd_rtnl_send_with_reply_and_block(sd_rtnl *nl,
int sd_rtnl_call(sd_rtnl *nl,
sd_rtnl_message *message,
uint64_t usec,
sd_rtnl_message **ret) {

8
src/libsystemd-rtnl/test-rtnl.c
View File

@@ -53,7 +53,7 @@ static void test_link_configure(sd_rtnl *rtnl, int ifindex) {
assert(type == IFLA_MTU);
assert(mtu == *(unsigned int *) data);
assert(sd_rtnl_send_with_reply_and_block(rtnl, message, 0, NULL) == 0);
assert(sd_rtnl_call(rtnl, message, 0, NULL) == 0);
}
static void test_route(void) {
@@ -133,14 +133,14 @@ int main(void) {
assert(sd_rtnl_message_read(m, &type, &data) == 0);
assert(sd_rtnl_send_with_reply_and_block(rtnl, m, 0, &r) >= 0);
assert(sd_rtnl_call(rtnl, m, 0, &r) >= 0);
assert(sd_rtnl_message_get_type(r, &type) >= 0);
assert(type == RTM_NEWLINK);
assert(sd_rtnl_message_read(m, &type, &data) == 0);
assert((r = sd_rtnl_message_unref(r)) == NULL);
assert(sd_rtnl_send_with_reply_and_block(rtnl, m, -1, &r) == -EPERM);
assert(sd_rtnl_call(rtnl, m, -1, &r) == -EPERM);
assert((m = sd_rtnl_message_unref(m)) == NULL);
assert((r = sd_rtnl_message_unref(r)) == NULL);
@@ -155,7 +155,7 @@ int main(void) {
assert(sd_rtnl_message_read(m, &type, &data) == 0);
assert(sd_rtnl_send_with_reply_and_block(rtnl, m, -1, &r) >= 0);
assert(sd_rtnl_call(rtnl, m, -1, &r) >= 0);
while (sd_rtnl_message_read(r, &type, &data) > 0) {
switch (type) {
// case IFLA_MTU:

2
src/network/networkd-address.c
View File

@@ -98,7 +98,7 @@ int address_configure(Manager *manager, Address *address, Link *link) {
}
}
r = sd_rtnl_send_with_reply_and_block(manager->rtnl, req, 0, NULL);
r = sd_rtnl_call(manager->rtnl, req, 0, NULL);
if (r < 0) {
log_error("Could not configure address: %s", strerror(-r));
return r != -EEXIST ? r : 0;

2
src/network/networkd-link.c
View File

@@ -107,7 +107,7 @@ int link_up(Manager *manager, Link *link) {
return r;
}
r = sd_rtnl_send_with_reply_and_block(manager->rtnl, req, 0, NULL);
r = sd_rtnl_call(manager->rtnl, req, 0, NULL);
if (r < 0) {
log_error("Could not UP link: %s", strerror(-r));
return r;

2
src/network/networkd-route.c
View File

@@ -83,7 +83,7 @@ int route_configure(Manager *manager, Route *route, Link *link) {
return r;
}
r = sd_rtnl_send_with_reply_and_block(manager->rtnl, req, 0, NULL);
r = sd_rtnl_call(manager->rtnl, req, 0, NULL);
if (r < 0) {
log_error("Could not configure route: %s", strerror(-r));
return r;

3
src/systemd/sd-rtnl.h
View File

@@ -37,7 +37,8 @@ int sd_rtnl_open(uint32_t groups, sd_rtnl **nl);
sd_rtnl *sd_rtnl_ref(sd_rtnl *nl);
sd_rtnl *sd_rtnl_unref(sd_rtnl *nl);
int sd_rtnl_send_with_reply_and_block(sd_rtnl *nl, sd_rtnl_message *message, uint64_t timeout, sd_rtnl_message **reply);
int sd_rtnl_call(sd_rtnl *nl, sd_rtnl_message *message, uint64_t timeout,
sd_rtnl_message **reply);
/* messages */
int sd_rtnl_message_link_new(uint16_t msg_type, int index, unsigned int type,