diff options
| -rw-r--r-- | src/network/networkd-netdev-tunnel.c | 2 | ||||
| -rw-r--r-- | src/network/sd-network.c | 14 | ||||
| -rw-r--r-- | src/resolve/resolved-link.c | 4 | ||||
| -rw-r--r-- | src/systemd/sd-network.h | 22 |
4 files changed, 21 insertions, 21 deletions
diff --git a/src/network/networkd-netdev-tunnel.c b/src/network/networkd-netdev-tunnel.c index 56eeb99e4b..5d5913186d 100644 --- a/src/network/networkd-netdev-tunnel.c +++ b/src/network/networkd-netdev-tunnel.c @@ -114,7 +114,7 @@ static int netdev_sit_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_me r = sd_rtnl_message_append_u8(m, IFLA_IPTUN_TTL, t->ttl); if (r < 0) { log_error_netdev(netdev, - "Could not append IFLA_IPTUN_TTL attribute: %s", + "Could not append IFLA_IPTUN_TTL attribute: %s", strerror(-r)); return r; } diff --git a/src/network/sd-network.c b/src/network/sd-network.c index ed02eccaf1..cc4b160e74 100644 --- a/src/network/sd-network.c +++ b/src/network/sd-network.c @@ -107,7 +107,7 @@ _public_ int sd_network_get_link_operational_state(int ifindex, char **state) { return 0; } -_public_ int sd_network_get_llmnr(int ifindex, char **llmnr) { +_public_ int sd_network_get_link_llmnr(int ifindex, char **llmnr) { _cleanup_free_ char *s = NULL, *p = NULL; int r; @@ -131,7 +131,7 @@ _public_ int sd_network_get_llmnr(int ifindex, char **llmnr) { return 0; } -_public_ int sd_network_get_dhcp_lease(int ifindex, sd_dhcp_lease **ret) { +_public_ int sd_network_get_link_dhcp_lease(int ifindex, sd_dhcp_lease **ret) { _cleanup_free_ char *p = NULL, *s = NULL; sd_dhcp_lease *lease = NULL; int r; @@ -158,7 +158,7 @@ _public_ int sd_network_get_dhcp_lease(int ifindex, sd_dhcp_lease **ret) { return 0; } -static int network_get_strv(const char *key, int ifindex, char ***ret) { +static int network_get_link_strv(const char *key, int ifindex, char ***ret) { _cleanup_free_ char *p = NULL, *s = NULL; _cleanup_strv_free_ char **a = NULL; int r; @@ -191,12 +191,12 @@ static int network_get_strv(const char *key, int ifindex, char ***ret) { return r; } -_public_ int sd_network_get_dns(int ifindex, char ***ret) { - return network_get_strv("DNS", ifindex, ret); +_public_ int sd_network_get_link_dns(int ifindex, char ***ret) { + return network_get_link_strv("DNS", ifindex, ret); } -_public_ int sd_network_get_ntp(int ifindex, char ***ret) { - return network_get_strv("NTP", ifindex, ret); +_public_ int sd_network_get_link_ntp(int ifindex, char ***ret) { + return network_get_link_strv("NTP", ifindex, ret); } static inline int MONITOR_TO_FD(sd_network_monitor *m) { diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c index 53b1e3c6a0..ed176ab417 100644 --- a/src/resolve/resolved-link.c +++ b/src/resolve/resolved-link.c @@ -151,7 +151,7 @@ static int link_update_dns_servers(Link *l) { assert(l); - r = sd_network_get_dns(l->ifindex, &nameservers); + r = sd_network_get_link_dns(l->ifindex, &nameservers); if (r < 0) goto clear; @@ -195,7 +195,7 @@ static int link_update_llmnr_support(Link *l) { assert(l); - r = sd_network_get_llmnr(l->ifindex, &b); + r = sd_network_get_link_llmnr(l->ifindex, &b); if (r < 0) goto clear; diff --git a/src/systemd/sd-network.h b/src/systemd/sd-network.h index 4d04616d88..e69679ae5a 100644 --- a/src/systemd/sd-network.h +++ b/src/systemd/sd-network.h @@ -51,6 +51,13 @@ _SD_BEGIN_DECLARATIONS; +/* Get overall operational state + * Possible states: unknown, dormant, carrier, degraded, routable + * Possible return codes: + * -ENODATA: networkd is not aware of any links + */ +int sd_network_get_operational_state(char **state); + /* Get state from ifindex. * Possible states: failed, configuring, configured, unmanaged * Possible return codes: @@ -66,29 +73,22 @@ int sd_network_get_link_state(int ifindex, char **state); */ int sd_network_get_link_operational_state(int ifindex, char **state); -/* Get overall opeartional state - * Possible states: unknown, dormant, carrier, degraded, routable - * Possible return codes: - * -ENODATA: networkd is not aware of any links - */ -int sd_network_get_operational_state(char **state); - /* Get DHCPv4 lease from ifindex. */ -int sd_network_get_dhcp_lease(int ifindex, sd_dhcp_lease **ret); +int sd_network_get_link_dhcp_lease(int ifindex, sd_dhcp_lease **ret); /* Indicates whether or not LLMNR should be enabled for the link * Possible levels of support: yes, no, resolve * Possible return codes: * -ENODATA: networkd is not aware of the link*/ -int sd_network_get_llmnr(int ifindex, char **llmnr); +int sd_network_get_link_llmnr(int ifindex, char **llmnr); /* Get DNS entries for a given link. These are string representations of * IP addresses */ -int sd_network_get_dns(int ifindex, char ***addr); +int sd_network_get_link_dns(int ifindex, char ***addr); /* Get NTP entries for a given link. These are domain names or string * reperesentations of IP addresses */ -int sd_network_get_ntp(int ifindex, char ***addr); +int sd_network_get_link_ntp(int ifindex, char ***addr); /* Monitor object */ typedef struct sd_network_monitor sd_network_monitor; |