sd-networkd: rename link_get_state to link_get_setup_state

Suggested by Kay and Lennart.

diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
index f8f48b0ddf0b1d20adcbd6aae334db3c35f90fc4..97d041ae7fe65ccbb24e7983049d8bec6cb363ad 100644 (file)
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -92,7 +92,7 @@ _public_ int sd_network_get_ntp(char ***ret) {
         return network_get_strv("NTP", ret);
 }
 
         return network_get_strv("NTP", ret);
 }
 

-_public_ int sd_network_link_get_state(int ifindex, char **state) {
+_public_ int sd_network_link_get_setup_state(int ifindex, char **state) {

         _cleanup_free_ char *s = NULL, *p = NULL;
         int r;
 
         _cleanup_free_ char *s = NULL, *p = NULL;
         int r;
 

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 6fb9e627757f654cdd52a90af9d9c87f28f4ddfc..f83c1f3f9fa64dd94353872e9a353fc5ca79afd4 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -198,7 +198,7 @@ static int list_links(char **args, unsigned n) {
                  char devid[2 + DECIMAL_STR_MAX(int)];
                 _cleanup_free_ char *t = NULL;
 
                  char devid[2 + DECIMAL_STR_MAX(int)];
                 _cleanup_free_ char *t = NULL;
 

-                sd_network_link_get_state(links[i].ifindex, &state);
+                sd_network_link_get_setup_state(links[i].ifindex, &state);

                 sd_network_link_get_operational_state(links[i].ifindex, &operational_state);
 
                 sprintf(devid, "n%i", links[i].ifindex);
                 sd_network_link_get_operational_state(links[i].ifindex, &operational_state);
 
                 sprintf(devid, "n%i", links[i].ifindex);


@@ -340,7 +340,7 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
 
         sd_rtnl_message_read_u32(reply, IFLA_MTU, &mtu);
 
 
         sd_rtnl_message_read_u32(reply, IFLA_MTU, &mtu);
 

-        sd_network_link_get_state(ifindex, &state);
+        sd_network_link_get_setup_state(ifindex, &state);

         sd_network_link_get_operational_state(ifindex, &operational_state);
 
         sd_network_link_get_dns(ifindex, &dns);
         sd_network_link_get_operational_state(ifindex, &operational_state);
 
         sd_network_link_get_dns(ifindex, &dns);

diff --git a/src/network/networkd-wait-online-link.c b/src/network/networkd-wait-online-link.c
index 1670beefab24501ff09639a300adcf865bd3fc41..f23c7ceb80c7196d48d83fd164aa018fe9d5935c 100644 (file)
--- a/src/network/networkd-wait-online-link.c
+++ b/src/network/networkd-wait-online-link.c
@@ -131,7 +131,7 @@ int link_update_monitor(Link *l) {
         free(l->state);
         l->state = NULL;
 
         free(l->state);
         l->state = NULL;
 

-        sd_network_link_get_state(l->ifindex, &l->state);
+        sd_network_link_get_setup_state(l->ifindex, &l->state);

 
         return 0;
 }
 
         return 0;
 }

diff --git a/src/systemd/sd-network.h b/src/systemd/sd-network.h
index dede7aea3de76a5364002c830040d98a0ef18a4f..47731c2620cf4a75bf011b8964543c040deaa8d6 100644 (file)
--- a/src/systemd/sd-network.h
+++ b/src/systemd/sd-network.h
@@ -64,7 +64,7 @@ int sd_network_get_dns(char ***addr);
  * reperesentations of IP addresses */
 int sd_network_get_ntp(char ***addr);
 
  * reperesentations of IP addresses */
 int sd_network_get_ntp(char ***addr);
 

-/* Get state from ifindex.
+/* Get setup state from ifindex.

  * Possible states:
  *   pending: udev is still processing the link, we don't yet know if we will manage it
  *   failed: networkd failed to manage the link
  * Possible states:
  *   pending: udev is still processing the link, we don't yet know if we will manage it
  *   failed: networkd failed to manage the link


@@ -75,7 +75,7 @@ int sd_network_get_ntp(char ***addr);
  * Possible return codes:
  *   -ENODATA: networkd is not aware of the link
  */
  * Possible return codes:
  *   -ENODATA: networkd is not aware of the link
  */

-int sd_network_link_get_state(int ifindex, char **state);
+int sd_network_link_get_setup_state(int ifindex, char **state);

 
 /* Get operatinal state from ifindex.
  * Possible states:
 
 /* Get operatinal state from ifindex.
  * Possible states: