shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-26 14:04:03 +03:00
Code

sd-rtnl/networkd: use new rtnl_message_read() API and drop helper

Browse Source 
With the new sd_rtnl_message_read_string(), there is no longer a need for
rtnl_message_get_ifname().
This commit is contained in:
Tom Gundersen 2014-03-06 19:44:37 +01:00
parent 44caa5e7df
commit d22f1006a1
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libsystemd/sd-rtnl/rtnl-util.c
View File

@ -153,19 +153,3 @@ bool rtnl_message_type_is_addr(uint16_t type) {
return false;
}
}
int rtnl_message_link_get_ifname(sd_rtnl_message *message, const char **ret) {
unsigned short type;
void *name;
assert(rtnl_message_type_is_link(message->hdr->nlmsg_type));
while (sd_rtnl_message_read(message, &type, &name)) {
if (type == IFLA_IFNAME) {
*ret = name;
return 0;
}
}
return -ENOENT;
}

2
src/libsystemd/sd-rtnl/rtnl-util.h
View File

@ -37,8 +37,6 @@ bool rtnl_message_type_is_route(uint16_t type);
int rtnl_set_link_name(sd_rtnl *rtnl, int ifindex, const char *name);
int rtnl_set_link_properties(sd_rtnl *rtnl, int ifindex, const char *alias, const struct ether_addr *mac, unsigned mtu);
int rtnl_message_link_get_ifname(sd_rtnl_message *m, const char **ret);
DEFINE_TRIVIAL_CLEANUP_FUNC(sd_rtnl*, sd_rtnl_unref);
DEFINE_TRIVIAL_CLEANUP_FUNC(sd_rtnl_message*, sd_rtnl_message_unref);

4
src/network/networkd-manager.c
View File

@ -303,7 +303,7 @@ int manager_udev_listen(Manager *m) {
static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) {
Manager *m = userdata;
Link *link;
const char *name;
char *name;
int r, ifindex;
assert(rtnl);
@ -316,7 +316,7 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
return 0;
}
r = rtnl_message_link_get_ifname(message, &name);
r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &name);
if (r < 0)
log_debug("received RTM_NEWLINK message without valid IFLA_IFNAME");
else {