SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-network: /_get_link_/_link_get_/

Browse Source 
The link is the 'object', so make this in line with our usual naming convention.

Suggested by Kay and Lennart.
This commit is contained in:
Tom Gundersen
2014-08-13 22:37:45 +02:00
parent 5323ead145
commit d6731e4c79
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkctl.c
+6 -6
View File
@@ -198,8 +198,8 @@ static int list_links(char **args, unsigned n) {
char devid[2 + DECIMAL_STR_MAX(int)];
_cleanup_free_ char *t = NULL;
sd_network_get_link_state(links[i].ifindex, &state);
sd_network_get_link_operational_state(links[i].ifindex, &operational_state);
sd_network_link_get_state(links[i].ifindex, &state);
sd_network_link_get_operational_state(links[i].ifindex, &operational_state);
sprintf(devid, "n%i", links[i].ifindex);
d = udev_device_new_from_device_id(udev, devid);
@@ -340,11 +340,11 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
sd_rtnl_message_read_u32(reply, IFLA_MTU, &mtu);
sd_network_get_link_state(ifindex, &state);
sd_network_get_link_operational_state(ifindex, &operational_state);
sd_network_link_get_state(ifindex, &state);
sd_network_link_get_operational_state(ifindex, &operational_state);
sd_network_get_link_dns(ifindex, &dns);
sd_network_get_link_ntp(ifindex, &ntp);
sd_network_link_get_dns(ifindex, &dns);
sd_network_link_get_ntp(ifindex, &ntp);
sprintf(devid, "n%i", ifindex);
d = udev_device_new_from_device_id(udev, devid);
src/network/networkd-wait-online-link.c
+2 -2
View File
@@ -126,12 +126,12 @@ int link_update_monitor(Link *l) {
free(l->operational_state);
l->operational_state = NULL;
sd_network_get_link_operational_state(l->ifindex, &l->operational_state);
sd_network_link_get_operational_state(l->ifindex, &l->operational_state);
free(l->state);
l->state = NULL;
sd_network_get_link_state(l->ifindex, &l->state);
sd_network_link_get_state(l->ifindex, &l->state);
return 0;
}