discover/status: Use full URL in parse status message

[petitboot] / discover / network.c

diff --git a/discover/network.c b/discover/network.c
index 0161c69d2bedb6c40af1a3b004996d64ce8988c6..51a846af8a0c6ae8e75582f1eea619a75e8c1eb7 100644 (file)
--- a/discover/network.c
+++ b/discover/network.c
@@ -8,6 +8,7 @@
 #include <linux/if.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
+#include <i18n/i18n.h>
 
 #include <log/log.h>
 #include <list/list.h>
@@ -65,6 +66,25 @@ struct network {
        bool                    dry_run;
 };
 
+static char *mac_bytes_to_string(void *ctx, uint8_t *addr, int len)
+{
+       const int l = strlen("xx:");
+       char *buf;
+       int i;
+
+       if (len <= 0)
+               return talloc_strdup(ctx, "");
+
+       buf = talloc_array(ctx, char, (len * l) + 1);
+
+       for (i = 0; i < len; i++)
+               sprintf(buf + (l * i), "%02x:", addr[i]);
+
+       *(buf + (l * len) - 1) = '\0';
+
+       return buf;
+}
+
 static const struct interface_config *find_config_by_hwaddr(
                uint8_t *hwaddr)
 {
@@ -109,6 +129,25 @@ static struct interface *find_interface_by_name(struct network *network,
        return NULL;
 }
 
+static struct interface *find_interface_by_uuid(struct network *network,
+               const char *uuid)
+{
+       struct interface *interface;
+       char *mac;
+
+       list_for_each_entry(&network->interfaces, interface, list) {
+               mac = mac_bytes_to_string(interface, interface->hwaddr,
+                                       sizeof(interface->hwaddr));
+               if (!strcmp(mac, uuid)) {
+                       talloc_free(mac);
+                       return interface;
+               }
+               talloc_free(mac);
+       }
+
+       return NULL;
+}
+
 uint8_t *find_mac_by_name(void *ctx, struct network *network,
                const char *name)
 {
@@ -175,25 +214,6 @@ static int network_send_link_query(struct network *network)
        return 0;
 }
 
-static char *mac_bytes_to_string(void *ctx, uint8_t *addr, int len)
-{
-       const int l = strlen("xx:");
-       char *buf;
-       int i;
-
-       if (len <= 0)
-               return talloc_strdup(ctx, "");
-
-       buf = talloc_array(ctx, char, (len * l) + 1);
-
-       for (i = 0; i < len; i++)
-               sprintf(buf + (l * i), "%02x:", addr[i]);
-
-       *(buf + (l * len) - 1) = '\0';
-
-       return buf;
-}
-
 static void add_interface(struct network *network,
                struct interface *interface)
 {
@@ -222,7 +242,7 @@ void network_register_device(struct network *network,
 {
        struct interface *iface;
 
-       iface = find_interface_by_name(network, dev->device->id);
+       iface = find_interface_by_uuid(network, dev->uuid);
        if (!iface)
                return;
 
@@ -236,7 +256,7 @@ void network_unregister_device(struct network *network,
 {
        struct interface *iface;
 
-       iface = find_interface_by_name(network, dev->device->id);
+       iface = find_interface_by_uuid(network, dev->uuid);
        if (!iface)
                return;
 
@@ -294,7 +314,8 @@ static void udhcpc_process_exit(struct process *process)
        process_release(process);
 }
 
-static void configure_interface_dhcp(struct interface *interface)
+static void configure_interface_dhcp(struct network *network,
+               struct interface *interface)
 {
        const struct platform *platform;
        char pidfile[256], id[10];
@@ -312,6 +333,9 @@ static void configure_interface_dhcp(struct interface *interface)
                NULL,
        };
 
+       device_handler_status_dev_info(network->handler, interface->dev,
+                       _("Configuring with DHCP"));
+
        snprintf(pidfile, sizeof(pidfile), "%s/udhcpc-%s.pid",
                        PIDFILE_BASE, interface->name);
 
@@ -344,6 +368,10 @@ static void configure_interface_static(struct network *network,
 {
        int rc;
 
+       device_handler_status_dev_info(network->handler, interface->dev,
+                       _("Configuring with static address (ip: %s)"),
+                       config->static_config.address);
+
        rc = process_run_simple(interface, pb_system_apps.ip,
                        "address", "add", config->static_config.address,
                        "dev", interface->name, NULL);
@@ -451,7 +479,7 @@ static void configure_interface(struct network *network,
        pb_log("network: configuring interface %s\n", interface->name);
 
        if (!config || config->method == CONFIG_METHOD_DHCP) {
-               configure_interface_dhcp(interface);
+               configure_interface_dhcp(network, interface);
 
        } else if (config->method == CONFIG_METHOD_STATIC) {
                configure_interface_static(network, interface, config);